From 167597fbb9acf762d16d4bb1a4e116c1885a09e4 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 19 Sep 2024 14:06:23 +0100 Subject: [PATCH 1/5] Update matrix-appservice-bridge and bot-sdk --- package.json | 5 +- yarn.lock | 484 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 310 insertions(+), 179 deletions(-) diff --git a/package.json b/package.json index 14a9731..db87e17 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "humanize-duration-ts": "^2.1.1", "js-yaml": "^4.1.0", "jsdom": "^16.6.0", - "matrix-appservice-bridge": "8.1.2", + "@vector-im/matrix-bot-sdk": "^0.7.1-element.5", + "matrix-appservice-bridge": "10.3.0", "nsfwjs": "^4.1.0", "parse-duration": "^1.0.2", "pg": "^8.8.0", @@ -66,6 +67,6 @@ "yaml": "^2.2.2" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } } diff --git a/yarn.lock b/yarn.lock index 07741e5..0232e41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,6 +40,11 @@ resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@1.6.0", "@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz" @@ -104,12 +109,26 @@ semver "^7.3.5" tar "^6.1.11" -"@matrix-org/matrix-sdk-crypto-nodejs@^0.1.0-beta.1": - version "0.1.0-beta.1" - resolved "https://registry.npmjs.org/@matrix-org/matrix-sdk-crypto-nodejs/-/matrix-sdk-crypto-nodejs-0.1.0-beta.1.tgz" - integrity sha512-jCSKrmNh6kaqnOwS/Pqgqkeb+CAvwGuS0oNEW3LaWKrJWFAfUrt+lXBCs7kAP79Qo5ZKBU06BekbZuwYhWbhkQ== +"@matrix-org/matrix-sdk-crypto-nodejs@0.2.0-beta.1": + version "0.2.0-beta.1" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-nodejs/-/matrix-sdk-crypto-nodejs-0.2.0-beta.1.tgz#b696707ccfa944cfed3c96cf7e54799b0f1e3329" + integrity sha512-CgbOKORfD6dvYgQTPhfN73H1RbQknrFkMnRRwCIJMt15iL2AF1gEowgbrlGhkbG6gNng4CgPnKs1iHKCRrhvmA== dependencies: - node-downloader-helper "^2.1.1" + https-proxy-agent "^5.0.1" + node-downloader-helper "^2.1.5" + +"@opentelemetry/api@^1.4.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe" + integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg== + +"@selderee/plugin-htmlparser2@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz#d5b5e29a7ba6d3958a1972c7be16f4b2c188c517" + integrity sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ== + dependencies: + domhandler "^5.0.3" + selderee "^0.11.0" "@selderee/plugin-htmlparser2@^0.6.0": version "0.6.0" @@ -289,7 +308,17 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@^4.17.13", "@types/express@^4.17.8": +"@types/express-serve-static-core@^4.17.33": + version "4.19.5" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6" + integrity sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express@^4.17.13": version "4.17.13" resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== @@ -299,6 +328,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@^4.17.21": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/html-to-text@^8.0.1": version "8.0.1" resolved "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.0.1.tgz" @@ -369,6 +408,13 @@ dependencies: "@types/node" "*" +"@types/nedb@^1.8.16": + version "1.8.16" + resolved "https://registry.yarnpkg.com/@types/nedb/-/nedb-1.8.16.tgz#7aed013d0ef46655c6aacf3af7a849a1980b821e" + integrity sha512-ND+uzwAZk7ZI9byOvHGOcZe2R9XUcLF698yDJKn00trFvh+GaemkX3gQKCSKtObjDpv8Uuou+k8v4x4scPr4TA== + dependencies: + "@types/node" "*" + "@types/node-fetch@^2.1.2": version "2.6.11" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" @@ -413,13 +459,6 @@ pg-protocol "*" pg-types "^2.2.0" -"@types/pkginfo@^0.4.0": - version "0.4.0" - resolved "https://registry.npmjs.org/@types/pkginfo/-/pkginfo-0.4.0.tgz" - integrity sha512-4DGKkOlWkMuVDZQvytWzzWWAjyqDmlLKRYE4lzeA8t0s7fK0aF25uPbX9eBVermUjLJdeLHu9k1WmNiAssqCcg== - dependencies: - "@types/node" "*" - "@types/qs@*": version "6.9.7" resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz" @@ -445,6 +484,14 @@ resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.34.tgz#c725cd0fc0442e2d3d0e5913af005686ffb7eb99" integrity sha512-ytDiArvrn/3Xk6/vtylys5tlY6eo7Ane0hvcx++TKo6RxQXuVfW0AF/oeWqAj9dN29SyhtawuXstgmPlwNcv/A== +"@types/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + "@types/serve-static@*": version "1.13.10" resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz" @@ -468,6 +515,11 @@ resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz" integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg== +"@types/triple-beam@^1.3.2": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" + integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz" @@ -485,6 +537,30 @@ resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== +"@vector-im/matrix-bot-sdk@^0.7.1-element.5": + version "0.7.1-element.5" + resolved "https://registry.yarnpkg.com/@vector-im/matrix-bot-sdk/-/matrix-bot-sdk-0.7.1-element.5.tgz#ce4b47a96a2138165bf8f73b1bc31641ac37645b" + integrity sha512-jLe9aZIQHPJVC18A99eAzxQpQbw0lw2o7nk36NK2zyT1SpntQ7PGDu76O5ADSIc9dzssqjs7gSp2vpmeVIaTkA== + dependencies: + "@matrix-org/matrix-sdk-crypto-nodejs" "0.2.0-beta.1" + "@types/express" "^4.17.21" + another-json "^0.2.0" + async-lock "^1.4.0" + chalk "4" + express "^4.18.2" + glob-to-regexp "^0.4.1" + hash.js "^1.1.7" + html-to-text "^9.0.5" + htmlencode "^0.0.4" + lowdb "1" + lru-cache "^10.0.1" + mkdirp "^3.0.1" + morgan "^1.10.0" + postgres "^3.4.1" + request "^2.88.2" + request-promise "^4.2.6" + sanitize-html "^2.11.0" + "@webgpu/types@0.1.38": version "0.1.38" resolved "https://registry.yarnpkg.com/@webgpu/types/-/types-0.1.38.tgz#6fda4b410edc753d3213c648320ebcf319669020" @@ -669,15 +745,10 @@ astral-regex@^2.0.0: resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-lock@^1.3.2: - version "1.3.2" - resolved "https://registry.npmjs.org/async-lock/-/async-lock-1.3.2.tgz" - integrity sha512-phnXdS3RP7PPcmP6NWWzWMU0sLTeyvtZCxBPpZdkYE3seGLKSQZs9FrmVO/qwypq98FUtWWUEYxziLkdGk5nnA== - -async@0.2.10: - version "0.2.10" - resolved "https://registry.npmjs.org/async/-/async-0.2.10.tgz" - integrity sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ== +async-lock@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/async-lock/-/async-lock-1.4.1.tgz#56b8718915a9b68b10fce2f2a9a3dddf765ef53f" + integrity sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ== async@^3.2.3: version "3.2.4" @@ -704,14 +775,6 @@ aws4@^1.8.0: resolved "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== - dependencies: - follow-redirects "^1.14.9" - form-data "^4.0.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" @@ -736,13 +799,6 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -binary-search-tree@0.2.5: - version "0.2.5" - resolved "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz" - integrity sha512-CvNVKS6iXagL1uGwLagSXz1hzSMezxOuGnFi5FHGKqaTO3nPPWrAbyALUzK640j+xOTVm7lzD9YP8W1f/gvUdw== - dependencies: - underscore "~1.4.4" - bintrees@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz" @@ -850,6 +906,14 @@ caseless@~0.12.0: resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== +chalk@4, chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^2.0.0, chalk@^2.3.0: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" @@ -859,14 +923,6 @@ chalk@^2.0.0, chalk@^2.3.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4, chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chokidar@3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" @@ -1108,6 +1164,11 @@ deepmerge@^4.2.2: resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +deepmerge@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== + define-data-property@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" @@ -1493,12 +1554,12 @@ expect@^27.0.6: jest-message-util "^27.2.4" jest-regex-util "^27.0.6" -express-rate-limit@^6.7.0: - version "6.8.1" - resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-6.8.1.tgz#f614bc3a7040fe6f75dc3198536f4cc13526f989" - integrity sha512-xJyudsE60CsDShK74Ni1MxsldYaIoivmG3ieK2tAckMsYCBewEuGalss6p/jHmFFnqM9xd5ojE0W2VlanxcOKg== +express-rate-limit@^7.1.5: + version "7.4.0" + resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-7.4.0.tgz#5db412b8de83fa07ddb40f610c585ac8c1dab988" + integrity sha512-v1204w3cXu5gCDmAvgvzI6qjzZzoMWKnyVDk3ACgfswTQLYiGen+r8w0VnXnGMmzEN/g8fwIQ4JrFFd4ZP6ssg== -express@^4.17.1, express@^4.18.1, express@^4.20: +express@^4.18.1, express@^4.20: version "4.20.0" resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48" integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw== @@ -1535,6 +1596,43 @@ express@^4.17.1, express@^4.18.1, express@^4.20: utils-merge "1.0.1" vary "~1.1.2" +express@^4.18.2: + version "4.21.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" + integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== + dependencies: + accepts "~1.3.8" + array-flatten "1.1.1" + body-parser "1.20.3" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.6.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "2.0.0" + encodeurl "~2.0.0" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.3.1" + fresh "0.5.2" + http-errors "2.0.0" + merge-descriptors "1.0.3" + methods "~1.1.2" + on-finished "2.4.1" + parseurl "~1.3.3" + path-to-regexp "0.1.10" + proxy-addr "~2.0.7" + qs "6.13.0" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.19.0" + serve-static "1.16.2" + setprototypeof "1.2.0" + statuses "2.0.1" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz" @@ -1599,6 +1697,19 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== + dependencies: + debug "2.6.9" + encodeurl "~2.0.0" + escape-html "~1.0.3" + on-finished "2.4.1" + parseurl "~1.3.3" + statuses "2.0.1" + unpipe "~1.0.0" + find-up@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" @@ -1630,11 +1741,6 @@ fn.name@1.x.x: resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.14.9: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" @@ -1911,7 +2017,7 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-to-text@^8.0.0, html-to-text@^8.2.0: +html-to-text@^8.0.0: version "8.2.0" resolved "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz" integrity sha512-CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ== @@ -1923,6 +2029,17 @@ html-to-text@^8.0.0, html-to-text@^8.2.0: minimist "^1.2.6" selderee "^0.6.0" +html-to-text@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-9.0.5.tgz#6149a0f618ae7a0db8085dca9bbf96d32bb8368d" + integrity sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg== + dependencies: + "@selderee/plugin-htmlparser2" "^0.11.0" + deepmerge "^4.3.1" + dom-serializer "^2.0.0" + htmlparser2 "^8.0.2" + selderee "^0.11.0" + htmlencode@^0.0.4: version "0.0.4" resolved "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz" @@ -1938,7 +2055,7 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" -htmlparser2@^8.0.0: +htmlparser2@^8.0.0, htmlparser2@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== @@ -1993,6 +2110,14 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" +https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + humanize-duration-ts@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/humanize-duration-ts/-/humanize-duration-ts-2.1.1.tgz" @@ -2015,11 +2140,6 @@ ignore@^4.0.6: resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz" - integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== - import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" @@ -2054,10 +2174,10 @@ ip-address@^7.1.0: jsbn "1.1.0" sprintf-js "1.1.2" -ip-cidr@^3.0.4: - version "3.0.10" - resolved "https://registry.npmjs.org/ip-cidr/-/ip-cidr-3.0.10.tgz" - integrity sha512-PXSsrRYirsuaCI1qBVyVXRLUIpNzxm76eHd3UvN5NXTMUG85GWGZpr6P+70mimc5e7Nfh/tShmjk0oSywErMWg== +ip-cidr@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ip-cidr/-/ip-cidr-3.1.0.tgz#db284bbd2bdac0b137a2cd4fe1ba9a6cca2f8b04" + integrity sha512-HUCn4snshEX1P8cja/IyU3qk8FVDW8T5zZcegDFbu4w7NojmAhk5NcOgj3M8+0fmumo1afJTPDtJlzsxLdOjtg== dependencies: ip-address "^7.1.0" jsbn "^1.1.0" @@ -2344,6 +2464,11 @@ layerr@^0.1.2: resolved "https://registry.npmjs.org/layerr/-/layerr-0.1.2.tgz" integrity sha512-ob5kTd9H3S4GOG2nVXyQhOu9O8nBgP555XxWPkJI0tR0JeRilfyTp8WtPdIJHLXBmHMSdEq5+KMxiYABeScsIQ== +leac@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912" + integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg== + levn@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" @@ -2360,20 +2485,6 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lie@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz" - integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw== - dependencies: - immediate "~3.0.5" - -localforage@^1.3.0: - version "1.10.0" - resolved "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz" - integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg== - dependencies: - lie "3.1.1" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" @@ -2409,7 +2520,7 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -logform@^2.3.2, logform@^2.4.0: +logform@^2.3.2: version "2.4.2" resolved "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz" integrity sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw== @@ -2420,14 +2531,26 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" +logform@^2.6.0, logform@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0" + integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA== + dependencies: + "@colors/colors" "1.6.0" + "@types/triple-beam" "^1.3.2" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^2.3.1" + triple-beam "^1.3.0" + long@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -lowdb@^1: +lowdb@1: version "1.0.0" - resolved "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064" integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ== dependencies: graceful-fs "^4.1.3" @@ -2436,6 +2559,11 @@ lowdb@^1: pify "^3.0.0" steno "^0.4.1" +lru-cache@^10.0.1: + version "10.4.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" + integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== + lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz" @@ -2451,11 +2579,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.10.1: - version "7.13.1" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz" - integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== - lru_map@^0.3.3: version "0.3.3" resolved "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz" @@ -2473,67 +2596,40 @@ make-error@^1.1.1: resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -matrix-appservice-bridge@8.1.2: - version "8.1.2" - resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-8.1.2.tgz#30953a4599533fe61a0c37bd5500b654cd236e30" - integrity sha512-OTQVEuYgsnlg7fBFASCaiYHgwi5+I/+vxwjOmR4y9n5ESKXoqI465bN+6zvW8MazdNfBl6NgZVWSm4DZohz8Zw== +matrix-appservice-bridge@10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-10.3.0.tgz#3e753aec7459e3ebcd9d864d90c19f66ac663c6b" + integrity sha512-+xlUOfp5gT28iv4yIxv2ETVCq1tiHn8BL0ks7UpU6wCpGCJgnoswP7A2yzkDCfiUxrhGgyWuhaN0WJCj1IXsPg== dependencies: "@alloc/quick-lru" "^5.2.0" - "@types/pkginfo" "^0.4.0" - axios "^0.27.2" + "@types/nedb" "^1.8.16" + "@vector-im/matrix-bot-sdk" "^0.7.1-element.5" chalk "^4.1.0" - express "^4.18.1" - express-rate-limit "^6.7.0" + express "^4.18.2" + express-rate-limit "^7.1.5" extend "^3.0.2" - ip-cidr "^3.0.4" + ip-cidr "^3.0.0" is-my-json-valid "^2.20.5" js-yaml "^4.0.0" - matrix-appservice "^1.1.0" - matrix-bot-sdk "^0.6.2" - nedb "^1.8.0" + matrix-appservice "^2.0.0" nopt "^5.0.0" p-queue "^6.6.2" pkginfo "^0.4.1" - postgres "^3.3.1" - prom-client "^14.1.0" - uuid "^8.3.2" - winston "^3.3.3" + postgres "^3.4.3" + prom-client "^15.1.0" + winston "^3.11.0" winston-daily-rotate-file "^4.5.1" -matrix-appservice@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-1.1.0.tgz" - integrity sha512-6hJdmo9YIbh6dS9MfMHCpHMhklN/+NOcfGQ/3UbbEEfIE8dt0bHqi1nnIiias5IqDFl6ED9y+YQdtyqnIXx+Ww== +matrix-appservice@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/matrix-appservice/-/matrix-appservice-2.0.0.tgz#74b58e27477b4c1359da7c61878b7d18c6075261" + integrity sha512-HCIuJ5i0YuO8b0dMyGe5dqlsE4f3RzHU0MuMg/2gGAZ4HL3r7aSWOFbyIWStSSUrk1qCa9Eml0i4EnEi0pOtdA== dependencies: - "@types/express" "^4.17.8" body-parser "^1.19.0" - express "^4.17.1" + express "^4.18.1" js-yaml "^4.1.0" morgan "^1.10.0" -matrix-bot-sdk@^0.6.2: - version "0.6.2" - resolved "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.6.2.tgz" - integrity sha512-+kXlXkQBQgWC6oUwYEosJlXjceaj7jQUnPlALFhGeAabgVm8tmuvFNVKqClwvrrjj+0Gzsmt+rcJHmkvqymFXA== - dependencies: - "@matrix-org/matrix-sdk-crypto-nodejs" "^0.1.0-beta.1" - "@types/express" "^4.17.13" - another-json "^0.2.0" - async-lock "^1.3.2" - chalk "^4" - express "^4.18.1" - glob-to-regexp "^0.4.1" - hash.js "^1.1.7" - html-to-text "^8.2.0" - htmlencode "^0.0.4" - lowdb "^1" - lru-cache "^7.10.1" - mkdirp "^1.0.4" - morgan "^1.10.0" - request "^2.88.2" - request-promise "^4.2.6" - sanitize-html "^2.7.0" - media-typer@0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" @@ -2625,17 +2721,15 @@ mkdirp@^0.5.1, mkdirp@^0.5.3: dependencies: minimist "^1.2.5" -mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@~0.5.1: - version "0.5.6" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" +mkdirp@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== mocha@^9.0.1: version "9.2.2" @@ -2728,26 +2822,15 @@ nearley@^2.20.1: railroad-diagrams "^1.0.0" randexp "0.4.6" -nedb@^1.8.0: - version "1.8.0" - resolved "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz" - integrity sha512-ip7BJdyb5m+86ZbSb4y10FCCW9g35+U8bDRrZlAfCI6m4dKwEsQ5M52grcDcVK4Vm/vnPlDLywkyo3GliEkb5A== - dependencies: - async "0.2.10" - binary-search-tree "0.2.5" - localforage "^1.3.0" - mkdirp "~0.5.1" - underscore "~1.4.4" - negotiator@0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -node-downloader-helper@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-2.1.1.tgz" - integrity sha512-ouk8MGmJj1gYymbJwi1L8Mr6PdyheJLwfsmyx0KtsvyJ+7Fpf0kBBzM8Gmx8Mt/JBfRWP1PQm6dAGV6x7eNedw== +node-downloader-helper@^2.1.5: + version "2.1.9" + resolved "https://registry.yarnpkg.com/node-downloader-helper/-/node-downloader-helper-2.1.9.tgz#a59ee7276b2bf708bbac2cc5872ad28fc7cd1b0e" + integrity sha512-FSvAol2Z8UP191sZtsUZwHIN0eGoGue3uEXGdWIH5228e9KH1YHXT7fN8Oa33UGf+FbqGTQg3sJfrRGzmVCaJA== node-fetch@^2.6.7: version "2.7.0" @@ -2938,6 +3021,14 @@ parse5@6.0.1: resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parseley@^0.12.0: + version "0.12.1" + resolved "https://registry.yarnpkg.com/parseley/-/parseley-0.12.1.tgz#4afd561d50215ebe259e3e7a853e62f600683aef" + integrity sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw== + dependencies: + leac "^0.6.0" + peberminta "^0.9.0" + parseley@^0.7.0: version "0.7.0" resolved "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz" @@ -2976,6 +3067,11 @@ path-to-regexp@0.1.10: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== +peberminta@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/peberminta/-/peberminta-0.9.0.tgz#8ec9bc0eb84b7d368126e71ce9033501dca2a352" + integrity sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" @@ -3088,10 +3184,10 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" -postgres@^3.3.1: - version "3.3.2" - resolved "https://registry.npmjs.org/postgres/-/postgres-3.3.2.tgz" - integrity sha512-NaPqFpUC6C7aCQkJXLvuO/3RKNKL4en8opY53YrcXK3//xXra6CZ2qX6290lxuQ1dW1LbRGYCmsawRlCxSBonQ== +postgres@^3.4.1, postgres@^3.4.3: + version "3.4.4" + resolved "https://registry.yarnpkg.com/postgres/-/postgres-3.4.4.tgz#adbe08dc1fff0dea3559aa4f83ded70a289a6cb8" + integrity sha512-IbyN+9KslkqcXa8AO9fxpk97PA4pzewvpi2B3Dwy9u4zpV32QicaEdgmF3eSQUzdRk7ttDHQejNgAEr4XoeH4A== prelude-ls@^1.2.1: version "1.2.1" @@ -3125,6 +3221,14 @@ prom-client@^14.1.0: dependencies: tdigest "^0.1.1" +prom-client@^15.1.0: + version "15.1.3" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2" + integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g== + dependencies: + "@opentelemetry/api" "^1.4.0" + tdigest "^0.1.1" + proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" @@ -3216,6 +3320,15 @@ readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" @@ -3338,7 +3451,7 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-html@^2.7.0: +sanitize-html@^2.11.0: version "2.13.0" resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae" integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA== @@ -3362,6 +3475,13 @@ seedrandom@^3.0.5: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== +selderee@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/selderee/-/selderee-0.11.0.tgz#6af0c7983e073ad3e35787ffe20cefd9daf0ec8a" + integrity sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA== + dependencies: + parseley "^0.12.0" + selderee@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz" @@ -3446,6 +3566,16 @@ serve-static@1.16.0: parseurl "~1.3.3" send "0.18.0" +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== + dependencies: + encodeurl "~2.0.0" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.19.0" + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -3881,11 +4011,6 @@ ulidx@^0.3.0: dependencies: layerr "^0.1.2" -underscore@~1.4.4: - version "1.4.4" - resolved "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" - integrity sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ== - undici-types@~5.26.4: version "5.26.5" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" @@ -3923,11 +4048,6 @@ uuid@^3.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz" @@ -4029,7 +4149,7 @@ winston-daily-rotate-file@^4.5.1: triple-beam "^1.3.0" winston-transport "^4.4.0" -winston-transport@^4.4.0, winston-transport@^4.5.0: +winston-transport@^4.4.0: version "4.5.0" resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz" integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q== @@ -4038,21 +4158,31 @@ winston-transport@^4.4.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.3.3: - version "3.8.1" - resolved "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz" - integrity sha512-r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w== +winston-transport@^4.7.0: + version "4.7.1" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569" + integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA== dependencies: + logform "^2.6.1" + readable-stream "^3.6.2" + triple-beam "^1.3.0" + +winston@^3.11.0: + version "3.14.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.14.2.tgz#94ce5fd26d374f563c969d12f0cd9c641065adab" + integrity sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg== + dependencies: + "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" - logform "^2.4.0" + logform "^2.6.0" one-time "^1.0.0" readable-stream "^3.4.0" safe-stable-stringify "^2.3.1" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.5.0" + winston-transport "^4.7.0" word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.4" From c501f3d290d82d08ab7390dc9ef4cbaff2f73099 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 19 Sep 2024 14:06:34 +0100 Subject: [PATCH 2/5] Update references to bot-sdk --- src/ManagementRoomOutput.ts | 2 +- src/MatrixEmitter.ts | 2 +- src/Mjolnir.ts | 2 +- src/ProtectedRoomsConfig.ts | 2 +- src/ProtectedRoomsSet.ts | 2 +- src/appservice/AccessControl.ts | 2 +- src/appservice/MjolnirManager.ts | 2 +- src/commands/AddRemoveProtectedRoomsCommand.ts | 2 +- src/commands/AddRemoveRoomFromDirectoryCommand.ts | 2 +- src/commands/AliasCommands.ts | 2 +- src/commands/CommandHandler.ts | 2 +- src/commands/CreateBanListCommand.ts | 2 +- src/commands/DeactivateCommand.ts | 2 +- src/commands/DumpRulesCommand.ts | 2 +- src/commands/ImportCommand.ts | 2 +- src/commands/KickCommand.ts | 2 +- src/commands/ListProtectedRoomsCommand.ts | 2 +- src/commands/MakeRoomAdminCommand.ts | 2 +- src/commands/ProtectionsCommands.ts | 2 +- src/commands/RedactCommand.ts | 2 +- src/commands/SetDefaultBanListCommand.ts | 2 +- src/commands/SetPowerLevelCommand.ts | 2 +- src/commands/SetupDecentralizedReportingCommand.ts | 2 +- src/commands/ShutdownRoomCommand.ts | 2 +- src/commands/SinceCommand.ts | 2 +- src/commands/StatusCommand.ts | 2 +- src/commands/SuspendCommand.ts | 2 +- src/commands/UnbanBanCommand.ts | 2 +- src/commands/UnsuspendCommand.ts | 2 +- src/commands/WatchUnwatchCommand.ts | 2 +- src/config.ts | 2 +- src/health/healthz.ts | 2 +- src/index.ts | 2 +- src/models/AccessControlUnit.ts | 2 +- src/models/ListRule.ts | 2 +- src/models/PolicyList.ts | 2 +- src/models/RuleServer.ts | 2 +- src/models/ServerAcl.ts | 2 +- src/protections/BasicFlooding.ts | 2 +- src/protections/DetectFederationLag.ts | 2 +- src/protections/FirstMessageIsImage.ts | 2 +- src/protections/JoinWaveShortCircuit.ts | 2 +- src/protections/LocalAbuseReports.ts | 2 +- src/protections/MessageIsMedia.ts | 2 +- src/protections/MessageIsVoice.ts | 2 +- src/protections/NsfwProtection.ts | 2 +- src/protections/ProtectionManager.ts | 2 +- src/protections/WordList.ts | 2 +- src/queues/EventRedactionQueue.ts | 2 +- src/queues/ThrottlingQueue.ts | 2 +- src/queues/UnlistedUserRedactionQueue.ts | 2 +- src/report/ReportManager.ts | 4 ++-- src/report/ReportPoller.ts | 2 +- src/utils.ts | 2 +- src/webapis/OpenMetrics.ts | 2 +- src/webapis/WebAPIs.ts | 2 +- test/appservice/integration/provisionTest.ts | 2 +- test/appservice/integration/webAPITest.ts | 2 +- test/appservice/utils/harness.ts | 2 +- test/appservice/utils/webAPIClient.ts | 2 +- test/integration/acceptInvitesFromSpaceTest.ts | 2 +- test/integration/banListTest.ts | 2 +- test/integration/clientHelper.ts | 2 +- test/integration/commands/commandUtils.ts | 2 +- test/integration/commands/makedminCommandTest.ts | 2 +- test/integration/commands/redactCommandTest.ts | 2 +- test/integration/commands/suspendCommandTest.ts | 2 +- test/integration/detectFederationLagTest.ts | 2 +- test/integration/mjolnirSetupUtils.ts | 2 +- test/integration/nsfwProtectionTest.ts | 2 +- test/integration/openMetricsTest.ts | 2 +- test/integration/policyConsumptionTest.ts | 2 +- test/integration/protectedRoomsConfigTest.ts | 2 +- test/integration/throttleQueueTest.ts | 2 +- test/integration/utilsTest.ts | 2 +- 75 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/ManagementRoomOutput.ts b/src/ManagementRoomOutput.ts index 23c5c08..fe43e6f 100644 --- a/src/ManagementRoomOutput.ts +++ b/src/ManagementRoomOutput.ts @@ -15,7 +15,7 @@ limitations under the License. */ import * as Sentry from "@sentry/node"; -import { extractRequestError, LogLevel, LogService, MessageType, Permalinks, TextualMessageEventContent, UserID } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService, MessageType, Permalinks, TextualMessageEventContent, UserID } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "./config"; import { MatrixSendClient } from "./MatrixEmitter"; import { htmlEscape } from "./utils"; diff --git a/src/MatrixEmitter.ts b/src/MatrixEmitter.ts index 64c7d8f..d810101 100644 --- a/src/MatrixEmitter.ts +++ b/src/MatrixEmitter.ts @@ -15,7 +15,7 @@ limitations under the License. */ import EventEmitter from "events"; -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; /** * This is an interface created in order to keep the event listener diff --git a/src/Mjolnir.ts b/src/Mjolnir.ts index 8224147..9fcf885 100644 --- a/src/Mjolnir.ts +++ b/src/Mjolnir.ts @@ -19,7 +19,7 @@ import { LogLevel, LogService, MembershipEvent, -} from "matrix-bot-sdk"; +} from "@vector-im/matrix-bot-sdk"; import { ALL_RULE_TYPES as ALL_BAN_LIST_RULE_TYPES } from "./models/ListRule"; import { COMMAND_PREFIX, handleCommand } from "./commands/CommandHandler"; diff --git a/src/ProtectedRoomsConfig.ts b/src/ProtectedRoomsConfig.ts index 4e6344c..fc9af77 100644 --- a/src/ProtectedRoomsConfig.ts +++ b/src/ProtectedRoomsConfig.ts @@ -15,7 +15,7 @@ limitations under the License. */ import AwaitLock from 'await-lock'; -import { extractRequestError, LogService, Permalinks } from "matrix-bot-sdk"; +import { extractRequestError, LogService, Permalinks } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "./config"; import { MatrixSendClient } from './MatrixEmitter'; const PROTECTED_ROOMS_EVENT_TYPE = "org.matrix.mjolnir.protected_rooms"; diff --git a/src/ProtectedRoomsSet.ts b/src/ProtectedRoomsSet.ts index e2d41fd..5f2908c 100644 --- a/src/ProtectedRoomsSet.ts +++ b/src/ProtectedRoomsSet.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { LogLevel, LogService, MatrixGlob, Permalinks, UserID } from "matrix-bot-sdk"; +import { LogLevel, LogService, MatrixGlob, Permalinks, UserID } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "./config"; import ErrorCache, { ERROR_KIND_FATAL, ERROR_KIND_PERMISSION } from "./ErrorCache"; import ManagementRoomOutput from "./ManagementRoomOutput"; diff --git a/src/appservice/AccessControl.ts b/src/appservice/AccessControl.ts index 54500d3..1319463 100644 --- a/src/appservice/AccessControl.ts +++ b/src/appservice/AccessControl.ts @@ -17,7 +17,7 @@ limitations under the License. import { Bridge } from "matrix-appservice-bridge"; import AccessControlUnit, { EntityAccess } from "../models/AccessControlUnit"; import PolicyList from "../models/PolicyList"; -import { Permalinks } from "matrix-bot-sdk"; +import { Permalinks } from "@vector-im/matrix-bot-sdk"; /** * Utility to manage which users have access to the application service, diff --git a/src/appservice/MjolnirManager.ts b/src/appservice/MjolnirManager.ts index 9de9826..d15307d 100644 --- a/src/appservice/MjolnirManager.ts +++ b/src/appservice/MjolnirManager.ts @@ -3,7 +3,7 @@ import { Request, WeakEvent, BridgeContext, Bridge, Intent, Logger } from "matri import { getProvisionedMjolnirConfig } from "../config"; import { IConfig as IAppserviceConfig } from "./config/config"; import PolicyList from "../models/PolicyList"; -import { Permalinks, MatrixClient } from "matrix-bot-sdk"; +import { Permalinks, MatrixClient } from "@vector-im/matrix-bot-sdk"; import { DataStore } from "./datastore"; import { AccessControl } from "./AccessControl"; import { Access } from "../models/AccessControlUnit"; diff --git a/src/commands/AddRemoveProtectedRoomsCommand.ts b/src/commands/AddRemoveProtectedRoomsCommand.ts index 978b9c8..a6ec0b9 100644 --- a/src/commands/AddRemoveProtectedRoomsCommand.ts +++ b/src/commands/AddRemoveProtectedRoomsCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { extractRequestError, LogLevel, LogService } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; // !mjolnir rooms add export async function execAddProtectedRoom(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/AddRemoveRoomFromDirectoryCommand.ts b/src/commands/AddRemoveRoomFromDirectoryCommand.ts index 1dd1459..b8f86a1 100644 --- a/src/commands/AddRemoveRoomFromDirectoryCommand.ts +++ b/src/commands/AddRemoveRoomFromDirectoryCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; async function addRemoveFromDirectory(inRoomId: string, event: any, mjolnir: Mjolnir, roomRef: string, visibility: "public" | "private") { const isAdmin = await mjolnir.isSynapseAdmin(); diff --git a/src/commands/AliasCommands.ts b/src/commands/AliasCommands.ts index 59ff4ce..23493e2 100644 --- a/src/commands/AliasCommands.ts +++ b/src/commands/AliasCommands.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; import { htmlEscape } from "../utils"; // !mjolnir move diff --git a/src/commands/CommandHandler.ts b/src/commands/CommandHandler.ts index 420bc09..3638423 100644 --- a/src/commands/CommandHandler.ts +++ b/src/commands/CommandHandler.ts @@ -18,7 +18,7 @@ import { Mjolnir } from "../Mjolnir"; import { execStatusCommand } from "./StatusCommand"; import { execBanCommand, execUnbanCommand } from "./UnbanBanCommand"; import { execDumpRulesCommand, execRulesMatchingCommand } from "./DumpRulesCommand"; -import { extractRequestError, LogService, RichReply } from "matrix-bot-sdk"; +import { extractRequestError, LogService, RichReply } from "@vector-im/matrix-bot-sdk"; import { htmlEscape } from "../utils"; import { execSyncCommand } from "./SyncCommand"; import { execPermissionCheckCommand } from "./PermissionCheckCommand"; diff --git a/src/commands/CreateBanListCommand.ts b/src/commands/CreateBanListCommand.ts index 55b0345..437c8e5 100644 --- a/src/commands/CreateBanListCommand.ts +++ b/src/commands/CreateBanListCommand.ts @@ -16,7 +16,7 @@ limitations under the License. import { Mjolnir } from "../Mjolnir"; import PolicyList from "../models/PolicyList"; -import { Permalinks, RichReply } from "matrix-bot-sdk"; +import { Permalinks, RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir list create export async function execCreateListCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/DeactivateCommand.ts b/src/commands/DeactivateCommand.ts index 14a6ee0..bdcacf3 100644 --- a/src/commands/DeactivateCommand.ts +++ b/src/commands/DeactivateCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir deactivate export async function execDeactivateCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/DumpRulesCommand.ts b/src/commands/DumpRulesCommand.ts index 1fa6305..d4c54e3 100644 --- a/src/commands/DumpRulesCommand.ts +++ b/src/commands/DumpRulesCommand.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; import { Mjolnir } from "../Mjolnir"; import { EntityType } from "../models/ListRule"; import { htmlEscape } from "../utils"; diff --git a/src/commands/ImportCommand.ts b/src/commands/ImportCommand.ts index 8cd2ac0..50d02c4 100644 --- a/src/commands/ImportCommand.ts +++ b/src/commands/ImportCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; import { EntityType } from "../models/ListRule"; import PolicyList from "../models/PolicyList"; diff --git a/src/commands/KickCommand.ts b/src/commands/KickCommand.ts index f7649f4..4fad133 100644 --- a/src/commands/KickCommand.ts +++ b/src/commands/KickCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { LogLevel, MatrixGlob, RichReply } from "matrix-bot-sdk"; +import { LogLevel, MatrixGlob, RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir kick [room] [reason] export async function execKickCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/ListProtectedRoomsCommand.ts b/src/commands/ListProtectedRoomsCommand.ts index 6dc4663..829b1d3 100644 --- a/src/commands/ListProtectedRoomsCommand.ts +++ b/src/commands/ListProtectedRoomsCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { Permalinks, RichReply } from "matrix-bot-sdk"; +import { Permalinks, RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir rooms export async function execListProtectedRooms(roomId: string, event: any, mjolnir: Mjolnir) { diff --git a/src/commands/MakeRoomAdminCommand.ts b/src/commands/MakeRoomAdminCommand.ts index ea748cf..2a52c2c 100644 --- a/src/commands/MakeRoomAdminCommand.ts +++ b/src/commands/MakeRoomAdminCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir make admin [] export async function execMakeRoomAdminCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/ProtectionsCommands.ts b/src/commands/ProtectionsCommands.ts index 5611922..4262d7e 100644 --- a/src/commands/ProtectionsCommands.ts +++ b/src/commands/ProtectionsCommands.ts @@ -16,7 +16,7 @@ limitations under the License. import { htmlEscape } from "../utils"; import { Mjolnir } from "../Mjolnir"; -import { extractRequestError, LogService, RichReply } from "matrix-bot-sdk"; +import { extractRequestError, LogService, RichReply } from "@vector-im/matrix-bot-sdk"; import { isListSetting } from "../protections/ProtectionSettings"; // !mjolnir enable diff --git a/src/commands/RedactCommand.ts b/src/commands/RedactCommand.ts index f809a60..4601c6c 100644 --- a/src/commands/RedactCommand.ts +++ b/src/commands/RedactCommand.ts @@ -16,7 +16,7 @@ limitations under the License. import { Mjolnir } from "../Mjolnir"; import { redactUserMessagesIn } from "../utils"; -import { Permalinks } from "matrix-bot-sdk"; +import { Permalinks } from "@vector-im/matrix-bot-sdk"; // !mjolnir redact [room alias] [limit] export async function execRedactCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/SetDefaultBanListCommand.ts b/src/commands/SetDefaultBanListCommand.ts index afef1c0..f1bf8f7 100644 --- a/src/commands/SetDefaultBanListCommand.ts +++ b/src/commands/SetDefaultBanListCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; export const DEFAULT_LIST_EVENT_TYPE = "org.matrix.mjolnir.default_list"; diff --git a/src/commands/SetPowerLevelCommand.ts b/src/commands/SetPowerLevelCommand.ts index 1b096db..3c8099c 100644 --- a/src/commands/SetPowerLevelCommand.ts +++ b/src/commands/SetPowerLevelCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { extractRequestError, LogLevel, LogService } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; // !mjolnir powerlevel [room] export async function execSetPowerLevelCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/SetupDecentralizedReportingCommand.ts b/src/commands/SetupDecentralizedReportingCommand.ts index 1b1ed01..e710e4d 100644 --- a/src/commands/SetupDecentralizedReportingCommand.ts +++ b/src/commands/SetupDecentralizedReportingCommand.ts @@ -1,5 +1,5 @@ import { Mjolnir } from "../Mjolnir"; -import { LogLevel } from "matrix-bot-sdk"; +import { LogLevel } from "@vector-im/matrix-bot-sdk"; const EVENT_MODERATED_BY = "org.matrix.msc3215.room.moderation.moderated_by"; const EVENT_MODERATOR_OF = "org.matrix.msc3215.room.moderation.moderator_of"; diff --git a/src/commands/ShutdownRoomCommand.ts b/src/commands/ShutdownRoomCommand.ts index 098c7ba..f24c4c8 100644 --- a/src/commands/ShutdownRoomCommand.ts +++ b/src/commands/ShutdownRoomCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir shutdown room [] export async function execShutdownRoomCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/commands/SinceCommand.ts b/src/commands/SinceCommand.ts index daced1e..572ce7b 100644 --- a/src/commands/SinceCommand.ts +++ b/src/commands/SinceCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { LogLevel, LogService, RichReply } from "matrix-bot-sdk"; +import { LogLevel, LogService, RichReply } from "@vector-im/matrix-bot-sdk"; import { htmlEscape, parseDuration } from "../utils"; import { ParseEntry } from "shell-quote"; import { HumanizeDurationLanguage, HumanizeDuration } from "humanize-duration-ts"; diff --git a/src/commands/StatusCommand.ts b/src/commands/StatusCommand.ts index 0f4ddd4..11c4edb 100644 --- a/src/commands/StatusCommand.ts +++ b/src/commands/StatusCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir, STATE_CHECKING_PERMISSIONS, STATE_NOT_STARTED, STATE_RUNNING, STATE_SYNCING } from "../Mjolnir"; -import { RichReply } from "matrix-bot-sdk"; +import { RichReply } from "@vector-im/matrix-bot-sdk"; import { htmlEscape, parseDuration } from "../utils"; import { HumanizeDurationLanguage, HumanizeDuration } from "humanize-duration-ts"; import PolicyList from "../models/PolicyList"; diff --git a/src/commands/SuspendCommand.ts b/src/commands/SuspendCommand.ts index db74e32..68906db 100644 --- a/src/commands/SuspendCommand.ts +++ b/src/commands/SuspendCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import {Mjolnir} from "../Mjolnir"; -import {RichReply} from "matrix-bot-sdk"; +import {RichReply} from "@vector-im/matrix-bot-sdk"; export async function execSuspendCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { const target = parts[2]; diff --git a/src/commands/UnbanBanCommand.ts b/src/commands/UnbanBanCommand.ts index c6285ba..abaa9fc 100644 --- a/src/commands/UnbanBanCommand.ts +++ b/src/commands/UnbanBanCommand.ts @@ -16,7 +16,7 @@ limitations under the License. import { Mjolnir } from "../Mjolnir"; import PolicyList from "../models/PolicyList"; -import { extractRequestError, LogLevel, LogService, MatrixGlob, RichReply } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService, MatrixGlob, RichReply } from "@vector-im/matrix-bot-sdk"; import { RULE_ROOM, RULE_SERVER, RULE_USER, USER_RULE_TYPES } from "../models/ListRule"; import { DEFAULT_LIST_EVENT_TYPE } from "./SetDefaultBanListCommand"; diff --git a/src/commands/UnsuspendCommand.ts b/src/commands/UnsuspendCommand.ts index fbb06d1..b364498 100644 --- a/src/commands/UnsuspendCommand.ts +++ b/src/commands/UnsuspendCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import {Mjolnir} from "../Mjolnir"; -import {RichReply} from "matrix-bot-sdk"; +import {RichReply} from "@vector-im/matrix-bot-sdk"; export async function execUnsuspendCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { const target = parts[2]; diff --git a/src/commands/WatchUnwatchCommand.ts b/src/commands/WatchUnwatchCommand.ts index 0ffc05b..51459b4 100644 --- a/src/commands/WatchUnwatchCommand.ts +++ b/src/commands/WatchUnwatchCommand.ts @@ -15,7 +15,7 @@ limitations under the License. */ import { Mjolnir } from "../Mjolnir"; -import { Permalinks, RichReply } from "matrix-bot-sdk"; +import { Permalinks, RichReply } from "@vector-im/matrix-bot-sdk"; // !mjolnir watch export async function execWatchCommand(roomId: string, event: any, mjolnir: Mjolnir, parts: string[]) { diff --git a/src/config.ts b/src/config.ts index c601386..c49bbd8 100644 --- a/src/config.ts +++ b/src/config.ts @@ -16,7 +16,7 @@ limitations under the License. import * as fs from "fs"; import { load } from "js-yaml"; -import { MatrixClient, LogService } from "matrix-bot-sdk"; +import { MatrixClient, LogService } from "@vector-im/matrix-bot-sdk"; import Config from "config"; export interface IHealthConfig { diff --git a/src/health/healthz.ts b/src/health/healthz.ts index 45fea26..99c3712 100644 --- a/src/health/healthz.ts +++ b/src/health/healthz.ts @@ -15,7 +15,7 @@ limitations under the License. */ import * as http from "http"; -import { LogService } from "matrix-bot-sdk"; +import { LogService } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "../config"; // allowed to use the global configuration since this is only intended to be used by `src/index.ts`. diff --git a/src/index.ts b/src/index.ts index d4e3531..bb1968d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,7 +25,7 @@ import { PantalaimonClient, RichConsoleLogger, SimpleFsStorageProvider -} from "matrix-bot-sdk"; +} from "@vector-im/matrix-bot-sdk"; import { read as configRead } from "./config"; import { Mjolnir } from "./Mjolnir"; diff --git a/src/models/AccessControlUnit.ts b/src/models/AccessControlUnit.ts index add6adc..aebf32b 100644 --- a/src/models/AccessControlUnit.ts +++ b/src/models/AccessControlUnit.ts @@ -16,7 +16,7 @@ limitations under the License. import PolicyList, { ChangeType, ListRuleChange } from "./PolicyList"; import { EntityType, ListRule, Recommendation, RULE_SERVER, RULE_USER } from "./ListRule"; -import { LogService, UserID } from "matrix-bot-sdk"; +import { LogService, UserID } from "@vector-im/matrix-bot-sdk"; import { ServerAcl } from "./ServerAcl"; /** diff --git a/src/models/ListRule.ts b/src/models/ListRule.ts index 18988f5..3f52fbd 100644 --- a/src/models/ListRule.ts +++ b/src/models/ListRule.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixGlob } from "matrix-bot-sdk"; +import { MatrixGlob } from "@vector-im/matrix-bot-sdk"; export enum EntityType { /// `entity` is to be parsed as a glob of users IDs diff --git a/src/models/PolicyList.ts b/src/models/PolicyList.ts index 6a82e78..68d60cd 100644 --- a/src/models/PolicyList.ts +++ b/src/models/PolicyList.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { extractRequestError, LogLevel, LogService, Permalinks, RoomCreateOptions, UserID } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService, Permalinks, RoomCreateOptions, UserID } from "@vector-im/matrix-bot-sdk"; import { EventEmitter } from "events"; import { ALL_RULE_TYPES, EntityType, ListRule, Recommendation, ROOM_RULE_TYPES, RULE_ROOM, RULE_SERVER, RULE_USER, SERVER_RULE_TYPES, USER_RULE_TYPES } from "./ListRule"; import { MatrixSendClient } from "../MatrixEmitter"; diff --git a/src/models/RuleServer.ts b/src/models/RuleServer.ts index 515c131..d70e795 100644 --- a/src/models/RuleServer.ts +++ b/src/models/RuleServer.ts @@ -15,7 +15,7 @@ limitations under the License. */ import BanList, { ChangeType, ListRuleChange } from "./PolicyList" import * as crypto from "crypto"; -import { LogService } from "matrix-bot-sdk"; +import { LogService } from "@vector-im/matrix-bot-sdk"; import { EntityType, ListRule } from "./ListRule"; import PolicyList from "./PolicyList"; diff --git a/src/models/ServerAcl.ts b/src/models/ServerAcl.ts index f9d6eca..30cf69e 100644 --- a/src/models/ServerAcl.ts +++ b/src/models/ServerAcl.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixGlob } from "matrix-bot-sdk"; +import { MatrixGlob } from "@vector-im/matrix-bot-sdk"; import { setToArray } from "../utils"; export interface ServerAclContent { diff --git a/src/protections/BasicFlooding.ts b/src/protections/BasicFlooding.ts index 10ef582..a76b817 100644 --- a/src/protections/BasicFlooding.ts +++ b/src/protections/BasicFlooding.ts @@ -17,7 +17,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { NumberProtectionSetting } from "./ProtectionSettings"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, LogService } from "matrix-bot-sdk"; +import { LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; // if this is exceeded, we'll ban the user for spam and redact their messages export const DEFAULT_MAX_PER_MINUTE = 10; diff --git a/src/protections/DetectFederationLag.ts b/src/protections/DetectFederationLag.ts index 8ffb3f8..da53350 100644 --- a/src/protections/DetectFederationLag.ts +++ b/src/protections/DetectFederationLag.ts @@ -17,7 +17,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { DurationMSProtectionSetting, NumberProtectionSetting, StringSetProtectionSetting } from "./ProtectionSettings"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, UserID } from "matrix-bot-sdk"; +import { LogLevel, UserID } from "@vector-im/matrix-bot-sdk"; const DEFAULT_BUCKET_DURATION_MS = 10_000; const DEFAULT_BUCKET_NUMBER = 6; diff --git a/src/protections/FirstMessageIsImage.ts b/src/protections/FirstMessageIsImage.ts index dd7dd41..31cfe03 100644 --- a/src/protections/FirstMessageIsImage.ts +++ b/src/protections/FirstMessageIsImage.ts @@ -16,7 +16,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, LogService } from "matrix-bot-sdk"; +import { LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; import { isTrueJoinEvent } from "../utils"; export class FirstMessageIsImage extends Protection { diff --git a/src/protections/JoinWaveShortCircuit.ts b/src/protections/JoinWaveShortCircuit.ts index 3746a13..4ad1579 100644 --- a/src/protections/JoinWaveShortCircuit.ts +++ b/src/protections/JoinWaveShortCircuit.ts @@ -17,7 +17,7 @@ limitations under the License. import {Protection} from "./IProtection"; import {Mjolnir} from "../Mjolnir"; import {NumberProtectionSetting} from "./ProtectionSettings"; -import {LogLevel} from "matrix-bot-sdk"; +import {LogLevel} from "@vector-im/matrix-bot-sdk"; const DEFAULT_MAX_PER_TIMESCALE = 50; const DEFAULT_TIMESCALE_MINUTES = 60; diff --git a/src/protections/LocalAbuseReports.ts b/src/protections/LocalAbuseReports.ts index c0ff71f..d6bd468 100644 --- a/src/protections/LocalAbuseReports.ts +++ b/src/protections/LocalAbuseReports.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { LogLevel } from "matrix-bot-sdk"; +import { LogLevel } from "@vector-im/matrix-bot-sdk"; import { Mjolnir } from "../Mjolnir"; import { Protection } from "./IProtection"; diff --git a/src/protections/MessageIsMedia.ts b/src/protections/MessageIsMedia.ts index 7349913..68d1737 100644 --- a/src/protections/MessageIsMedia.ts +++ b/src/protections/MessageIsMedia.ts @@ -16,7 +16,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, Permalinks, UserID } from "matrix-bot-sdk"; +import { LogLevel, Permalinks, UserID } from "@vector-im/matrix-bot-sdk"; export class MessageIsMedia extends Protection { diff --git a/src/protections/MessageIsVoice.ts b/src/protections/MessageIsVoice.ts index ebc0f9a..6c89c14 100644 --- a/src/protections/MessageIsVoice.ts +++ b/src/protections/MessageIsVoice.ts @@ -16,7 +16,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, Permalinks, UserID } from "matrix-bot-sdk"; +import { LogLevel, Permalinks, UserID } from "@vector-im/matrix-bot-sdk"; export class MessageIsVoice extends Protection { diff --git a/src/protections/NsfwProtection.ts b/src/protections/NsfwProtection.ts index 2237b0b..040bf1c 100644 --- a/src/protections/NsfwProtection.ts +++ b/src/protections/NsfwProtection.ts @@ -17,7 +17,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { Mjolnir } from "../Mjolnir"; import * as nsfw from 'nsfwjs'; -import {LogLevel} from "matrix-bot-sdk"; +import {LogLevel} from "@vector-im/matrix-bot-sdk"; import { node } from '@tensorflow/tfjs-node'; diff --git a/src/protections/ProtectionManager.ts b/src/protections/ProtectionManager.ts index 9bd1e2c..eba766e 100644 --- a/src/protections/ProtectionManager.ts +++ b/src/protections/ProtectionManager.ts @@ -24,7 +24,7 @@ import { MessageIsMedia } from "./MessageIsMedia"; import { TrustedReporters } from "./TrustedReporters"; import { JoinWaveShortCircuit } from "./JoinWaveShortCircuit"; import { Mjolnir } from "../Mjolnir"; -import { extractRequestError, LogLevel, LogService, Permalinks } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService, Permalinks } from "@vector-im/matrix-bot-sdk"; import { ProtectionSettingValidationError } from "./ProtectionSettings"; import { Consequence } from "./consequence"; import { htmlEscape } from "../utils"; diff --git a/src/protections/WordList.ts b/src/protections/WordList.ts index 367ae57..d03976b 100644 --- a/src/protections/WordList.ts +++ b/src/protections/WordList.ts @@ -17,7 +17,7 @@ limitations under the License. import { Protection } from "./IProtection"; import { ConsequenceBan, ConsequenceRedact } from "./consequence"; import { Mjolnir } from "../Mjolnir"; -import { LogLevel, LogService } from "matrix-bot-sdk"; +import { LogLevel, LogService } from "@vector-im/matrix-bot-sdk"; import { isTrueJoinEvent } from "../utils"; export class WordList extends Protection { diff --git a/src/queues/EventRedactionQueue.ts b/src/queues/EventRedactionQueue.ts index 1bf333f..effd00b 100644 --- a/src/queues/EventRedactionQueue.ts +++ b/src/queues/EventRedactionQueue.ts @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -import { LogLevel, MatrixClient } from "matrix-bot-sdk" +import { LogLevel, MatrixClient } from "@vector-im/matrix-bot-sdk" import { ERROR_KIND_FATAL } from "../ErrorCache"; import { RoomUpdateError } from "../models/RoomUpdateError"; import { redactUserMessagesIn } from "../utils"; diff --git a/src/queues/ThrottlingQueue.ts b/src/queues/ThrottlingQueue.ts index efa3cce..171ae08 100644 --- a/src/queues/ThrottlingQueue.ts +++ b/src/queues/ThrottlingQueue.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { extractRequestError, LogLevel } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel } from "@vector-im/matrix-bot-sdk"; import { Mjolnir } from "../Mjolnir"; export type Task = (queue: ThrottlingQueue) => Promise; diff --git a/src/queues/UnlistedUserRedactionQueue.ts b/src/queues/UnlistedUserRedactionQueue.ts index ee10fae..90fa50f 100644 --- a/src/queues/UnlistedUserRedactionQueue.ts +++ b/src/queues/UnlistedUserRedactionQueue.ts @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -import { extractRequestError, LogLevel, LogService, Permalinks } from "matrix-bot-sdk"; +import { extractRequestError, LogLevel, LogService, Permalinks } from "@vector-im/matrix-bot-sdk"; import { Mjolnir } from "../Mjolnir"; /** diff --git a/src/report/ReportManager.ts b/src/report/ReportManager.ts index 1d659a5..d00c3bb 100644 --- a/src/report/ReportManager.ts +++ b/src/report/ReportManager.ts @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { PowerLevelAction } from "matrix-bot-sdk/lib/models/PowerLevelAction"; -import { LogService, UserID } from "matrix-bot-sdk"; +import { PowerLevelAction } from "@vector-im/matrix-bot-sdk/lib/models/PowerLevelAction"; +import { LogService, UserID } from "@vector-im/matrix-bot-sdk"; import { htmlToText } from "html-to-text"; import { htmlEscape } from "../utils"; import { JSDOM } from 'jsdom'; diff --git a/src/report/ReportPoller.ts b/src/report/ReportPoller.ts index d1a03c2..913aeb4 100644 --- a/src/report/ReportPoller.ts +++ b/src/report/ReportPoller.ts @@ -16,7 +16,7 @@ limitations under the License. import { Mjolnir, REPORT_POLL_EVENT_TYPE } from "../Mjolnir"; import { ReportManager } from './ReportManager'; -import { LogLevel } from "matrix-bot-sdk"; +import { LogLevel } from "@vector-im/matrix-bot-sdk"; class InvalidStateError extends Error { } diff --git a/src/utils.ts b/src/utils.ts index 40f3244..8eae4ec 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -20,7 +20,7 @@ import { MatrixGlob, getRequestFn, setRequestFn, -} from "matrix-bot-sdk"; +} from "@vector-im/matrix-bot-sdk"; import { ClientRequest, IncomingMessage } from "http"; import { default as parseDuration } from "parse-duration"; import * as Sentry from '@sentry/node'; diff --git a/src/webapis/OpenMetrics.ts b/src/webapis/OpenMetrics.ts index 2bd3d43..fc0b273 100644 --- a/src/webapis/OpenMetrics.ts +++ b/src/webapis/OpenMetrics.ts @@ -16,7 +16,7 @@ limitations under the License. import { Server } from "http"; import express from "express"; -import { LogService } from "matrix-bot-sdk"; +import { LogService } from "@vector-im/matrix-bot-sdk"; import { IHealthConfig } from "../config"; import { collectDefaultMetrics, register } from "prom-client"; diff --git a/src/webapis/WebAPIs.ts b/src/webapis/WebAPIs.ts index e65da08..ddedc46 100644 --- a/src/webapis/WebAPIs.ts +++ b/src/webapis/WebAPIs.ts @@ -16,7 +16,7 @@ limitations under the License. import { Server } from "http"; import express from "express"; -import { LogService, MatrixClient } from "matrix-bot-sdk"; +import { LogService, MatrixClient } from "@vector-im/matrix-bot-sdk"; import RuleServer from "../models/RuleServer"; import { ReportManager } from "../report/ReportManager"; import { IConfig } from "../config"; diff --git a/test/appservice/integration/provisionTest.ts b/test/appservice/integration/provisionTest.ts index 106654a..97f5458 100644 --- a/test/appservice/integration/provisionTest.ts +++ b/test/appservice/integration/provisionTest.ts @@ -1,7 +1,7 @@ import { isPolicyRoom, readTestConfig, setupHarness } from "../utils/harness"; import { newTestUser } from "../../integration/clientHelper"; import { getFirstReply } from "../../integration/commands/commandUtils"; -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { MjolnirAppService } from "../../../src/appservice/AppService"; import dns from 'node:dns'; diff --git a/test/appservice/integration/webAPITest.ts b/test/appservice/integration/webAPITest.ts index 1b5165e..5070e92 100644 --- a/test/appservice/integration/webAPITest.ts +++ b/test/appservice/integration/webAPITest.ts @@ -2,7 +2,7 @@ import { MjolnirAppService } from "../../../src/appservice/AppService"; import { newTestUser } from "../../integration/clientHelper"; import { isPolicyRoom, readTestConfig, setupHarness } from "../utils/harness"; import { CreateMjolnirResponse, MjolnirWebAPIClient } from "../utils/webAPIClient"; -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { getFirstReply } from "../../integration/commands/commandUtils"; import expect from "expect"; import dns from 'node:dns'; diff --git a/test/appservice/utils/harness.ts b/test/appservice/utils/harness.ts index 00ad2ba..e923714 100644 --- a/test/appservice/utils/harness.ts +++ b/test/appservice/utils/harness.ts @@ -4,7 +4,7 @@ import { ensureAliasedRoomExists } from "../../integration/mjolnirSetupUtils"; import { read as configRead, IConfig } from "../../../src/appservice/config/config"; import { newTestUser } from "../../integration/clientHelper"; import PolicyList from "../../../src/models/PolicyList"; -import { CreateEvent, MatrixClient } from "matrix-bot-sdk"; +import { CreateEvent, MatrixClient } from "@vector-im/matrix-bot-sdk"; export function readTestConfig(): IConfig { return configRead(path.join(__dirname, "../../../src/appservice/config/config.harness.yaml")); diff --git a/test/appservice/utils/webAPIClient.ts b/test/appservice/utils/webAPIClient.ts index ef7269b..16e9191 100644 --- a/test/appservice/utils/webAPIClient.ts +++ b/test/appservice/utils/webAPIClient.ts @@ -1,5 +1,5 @@ import * as request from "request"; -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; interface OpenIDTokenInfo { access_token: string, diff --git a/test/integration/acceptInvitesFromSpaceTest.ts b/test/integration/acceptInvitesFromSpaceTest.ts index 3f581a5..a538e8b 100644 --- a/test/integration/acceptInvitesFromSpaceTest.ts +++ b/test/integration/acceptInvitesFromSpaceTest.ts @@ -1,4 +1,4 @@ -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { Mjolnir } from "../../src/Mjolnir" import { newTestUser } from "./clientHelper"; diff --git a/test/integration/banListTest.ts b/test/integration/banListTest.ts index be9bbcd..9a077e0 100644 --- a/test/integration/banListTest.ts +++ b/test/integration/banListTest.ts @@ -1,6 +1,6 @@ import { strict as assert } from "assert"; import { newTestUser } from "./clientHelper"; -import { LogService, MatrixClient, Permalinks, UserID } from "matrix-bot-sdk"; +import { LogService, MatrixClient, Permalinks, UserID } from "@vector-im/matrix-bot-sdk"; import PolicyList, { ChangeType } from "../../src/models/PolicyList"; import { ServerAcl } from "../../src/models/ServerAcl"; import { getFirstReaction } from "./commands/commandUtils"; diff --git a/test/integration/clientHelper.ts b/test/integration/clientHelper.ts index 9a8de47..15c8222 100644 --- a/test/integration/clientHelper.ts +++ b/test/integration/clientHelper.ts @@ -1,5 +1,5 @@ import { HmacSHA1 } from "crypto-js"; -import { getRequestFn, LogService, MatrixClient, MemoryStorageProvider, PantalaimonClient } from "matrix-bot-sdk"; +import { getRequestFn, LogService, MatrixClient, MemoryStorageProvider, PantalaimonClient } from "@vector-im/matrix-bot-sdk"; const REGISTRATION_ATTEMPTS = 10; const REGISTRATION_RETRY_BASE_DELAY_MS = 100; diff --git a/test/integration/commands/commandUtils.ts b/test/integration/commands/commandUtils.ts index 41aff53..d1c053b 100644 --- a/test/integration/commands/commandUtils.ts +++ b/test/integration/commands/commandUtils.ts @@ -1,4 +1,4 @@ -import { MatrixClient } from "matrix-bot-sdk"; +import { MatrixClient } from "@vector-im/matrix-bot-sdk"; import { strict as assert } from "assert"; import * as crypto from "crypto"; import { MatrixEmitter } from "../../../src/MatrixEmitter"; diff --git a/test/integration/commands/makedminCommandTest.ts b/test/integration/commands/makedminCommandTest.ts index 51be7ad..ef703cc 100644 --- a/test/integration/commands/makedminCommandTest.ts +++ b/test/integration/commands/makedminCommandTest.ts @@ -2,7 +2,7 @@ import { newTestUser } from "../clientHelper"; import { PowerLevelAction } from "matrix-bot-sdk/lib/models/PowerLevelAction"; -import { LogService } from "matrix-bot-sdk"; +import { LogService } from "@vector-im/matrix-bot-sdk"; import { getFirstReaction } from "./commandUtils"; describe("Test: The make admin command", function () { diff --git a/test/integration/commands/redactCommandTest.ts b/test/integration/commands/redactCommandTest.ts index 8ddc913..a824b40 100644 --- a/test/integration/commands/redactCommandTest.ts +++ b/test/integration/commands/redactCommandTest.ts @@ -2,7 +2,7 @@ import { strict as assert } from "assert"; import { newTestUser } from "../clientHelper"; import { getMessagesByUserIn } from "../../../src/utils"; -import { LogService } from "matrix-bot-sdk"; +import { LogService } from "@vector-im/matrix-bot-sdk"; import { getFirstReaction } from "./commandUtils"; describe("Test: The redaction command", function () { diff --git a/test/integration/commands/suspendCommandTest.ts b/test/integration/commands/suspendCommandTest.ts index f9afa2c..1223197 100644 --- a/test/integration/commands/suspendCommandTest.ts +++ b/test/integration/commands/suspendCommandTest.ts @@ -16,7 +16,7 @@ limitations under the License. import {newTestUser} from "../clientHelper"; import {strict as assert} from "assert"; -import { MatrixClient, RoomCreateOptions } from "matrix-bot-sdk"; +import { MatrixClient, RoomCreateOptions } from "@vector-im/matrix-bot-sdk"; import { read as configRead } from "../../../src/config"; describe("Test: suspend/unsuspend command", function () { diff --git a/test/integration/detectFederationLagTest.ts b/test/integration/detectFederationLagTest.ts index 16cd23b..35e4192 100644 --- a/test/integration/detectFederationLagTest.ts +++ b/test/integration/detectFederationLagTest.ts @@ -1,6 +1,6 @@ import { strict as assert } from "assert"; -import { UserID } from "matrix-bot-sdk"; +import { UserID } from "@vector-im/matrix-bot-sdk"; import { Suite } from "mocha"; import { Mjolnir } from "../../src/Mjolnir"; import { DetectFederationLag, LAG_STATE_EVENT } from "../../src/protections/DetectFederationLag"; diff --git a/test/integration/mjolnirSetupUtils.ts b/test/integration/mjolnirSetupUtils.ts index 1082c60..91658e6 100644 --- a/test/integration/mjolnirSetupUtils.ts +++ b/test/integration/mjolnirSetupUtils.ts @@ -20,7 +20,7 @@ import { LogService, LogLevel, RichConsoleLogger -} from "matrix-bot-sdk"; +} from "@vector-im/matrix-bot-sdk"; import { Mjolnir} from '../../src/Mjolnir'; import { overrideRatelimitForUser, registerUser } from "./clientHelper"; diff --git a/test/integration/nsfwProtectionTest.ts b/test/integration/nsfwProtectionTest.ts index f1aa8f1..7b867fd 100644 --- a/test/integration/nsfwProtectionTest.ts +++ b/test/integration/nsfwProtectionTest.ts @@ -1,6 +1,6 @@ import {newTestUser} from "./clientHelper"; -import {MatrixClient} from "matrix-bot-sdk"; +import {MatrixClient} from "@vector-im/matrix-bot-sdk"; import {getFirstReaction} from "./commands/commandUtils"; import {strict as assert} from "assert"; import { readFileSync } from 'fs'; diff --git a/test/integration/openMetricsTest.ts b/test/integration/openMetricsTest.ts index fb1d57d..61da8d5 100644 --- a/test/integration/openMetricsTest.ts +++ b/test/integration/openMetricsTest.ts @@ -1,5 +1,5 @@ import { strict as assert } from "assert"; -import { getRequestFn } from "matrix-bot-sdk"; +import { getRequestFn } from "@vector-im/matrix-bot-sdk"; import { IConfig } from "../../src/config"; diff --git a/test/integration/policyConsumptionTest.ts b/test/integration/policyConsumptionTest.ts index a3b8c2d..7decb7f 100644 --- a/test/integration/policyConsumptionTest.ts +++ b/test/integration/policyConsumptionTest.ts @@ -3,7 +3,7 @@ import { strict as assert } from "assert"; import { newTestUser } from "./clientHelper"; import { Mjolnir } from "../../src/Mjolnir"; import { read as configRead } from "../../src/config"; -import { getRequestFn, LogService } from "matrix-bot-sdk"; +import { getRequestFn, LogService } from "@vector-im/matrix-bot-sdk"; import { createBanList, getFirstReaction } from "./commands/commandUtils"; /** diff --git a/test/integration/protectedRoomsConfigTest.ts b/test/integration/protectedRoomsConfigTest.ts index bbfb8e7..d85196c 100644 --- a/test/integration/protectedRoomsConfigTest.ts +++ b/test/integration/protectedRoomsConfigTest.ts @@ -1,6 +1,6 @@ import { strict as assert } from "assert"; -import { MatrixClient, Permalinks, UserID } from "matrix-bot-sdk"; +import { MatrixClient, Permalinks, UserID } from "@vector-im/matrix-bot-sdk"; import { MatrixSendClient } from "../../src/MatrixEmitter"; import { Mjolnir } from "../../src/Mjolnir"; import PolicyList from "../../src/models/PolicyList"; diff --git a/test/integration/throttleQueueTest.ts b/test/integration/throttleQueueTest.ts index 829e3f3..1a461f6 100644 --- a/test/integration/throttleQueueTest.ts +++ b/test/integration/throttleQueueTest.ts @@ -1,6 +1,6 @@ import { strict as assert } from "assert"; -import { UserID } from "matrix-bot-sdk"; +import { UserID } from "@vector-im/matrix-bot-sdk"; import { ThrottlingQueue } from "../../src/queues/ThrottlingQueue"; describe("Test: ThrottlingQueue", function() { diff --git a/test/integration/utilsTest.ts b/test/integration/utilsTest.ts index 41c396d..8e33b28 100644 --- a/test/integration/utilsTest.ts +++ b/test/integration/utilsTest.ts @@ -1,5 +1,5 @@ import { strict as assert } from "assert"; -import { LogLevel } from "matrix-bot-sdk"; +import { LogLevel } from "@vector-im/matrix-bot-sdk"; import ManagementRoomOutput from "../../src/ManagementRoomOutput"; describe("Test: utils", function() { From 07ee4f580fe779905610ae18d92b28b2997d7cd2 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 19 Sep 2024 14:08:37 +0100 Subject: [PATCH 3/5] Node 20 --- .github/workflows/mjolnir.yml | 8 ++++---- Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mjolnir.yml b/.github/workflows/mjolnir.yml index 85a2313..44434bf 100644 --- a/.github/workflows/mjolnir.yml +++ b/.github/workflows/mjolnir.yml @@ -20,7 +20,7 @@ jobs: - name: Specifically use node 18 like in the readme. uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: yarn install - run: yarn build - run: yarn lint @@ -32,7 +32,7 @@ jobs: - name: Specifically use node 18 like in the readme. uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - run: yarn install - run: yarn test integration: @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - name: Fetch and build mx-tester (cached across runs) uses: baptiste0928/cargo-install@v1 with: @@ -65,7 +65,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' - name: Fetch and build mx-tester (cached across runs) uses: baptiste0928/cargo-install@v1 with: diff --git a/Dockerfile b/Dockerfile index 9cf5859..e3c32d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # We can't use alpine anymore because crypto has rust deps. -FROM node:18-slim +FROM node:20-slim COPY . /tmp/src RUN cd /tmp/src \ && yarn install \ From 1e03128e929127c2855ff7affbbcc6549340ee8b Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 19 Sep 2024 14:38:49 +0100 Subject: [PATCH 4/5] bump bump the package --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index db87e17..90a4acd 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "humanize-duration-ts": "^2.1.1", "js-yaml": "^4.1.0", "jsdom": "^16.6.0", - "@vector-im/matrix-bot-sdk": "^0.7.1-element.5", - "matrix-appservice-bridge": "10.3.0", + "@vector-im/matrix-bot-sdk": "^0.7.1-element.6", + "matrix-appservice-bridge": "10.3.1", "nsfwjs": "^4.1.0", "parse-duration": "^1.0.2", "pg": "^8.8.0", diff --git a/yarn.lock b/yarn.lock index 0232e41..ead6faa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -537,10 +537,10 @@ resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@vector-im/matrix-bot-sdk@^0.7.1-element.5": - version "0.7.1-element.5" - resolved "https://registry.yarnpkg.com/@vector-im/matrix-bot-sdk/-/matrix-bot-sdk-0.7.1-element.5.tgz#ce4b47a96a2138165bf8f73b1bc31641ac37645b" - integrity sha512-jLe9aZIQHPJVC18A99eAzxQpQbw0lw2o7nk36NK2zyT1SpntQ7PGDu76O5ADSIc9dzssqjs7gSp2vpmeVIaTkA== +"@vector-im/matrix-bot-sdk@^0.7.1-element.6": + version "0.7.1-element.6" + resolved "https://registry.yarnpkg.com/@vector-im/matrix-bot-sdk/-/matrix-bot-sdk-0.7.1-element.6.tgz#d1f8a86d3bd60084d92d150f42a48b25199871e1" + integrity sha512-0KfyTpQV5eyY4vPUZW89t7EZf1YF0UyFkyYqpsxL/6S7XIlbTMC4onod7vx/QpKC0lSREmwIiXx2JSjExP6CIw== dependencies: "@matrix-org/matrix-sdk-crypto-nodejs" "0.2.0-beta.1" "@types/express" "^4.17.21" @@ -2596,14 +2596,14 @@ make-error@^1.1.1: resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -matrix-appservice-bridge@10.3.0: - version "10.3.0" - resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-10.3.0.tgz#3e753aec7459e3ebcd9d864d90c19f66ac663c6b" - integrity sha512-+xlUOfp5gT28iv4yIxv2ETVCq1tiHn8BL0ks7UpU6wCpGCJgnoswP7A2yzkDCfiUxrhGgyWuhaN0WJCj1IXsPg== +matrix-appservice-bridge@10.3.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/matrix-appservice-bridge/-/matrix-appservice-bridge-10.3.1.tgz#8f45b616a69ddd599bc8e4fb9b60c950cce10550" + integrity sha512-umBLAqLUdm6TefEdQuHUE0QfSmbtJf+LnHDYRM5XwpMjScIXQ/5pI6559gVQrxVVT5T58jbNuoJCz2+8+XLr3Q== dependencies: "@alloc/quick-lru" "^5.2.0" "@types/nedb" "^1.8.16" - "@vector-im/matrix-bot-sdk" "^0.7.1-element.5" + "@vector-im/matrix-bot-sdk" "^0.7.1-element.6" chalk "^4.1.0" express "^4.18.2" express-rate-limit "^7.1.5" From b1e2a3ef19e0821e2b676a3949adf46715f21632 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Thu, 19 Sep 2024 14:43:58 +0100 Subject: [PATCH 5/5] Disable stores --- src/appservice/AppService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/appservice/AppService.ts b/src/appservice/AppService.ts index 90f559c..953f40a 100644 --- a/src/appservice/AppService.ts +++ b/src/appservice/AppService.ts @@ -67,6 +67,7 @@ export class MjolnirAppService { onEvent: () => {throw new Error("Mjolnir uninitialized")}, }, suppressEcho: false, + disableStores: true, }); await bridge.initialise(); const accessControlListId = await bridge.getBot().getClient().resolveRoom(config.accessControlList);