diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2023-09-17 13:05:46 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-17 13:05:46 +0000 |
commit | 158a9f81b7cf641e35df63e4580d24da63ddc446 (patch) | |
tree | d30291e4101ffe19856681e81e55d6002308866e /pkgs/servers | |
parent | c443b7d68ed1faf9e882db475ad3f2a51ebdf1d4 (diff) | |
parent | d1e79831b1a133e633745b9e824ebda7b11c02e5 (diff) |
Merge pull request #255431 from pacien/matrix-appservice-discord-v4-0-0
matrix-appservice-discord: 3.1.1 -> 4.0.0, fix update script
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/matrix-appservice-discord/package.json | 16 | ||||
-rw-r--r-- | pkgs/servers/matrix-appservice-discord/pin.json | 6 | ||||
-rwxr-xr-x | pkgs/servers/matrix-appservice-discord/update.sh | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/servers/matrix-appservice-discord/package.json index d382f29c686ae..f2ea8a3d924d0 100644 --- a/pkgs/servers/matrix-appservice-discord/package.json +++ b/pkgs/servers/matrix-appservice-discord/package.json @@ -1,11 +1,11 @@ { "name": "matrix-appservice-discord", - "version": "3.1.1", + "version": "4.0.0", "description": "A bridge between Matrix and Discord", "main": "discordas.js", "engines": { "npm": "please-use-yarn", - "node": ">=16 <=18" + "node": ">=18 <=20" }, "scripts": { "test": "mocha -r ts-node/register test/config.ts test/test_*.ts test/**/test_*.ts", @@ -13,8 +13,8 @@ "coverage": "tsc && nyc mocha build/test/config.js build/test", "build": "tsc", "postinstall": "yarn build", - "start": "yarn build && node ./build/src/discordas.js -c config.yaml", - "debug": "yarn build && node --inspect ./build/src/discordas.js -c config.yaml", + "start": "node ./build/src/discordas.js", + "debug": "node --inspect ./build/src/discordas.js", "addbot": "node ./build/tools/addbot.js", "adminme": "node ./build/tools/adminme.js", "usertool": "node ./build/tools/userClientTools.js", @@ -40,16 +40,16 @@ }, "homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme", "dependencies": { - "@mx-puppet/matrix-discord-parser": "0.1.10", - "better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f", - "better-sqlite3": "^7.1.0", + "@mx-puppet/better-discord.js": "^12.5.1", + "@mx-puppet/matrix-discord-parser": "^0.1.10", + "better-sqlite3": "^8.6.0", "command-line-args": "^5.1.1", "command-line-usage": "^6.1.0", "escape-html": "^1.0.3", "escape-string-regexp": "^4.0.0", "js-yaml": "^3.14.0", "marked": "^1.2.2", - "matrix-appservice-bridge": "^5.0.0", + "matrix-appservice-bridge": "^9.0.1", "mime": "^2.4.6", "p-queue": "^6.4.0", "pg-promise": "^10.5.6", diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/servers/matrix-appservice-discord/pin.json index 901864ef44740..7dc4bdcff2930 100644 --- a/pkgs/servers/matrix-appservice-discord/pin.json +++ b/pkgs/servers/matrix-appservice-discord/pin.json @@ -1,5 +1,5 @@ { - "version": "3.1.1", - "srcHash": "sha256-g681w7RD96/xKP+WnIyY4bcVHVQhysgDPZo4TgCRiuY=", - "yarnSha256": "0cm9yprj0ajmrdpap3p2lx3xrrkar6gghlxnj9127ks6p5c1ji3r" + "version": "4.0.0", + "srcHash": "sha256-UyRMMbnX4aJVv8oQfgn/rkZT1cRATtcgFj4fXszDKqo=", + "yarnSha256": "11zw1nkvsplnsiddyi1nb9zgdxn1mkh24nlcvaa69rpsjns9rj5k" } diff --git a/pkgs/servers/matrix-appservice-discord/update.sh b/pkgs/servers/matrix-appservice-discord/update.sh index ec089d7a21890..6e6359dfa3730 100755 --- a/pkgs/servers/matrix-appservice-discord/update.sh +++ b/pkgs/servers/matrix-appservice-discord/update.sh @@ -36,7 +36,7 @@ curl -O "$src/package.json" cat > pin.json << EOF { "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcSha256": "$src_hash", + "srcHash": "$src_hash", "yarnSha256": "$yarn_sha256" } EOF |