diff --git a/config/default.yaml b/config/default.yaml index 9ba7cb3..7a4287a 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -110,13 +110,3 @@ bigbluebutton: # Usually this doen't need to be changed, however if your homeserver # is not able to reach t2bot.io then you should specify your own here. widgetAvatarUrl: "mxc://t2bot.io/be1650140620d8bb61a8cf5baeb05f24a734434c" - -# Settings for controlling how logging works -logging: - file: logs/dimension.log - console: true - consoleLevel: info - fileLevel: verbose - rotate: - size: 52428800 # bytes, default is 50mb - count: 5 diff --git a/package-lock.json b/package-lock.json index 9789173..c4a7d5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,6 @@ "js-yaml": "^4.1.0", "lodash": "^4.17.21", "matrix-bot-sdk": "^0.5.19", - "matrix-js-snippets": "^0.2.8", "memory-cache": "^0.2.0", "mime": "^2.5.2", "moment": "^2.29.1", @@ -6537,11 +6536,6 @@ "node": ">=8" } }, - "node_modules/async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" - }, "node_modules/async-each": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", @@ -7459,7 +7453,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, "engines": { "node": ">=6" } @@ -7629,17 +7622,6 @@ "node": ">=8" } }, - "node_modules/chokidar/node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/chokidar/node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -7823,11 +7805,6 @@ "node": ">=8" } }, - "node_modules/cliui/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "node_modules/cliui/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -7968,14 +7945,6 @@ "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, - "node_modules/colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -8240,14 +8209,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, "node_modules/copy-webpack-plugin/node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -8256,11 +8217,6 @@ "node": ">=8" } }, - "node_modules/copy-webpack-plugin/node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, "node_modules/copy-webpack-plugin/node_modules/glob-parent": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz", @@ -8291,17 +8247,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/copy-webpack-plugin/node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/copy-webpack-plugin/node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -9015,14 +8960,6 @@ "node": ">=8.0.0" } }, - "node_modules/cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -10667,14 +10604,6 @@ "node >=0.6.0" ] }, - "node_modules/eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "engines": { - "node": "> 0.1.90" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -10728,17 +10657,6 @@ "node": ">= 6" } }, - "node_modules/fast-glob/node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fast-glob/node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -11433,11 +11351,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/har-validator/node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -11972,7 +11885,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -11988,7 +11900,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "dependencies": { "callsites": "^3.0.0" }, @@ -12000,7 +11911,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, "engines": { "node": ">=4" } @@ -13538,32 +13448,6 @@ "node": ">=8" } }, - "node_modules/matrix-js-snippets": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/matrix-js-snippets/-/matrix-js-snippets-0.2.8.tgz", - "integrity": "sha512-vsqxoCOXeItC3CZG7DRZFhU6PzM+QpkqNzB7ENlRTrDNhG2kkxRdnXl94OCV/bDA1sCHqFXERGNS/LEuB6mjJw==", - "dependencies": { - "chalk": "^2.3.0", - "moment": "^2.19.4", - "typescript": "^2.6.2", - "winston": "^2.4.0" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/matrix-js-snippets/node_modules/typescript": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/mdn-data": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", @@ -17148,14 +17032,6 @@ "webpack": "^5.0.0" } }, - "node_modules/postcss-loader/node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/postcss-loader/node_modules/cosmiconfig": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", @@ -17171,43 +17047,6 @@ "node": ">=10" } }, - "node_modules/postcss-loader/node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/postcss-loader/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/postcss-loader/node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/postcss-loader/node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -17225,41 +17064,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/postcss-loader/node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/postcss-loader/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-loader/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/postcss-loader/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/postcss-logical": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz", @@ -18883,60 +18687,6 @@ "strip-ansi": "^3.0.1" } }, - "node_modules/renderkid/node_modules/css-select": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", - "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", - "devOptional": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^5.0.0", - "domhandler": "^4.2.0", - "domutils": "^2.6.0", - "nth-check": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/renderkid/node_modules/css-what": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", - "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", - "devOptional": true, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/renderkid/node_modules/dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "devOptional": true, - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/renderkid/node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "devOptional": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, "node_modules/renderkid/node_modules/domhandler": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", @@ -18952,29 +18702,6 @@ "url": "https://github.com/fb55/domhandler?sponsor=1" } }, - "node_modules/renderkid/node_modules/domutils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz", - "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==", - "devOptional": true, - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/renderkid/node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "devOptional": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/renderkid/node_modules/htmlparser2": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", @@ -20595,14 +20322,6 @@ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "engines": { - "node": "*" - } - }, "node_modules/static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -21569,15 +21288,6 @@ } } }, - "node_modules/ts-node-dev/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/ts-node-dev/node_modules/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -23169,22 +22879,6 @@ "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, - "node_modules/winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", - "dependencies": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "engines": { - "node": ">= 0.10.0" - } - }, "node_modules/wkx": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", @@ -23256,11 +22950,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -23423,11 +23112,6 @@ "node": ">=8" } }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "node_modules/yargs/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -28241,11 +27925,6 @@ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" - }, "async-each": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", @@ -28963,8 +28642,7 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "camel-case": { "version": "4.1.2", @@ -29097,14 +28775,6 @@ "binary-extensions": "^2.0.0" } }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -29238,11 +28908,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -29363,11 +29028,6 @@ "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -29578,22 +29238,11 @@ "uri-js": "^4.2.2" } }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} - }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, "glob-parent": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz", @@ -29615,14 +29264,6 @@ "slash": "^3.0.0" } }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -30148,11 +29789,6 @@ "css-tree": "^1.1.2" } }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=" - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -31408,11 +31044,6 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -31454,14 +31085,6 @@ "is-glob": "^4.0.1" } }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -32008,11 +31631,6 @@ "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" } } }, @@ -32421,7 +32039,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -32431,7 +32048,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "requires": { "callsites": "^3.0.0" } @@ -32439,8 +32055,7 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" } } }, @@ -33612,24 +33227,6 @@ } } }, - "matrix-js-snippets": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/matrix-js-snippets/-/matrix-js-snippets-0.2.8.tgz", - "integrity": "sha512-vsqxoCOXeItC3CZG7DRZFhU6PzM+QpkqNzB7ENlRTrDNhG2kkxRdnXl94OCV/bDA1sCHqFXERGNS/LEuB6mjJw==", - "requires": { - "chalk": "^2.3.0", - "moment": "^2.19.4", - "typescript": "^2.6.2", - "winston": "^2.4.0" - }, - "dependencies": { - "typescript": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", - "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==" - } - } - }, "mdn-data": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", @@ -36482,11 +36079,6 @@ "semver": "^7.3.5" }, "dependencies": { - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - }, "cosmiconfig": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", @@ -36499,31 +36091,6 @@ "yaml": "^1.10.0" } }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "requires": { - "callsites": "^3.0.0" - } - }, "parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -36534,29 +36101,6 @@ "json-parse-even-better-errors": "^2.3.0", "lines-and-columns": "^1.1.6" } - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, @@ -37804,42 +37348,6 @@ "strip-ansi": "^3.0.1" }, "dependencies": { - "css-select": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", - "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", - "devOptional": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^5.0.0", - "domhandler": "^4.2.0", - "domutils": "^2.6.0", - "nth-check": "^2.0.0" - } - }, - "css-what": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", - "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==", - "devOptional": true - }, - "dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "devOptional": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "devOptional": true - }, "domhandler": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", @@ -37849,23 +37357,6 @@ "domelementtype": "^2.2.0" } }, - "domutils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz", - "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==", - "devOptional": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "devOptional": true - }, "htmlparser2": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", @@ -39053,11 +38544,6 @@ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" - }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", @@ -39741,12 +39227,6 @@ "tsconfig": "^7.0.0" }, "dependencies": { - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -40905,19 +40385,6 @@ "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, - "winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - } - }, "wkx": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", @@ -40968,11 +40435,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -41094,11 +40556,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", diff --git a/package.json b/package.json index 7327e35..a83f35d 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "js-yaml": "^4.1.0", "lodash": "^4.17.21", "matrix-bot-sdk": "^0.5.19", - "matrix-js-snippets": "^0.2.8", "memory-cache": "^0.2.0", "mime": "^2.5.2", "moment": "^2.29.1", @@ -84,13 +83,13 @@ "zone.js": "^0.11.4" }, "devDependencies": { - "@angular/cli": "^12.2.1", - "@angular/compiler-cli": "^12.2.2", "@angular-eslint/builder": "12.3.1", "@angular-eslint/eslint-plugin": "12.3.1", "@angular-eslint/eslint-plugin-template": "12.3.1", "@angular-eslint/schematics": "12.3.1", "@angular-eslint/template-parser": "12.3.1", + "@angular/cli": "^12.2.1", + "@angular/compiler-cli": "^12.2.2", "@babel/core": "^7.15.0", "@babel/preset-env": "^7.15.0", "@biesbjerg/ngx-translate-extract": "^7.0.4", @@ -142,4 +141,4 @@ "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.0.0" } -} \ No newline at end of file +} diff --git a/src/MemoryCache.ts b/src/MemoryCache.ts index 0eb78c5..f856771 100644 --- a/src/MemoryCache.ts +++ b/src/MemoryCache.ts @@ -1,5 +1,5 @@ import * as memoryCache from "memory-cache"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; export class MemoryCache { diff --git a/src/api/Webserver.ts b/src/api/Webserver.ts index 15b848e..a12ccb8 100644 --- a/src/api/Webserver.ts +++ b/src/api/Webserver.ts @@ -2,7 +2,7 @@ import * as express from "express"; import * as path from "path"; import * as bodyParser from "body-parser"; import * as URL from "url"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { Server } from "typescript-rest"; import * as _ from "lodash"; import config from "../config"; diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts index 8a748d0..8d58d1e 100644 --- a/src/api/admin/AdminAppserviceService.ts +++ b/src/api/admin/AdminAppserviceService.ts @@ -3,7 +3,7 @@ import AppService from "../../db/models/AppService"; import { AppserviceStore } from "../../db/AppserviceStore"; import { ApiError } from "../ApiError"; import { MatrixAppserviceClient } from "../../matrix/MatrixAppserviceClient"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; interface AppserviceResponse { @@ -87,4 +87,4 @@ export class AdminAppserviceService { userPrefix: as.userPrefix, }; } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminCustomSimpleBotService.ts b/src/api/admin/AdminCustomSimpleBotService.ts index c9534ff..d6862a3 100644 --- a/src/api/admin/AdminCustomSimpleBotService.ts +++ b/src/api/admin/AdminCustomSimpleBotService.ts @@ -1,6 +1,6 @@ import { Context, DELETE, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; import { ApiError } from "../ApiError"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { BotStore } from "../../db/BotStore"; import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; @@ -90,4 +90,4 @@ export class AdminCustomSimpleBotService { const profile = await BotStore.getProfile(userId); return {name: profile.displayName, avatarUrl: profile.avatarMxc}; } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminIntegrationsService.ts b/src/api/admin/AdminIntegrationsService.ts index 2bba8b4..0ee353a 100644 --- a/src/api/admin/AdminIntegrationsService.ts +++ b/src/api/admin/AdminIntegrationsService.ts @@ -4,7 +4,7 @@ import { DimensionIntegrationsService } from "../dimension/DimensionIntegrations import { WidgetStore } from "../../db/WidgetStore"; import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache"; import { Integration } from "../../integrations/Integration"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { BridgeStore } from "../../db/BridgeStore"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; @@ -66,4 +66,4 @@ export class AdminIntegrationsService { else if (category === "bridge") return await DimensionIntegrationsService.getBridges(false, userId); else throw new ApiError(400, "Unrecongized category"); } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminIrcService.ts b/src/api/admin/AdminIrcService.ts index 2d03070..c00507e 100644 --- a/src/api/admin/AdminIrcService.ts +++ b/src/api/admin/AdminIrcService.ts @@ -1,6 +1,6 @@ import { Context, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; import { Cache, CACHE_INTEGRATIONS, CACHE_IRC_BRIDGE } from "../../MemoryCache"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import IrcBridgeRecord from "../../db/models/IrcBridgeRecord"; import { AvailableNetworks, IrcBridge } from "../../bridges/IrcBridge"; @@ -156,4 +156,4 @@ export class AdminIrcService { Cache.for(CACHE_INTEGRATIONS).clear(); return this.getBridge(bridge.id); } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts index d7d6a68..b85a57b 100644 --- a/src/api/admin/AdminNebService.ts +++ b/src/api/admin/AdminNebService.ts @@ -2,7 +2,7 @@ import { Context, GET, Path, PathParam, POST, Security, ServiceContext } from "t import { Cache, CACHE_INTEGRATIONS, CACHE_NEB } from "../../MemoryCache"; import { NebStore } from "../../db/NebStore"; import { NebConfig } from "../../models/neb"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; @@ -123,4 +123,4 @@ export class AdminNebService { throw new ApiError(500, "Error creating go-neb instance"); } } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminSlackService.ts b/src/api/admin/AdminSlackService.ts index a160ffd..5ec7e75 100644 --- a/src/api/admin/AdminSlackService.ts +++ b/src/api/admin/AdminSlackService.ts @@ -1,6 +1,6 @@ import { Context, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; import { Cache, CACHE_INTEGRATIONS, CACHE_SLACK_BRIDGE } from "../../MemoryCache"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import Upstream from "../../db/models/Upstream"; import SlackBridgeRecord from "../../db/models/SlackBridgeRecord"; @@ -112,4 +112,4 @@ export class AdminSlackService { Cache.for(CACHE_INTEGRATIONS).clear(); return this.getBridge(bridge.id); } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminStickerService.ts b/src/api/admin/AdminStickerService.ts index c7464a8..de854f3 100644 --- a/src/api/admin/AdminStickerService.ts +++ b/src/api/admin/AdminStickerService.ts @@ -1,4 +1,4 @@ -import { Context, GET, Path, PathParam, POST, DELETE, Security, ServiceContext } from "typescript-rest"; +import { Context, DELETE, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; import StickerPack from "../../db/models/StickerPack"; import { ApiError } from "../ApiError"; import { DimensionStickerService, MemoryStickerPack } from "../dimension/DimensionStickerService"; @@ -7,7 +7,7 @@ import { TelegramBot } from "../../utils/TelegramBot"; import { MatrixLiteClient } from "../../matrix/MatrixLiteClient"; import config from "../../config"; import Sticker from "../../db/models/Sticker"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as sharp from "sharp"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; diff --git a/src/api/admin/AdminTelegramService.ts b/src/api/admin/AdminTelegramService.ts index ec48c3a..c2f2a13 100644 --- a/src/api/admin/AdminTelegramService.ts +++ b/src/api/admin/AdminTelegramService.ts @@ -1,6 +1,6 @@ import { Context, GET, Path, PathParam, POST, QueryParam, Security, ServiceContext } from "typescript-rest"; import { Cache, CACHE_INTEGRATIONS, CACHE_TELEGRAM_BRIDGE } from "../../MemoryCache"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import TelegramBridgeRecord from "../../db/models/TelegramBridgeRecord"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; @@ -119,4 +119,4 @@ export class AdminTelegramService { Cache.for(CACHE_INTEGRATIONS).clear(); return this.getBridge(bridge.id); } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminUpstreamService.ts b/src/api/admin/AdminUpstreamService.ts index 0c297a3..e1e3ec4 100644 --- a/src/api/admin/AdminUpstreamService.ts +++ b/src/api/admin/AdminUpstreamService.ts @@ -1,7 +1,7 @@ import { Context, GET, Path, POST, Security, ServiceContext } from "typescript-rest"; import { Cache, CACHE_SCALAR_ACCOUNTS, CACHE_UPSTREAM } from "../../MemoryCache"; import Upstream from "../../db/models/Upstream"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; interface UpstreamRepsonse { @@ -70,4 +70,4 @@ export class AdminUpstreamService { apiUrl: upstream.apiUrl }; } -} \ No newline at end of file +} diff --git a/src/api/admin/AdminWebhooksService.ts b/src/api/admin/AdminWebhooksService.ts index 8f85d47..f492b13 100644 --- a/src/api/admin/AdminWebhooksService.ts +++ b/src/api/admin/AdminWebhooksService.ts @@ -1,6 +1,6 @@ import { Context, GET, Path, PathParam, POST, QueryParam, Security, ServiceContext } from "typescript-rest"; import { Cache, CACHE_INTEGRATIONS, CACHE_WEBHOOKS_BRIDGE } from "../../MemoryCache"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import WebhookBridgeRecord from "../../db/models/WebhookBridgeRecord"; import { ROLE_ADMIN, ROLE_USER } from "../security/MatrixSecurity"; @@ -107,4 +107,4 @@ export class AdminWebhooksService { Cache.for(CACHE_INTEGRATIONS).clear(); return this.getBridge(bridge.id); } -} \ No newline at end of file +} diff --git a/src/api/controllers/AccountController.ts b/src/api/controllers/AccountController.ts index 59ea58a..b7dccc6 100644 --- a/src/api/controllers/AccountController.ts +++ b/src/api/controllers/AccountController.ts @@ -1,6 +1,6 @@ import { OpenId } from "../../models/OpenId"; import { MatrixOpenIdClient } from "../../matrix/MatrixOpenIdClient"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ApiError } from "../ApiError"; import User from "../../db/models/User"; import Upstream from "../../db/models/Upstream"; @@ -122,4 +122,4 @@ export default class AccountController { Cache.for(CACHE_SCALAR_ACCOUNTS).clear(); return {}; } -} \ No newline at end of file +} diff --git a/src/api/controllers/TermsController.ts b/src/api/controllers/TermsController.ts index d885582..e27293c 100644 --- a/src/api/controllers/TermsController.ts +++ b/src/api/controllers/TermsController.ts @@ -6,7 +6,7 @@ import { Op } from "sequelize"; import { Cache, CACHE_TERMS } from "../../MemoryCache"; import UserScalarToken from "../../db/models/UserScalarToken"; import Upstream from "../../db/models/Upstream"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { ScalarClient } from "../../scalar/ScalarClient"; import { md5 } from "../../utils/hashing"; import TermsUpstreamRecord from "../../db/models/TermsUpstreamRecord"; @@ -273,4 +273,4 @@ export default class TermsController { languages: languages, }; } -} \ No newline at end of file +} diff --git a/src/api/dimension/DimensionBigBlueButtonService.ts b/src/api/dimension/DimensionBigBlueButtonService.ts index 635624d..ef788f2 100644 --- a/src/api/dimension/DimensionBigBlueButtonService.ts +++ b/src/api/dimension/DimensionBigBlueButtonService.ts @@ -1,9 +1,13 @@ -import { GET, POST, Path, QueryParam } from "typescript-rest"; +import { GET, Path, POST, QueryParam } from "typescript-rest"; import * as request from "request"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { URL } from "url"; import { BigBlueButtonGetJoinUrlRequest } from "../../models/Widget"; -import { BigBlueButtonJoinResponse, BigBlueButtonCreateAndJoinMeetingResponse, BigBlueButtonWidgetResponse } from "../../models/WidgetResponses"; +import { + BigBlueButtonCreateAndJoinMeetingResponse, + BigBlueButtonJoinResponse, + BigBlueButtonWidgetResponse +} from "../../models/WidgetResponses"; import { ApiError } from "../ApiError"; import { sha256 } from "../../utils/hashing"; import config from "../../config"; diff --git a/src/api/dimension/DimensionHealthService.ts b/src/api/dimension/DimensionHealthService.ts index 7cda207..098fbb2 100644 --- a/src/api/dimension/DimensionHealthService.ts +++ b/src/api/dimension/DimensionHealthService.ts @@ -1,5 +1,5 @@ import { GET, Path } from "typescript-rest"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; /** * API for the health of Dimension @@ -13,4 +13,4 @@ export class DimensionHealthService { LogService.info("DimensionHealthService", "Heartbeat called"); return {}; // 200 OK } -} \ No newline at end of file +} diff --git a/src/api/dimension/DimensionIrcService.ts b/src/api/dimension/DimensionIrcService.ts index f0387f6..f457591 100644 --- a/src/api/dimension/DimensionIrcService.ts +++ b/src/api/dimension/DimensionIrcService.ts @@ -1,5 +1,5 @@ import { Context, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { IrcBridge } from "../../bridges/IrcBridge"; import IrcBridgeRecord from "../../db/models/IrcBridgeRecord"; import { ApiError } from "../ApiError"; @@ -65,4 +65,4 @@ export class DimensionIrcService { LogService.info("DimensionIrcService", userId + " unlinked #" + channelNoHash + " on " + networkId + " from " + roomId); return {}; // 200 OK } -} \ No newline at end of file +} diff --git a/src/api/dimension/DimensionSlackService.ts b/src/api/dimension/DimensionSlackService.ts index 0eab69f..883c6e5 100644 --- a/src/api/dimension/DimensionSlackService.ts +++ b/src/api/dimension/DimensionSlackService.ts @@ -1,6 +1,6 @@ import { Context, DELETE, GET, Path, PathParam, POST, Security, ServiceContext } from "typescript-rest"; import { ApiError } from "../ApiError"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { BridgedChannel, SlackBridge } from "../../bridges/SlackBridge"; import { SlackChannel, SlackTeam } from "../../bridges/models/slack"; import { ROLE_USER } from "../security/MatrixSecurity"; @@ -109,4 +109,4 @@ export class DimensionSlackService { throw new ApiError(400, "Error getting auth info"); } } -} \ No newline at end of file +} diff --git a/src/api/dimension/DimensionWebhooksService.ts b/src/api/dimension/DimensionWebhooksService.ts index 283a56e..de3224f 100644 --- a/src/api/dimension/DimensionWebhooksService.ts +++ b/src/api/dimension/DimensionWebhooksService.ts @@ -13,7 +13,7 @@ import { SuccessResponse, WebhookConfiguration, WebhookOptions } from "../../bri import { WebhooksBridge } from "../../bridges/WebhooksBridge"; import Webhook from "../../db/models/Webhook"; import { ApiError } from "../ApiError"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import { ROLE_USER } from "../security/MatrixSecurity"; @@ -79,4 +79,4 @@ export class DimensionWebhooksService { const webhooks = new WebhooksBridge(userId); return webhooks.deleteWebhook(roomId, hookId); } -} \ No newline at end of file +} diff --git a/src/api/dimension/DimensionWidgetService.ts b/src/api/dimension/DimensionWidgetService.ts index aefd14d..f8a8171 100644 --- a/src/api/dimension/DimensionWidgetService.ts +++ b/src/api/dimension/DimensionWidgetService.ts @@ -1,5 +1,5 @@ import { GET, Path, PathParam, QueryParam } from "typescript-rest"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as url from "url"; import { promises as dnsPromises } from 'dns'; import { ApiError } from "../ApiError"; @@ -101,4 +101,4 @@ export class DimensionWidgetService { return {canEmbed: true}; } -} \ No newline at end of file +} diff --git a/src/api/matrix/MatrixAppServiceApiService.ts b/src/api/matrix/MatrixAppServiceApiService.ts index aacde01..7f559b2 100644 --- a/src/api/matrix/MatrixAppServiceApiService.ts +++ b/src/api/matrix/MatrixAppServiceApiService.ts @@ -1,6 +1,6 @@ import { GET, Path, PathParam, PUT, QueryParam } from "typescript-rest"; import { ApiError } from "../ApiError"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { SimplifiedMatrixEvent } from "../../models/MatrixEvent"; import { AppserviceStore } from "../../db/AppserviceStore"; @@ -71,4 +71,4 @@ export class MatrixAppServiceApiService { } } -} \ No newline at end of file +} diff --git a/src/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts index 7418d22..67847bb 100644 --- a/src/api/scalar/ScalarWidgetService.ts +++ b/src/api/scalar/ScalarWidgetService.ts @@ -1,5 +1,5 @@ import { GET, Path, QueryParam, Security } from "typescript-rest"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { Cache, CACHE_WIDGET_TITLES } from "../../MemoryCache"; import { MatrixLiteClient } from "../../matrix/MatrixLiteClient"; import config from "../../config"; diff --git a/src/api/security/MatrixSecurity.ts b/src/api/security/MatrixSecurity.ts index 5191209..f164d06 100644 --- a/src/api/security/MatrixSecurity.ts +++ b/src/api/security/MatrixSecurity.ts @@ -1,7 +1,7 @@ import { ServiceAuthenticator } from "typescript-rest"; import { Request, RequestHandler, Response, Router } from "express"; import { ApiError } from "../ApiError"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import AccountController from "../controllers/AccountController"; import TermsController from "../controllers/TermsController"; import config from "../../config"; @@ -130,4 +130,4 @@ export default class MatrixSecurity implements ServiceAuthenticator { return false; } -} \ No newline at end of file +} diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts index 608fa04..3fde7a7 100644 --- a/src/bridges/IrcBridge.ts +++ b/src/bridges/IrcBridge.ts @@ -3,7 +3,7 @@ import { Cache, CACHE_IRC_BRIDGE } from "../MemoryCache"; import IrcBridgeRecord from "../db/models/IrcBridgeRecord"; import Upstream from "../db/models/Upstream"; import UserScalarToken from "../db/models/UserScalarToken"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import { ListLinksResponseItem, ListOpsResponse, QueryNetworksResponse } from "./models/irc"; import IrcBridgeNetwork from "../db/models/IrcBridgeNetwork"; @@ -346,4 +346,4 @@ export class IrcBridge { }); }); } -} \ No newline at end of file +} diff --git a/src/bridges/SlackBridge.ts b/src/bridges/SlackBridge.ts index bd7438f..5b9bbf1 100644 --- a/src/bridges/SlackBridge.ts +++ b/src/bridges/SlackBridge.ts @@ -1,7 +1,7 @@ import IrcBridgeRecord from "../db/models/IrcBridgeRecord"; import Upstream from "../db/models/Upstream"; import UserScalarToken from "../db/models/UserScalarToken"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import { ModularSlackResponse } from "../models/ModularResponses"; import SlackBridgeRecord from "../db/models/SlackBridgeRecord"; @@ -319,4 +319,4 @@ export class SlackBridge { }); }); } -} \ No newline at end of file +} diff --git a/src/bridges/TelegramBridge.ts b/src/bridges/TelegramBridge.ts index 4db065e..0b654ed 100644 --- a/src/bridges/TelegramBridge.ts +++ b/src/bridges/TelegramBridge.ts @@ -1,5 +1,5 @@ import TelegramBridgeRecord from "../db/models/TelegramBridgeRecord"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import { BridgeInfoResponse, @@ -233,4 +233,4 @@ export class TelegramBridge { }); }); } -} \ No newline at end of file +} diff --git a/src/bridges/WebhooksBridge.ts b/src/bridges/WebhooksBridge.ts index f8be37f..d882c3b 100644 --- a/src/bridges/WebhooksBridge.ts +++ b/src/bridges/WebhooksBridge.ts @@ -1,4 +1,4 @@ -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import { ListWebhooksResponse, @@ -101,4 +101,4 @@ export class WebhooksBridge { }); }); } -} \ No newline at end of file +} diff --git a/src/config.ts b/src/config.ts index 6e90b8b..c6c2cd7 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,5 +1,5 @@ import * as config from "config"; -import { LogConfig } from "matrix-js-snippets"; +import { LogConfig } from "matrix-bot-sdk"; export interface DimensionConfig { web: { diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts index 2fe61d3..3376407 100644 --- a/src/db/AppserviceStore.ts +++ b/src/db/AppserviceStore.ts @@ -2,7 +2,7 @@ import AppService from "./models/AppService"; import AppServiceUser from "./models/AppServiceUser"; import * as randomString from "random-string"; import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; export class AppserviceStore { @@ -77,4 +77,4 @@ export class AppserviceStore { private constructor() { } -} \ No newline at end of file +} diff --git a/src/db/BotStore.ts b/src/db/BotStore.ts index e052d32..7eb1881 100644 --- a/src/db/BotStore.ts +++ b/src/db/BotStore.ts @@ -3,7 +3,7 @@ import { Cache, CACHE_SIMPLE_BOTS } from "../MemoryCache"; import { MatrixLiteClient } from "../matrix/MatrixLiteClient"; import config from "../config"; import * as randomString from "random-string"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; export interface CachedSimpleBot extends SimpleBotTemplate { id: number; @@ -138,4 +138,4 @@ export class BotStore { private constructor() { } -} \ No newline at end of file +} diff --git a/src/db/BridgeStore.ts b/src/db/BridgeStore.ts index 0a9737e..64a47a7 100644 --- a/src/db/BridgeStore.ts +++ b/src/db/BridgeStore.ts @@ -6,7 +6,7 @@ import { } from "../integrations/Bridge"; import BridgeRecord from "./models/BridgeRecord"; import { IrcBridge } from "../bridges/IrcBridge"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { TelegramBridge } from "../bridges/TelegramBridge"; import { WebhooksBridge } from "../bridges/WebhooksBridge"; import { SlackBridge } from "../bridges/SlackBridge"; diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts index 09f22f0..a376ab9 100644 --- a/src/db/DimensionStore.ts +++ b/src/db/DimensionStore.ts @@ -1,6 +1,6 @@ import { Sequelize } from "sequelize-typescript"; import config from "../config"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import User from "./models/User"; import UserScalarToken from "./models/UserScalarToken"; import Upstream from "./models/Upstream"; diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts index 15b7f6f..57207b6 100644 --- a/src/db/NebStore.ts +++ b/src/db/NebStore.ts @@ -3,7 +3,7 @@ import NebConfiguration from "./models/NebConfiguration"; import NebIntegration from "./models/NebIntegration"; import Upstream from "./models/Upstream"; import AppService from "./models/AppService"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { NebClient } from "../neb/NebClient"; import NebBotUser from "./models/NebBotUser"; import NebNotificationUser from "./models/NebNotificationUser"; @@ -382,4 +382,4 @@ export class NebStore { private constructor() { } -} \ No newline at end of file +} diff --git a/src/db/ScalarStore.ts b/src/db/ScalarStore.ts index 60377a3..6e24945 100644 --- a/src/db/ScalarStore.ts +++ b/src/db/ScalarStore.ts @@ -1,5 +1,5 @@ import UserScalarToken from "./models/UserScalarToken"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import Upstream from "./models/Upstream"; import User from "./models/User"; import { MatrixStickerBot } from "../matrix/MatrixStickerBot"; @@ -150,4 +150,4 @@ export class ScalarStore { private constructor() { } -} \ No newline at end of file +} diff --git a/src/index.ts b/src/index.ts index 54be94e..d29bae3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,8 @@ -import { LogService } from "matrix-js-snippets"; -import config from "./config"; +import { LogLevel, LogService } from "matrix-bot-sdk"; import { DimensionStore } from "./db/DimensionStore"; import Webserver from "./api/Webserver"; import { CURRENT_VERSION } from "./version"; import { MatrixStickerBot } from "./matrix/MatrixStickerBot"; -import * as BotSdk from "matrix-bot-sdk"; import User from "./db/models/User"; import { ILoggedInUser } from "./api/security/MatrixSecurity"; @@ -17,18 +15,9 @@ declare global { } } -LogService.configure(config.logging); +LogService.setLevel(LogLevel.DEBUG); LogService.info("index", "Starting dimension " + CURRENT_VERSION); -// Redirect the bot-sdk logger to our logger -BotSdk.LogService.setLogger({ - trace: (module: string, ...args: any[]) => args.map(a => LogService.info("BotSdk-" + module, a)), - debug: (module: string, ...args: any[]) => args.map(a => LogService.info("BotSdk-" + module, a)), - info: (module: string, ...args: any[]) => args.map(a => LogService.info("BotSdk-" + module, a)), - warn: (module: string, ...args: any[]) => args.map(a => LogService.warn("BotSdk-" + module, a)), - error: (module: string, ...args: any[]) => args.map(a => LogService.error("BotSdk-" + module, a)), -}); - async function startup() { const schemas = await DimensionStore.updateSchema(); LogService.info("DimensionStore", schemas); @@ -55,4 +44,4 @@ startup() .catch((e) => { console.error(e); process.exit(1) - }); \ No newline at end of file + }); diff --git a/src/matrix/MatrixLiteClient.ts b/src/matrix/MatrixLiteClient.ts index 0d34778..939dd95 100644 --- a/src/matrix/MatrixLiteClient.ts +++ b/src/matrix/MatrixLiteClient.ts @@ -1,7 +1,7 @@ import { doClientApiCall } from "./helpers"; import config from "../config"; import * as request from "request"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { OpenId } from "../models/OpenId"; export interface MatrixUrlPreview { diff --git a/src/matrix/MatrixStickerBot.ts b/src/matrix/MatrixStickerBot.ts index 2483a75..74cca66 100644 --- a/src/matrix/MatrixStickerBot.ts +++ b/src/matrix/MatrixStickerBot.ts @@ -1,11 +1,11 @@ import { AutojoinUpgradedRoomsMixin, + LogService, MatrixClient, SimpleFsStorageProvider, SimpleRetryJoinStrategy } from "matrix-bot-sdk"; import config from "../config"; -import { LogService } from "matrix-js-snippets"; import StickerPack from "../db/models/StickerPack"; import Sticker from "../db/models/Sticker"; import { MatrixLiteClient } from "./MatrixLiteClient"; @@ -172,4 +172,4 @@ class _MatrixStickerBot { } } -export const MatrixStickerBot = new _MatrixStickerBot(); \ No newline at end of file +export const MatrixStickerBot = new _MatrixStickerBot(); diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts index 1aa58cd..9c6d168 100644 --- a/src/matrix/helpers.ts +++ b/src/matrix/helpers.ts @@ -1,5 +1,5 @@ import { promises as dnsPromises } from 'dns'; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { Cache, CACHE_FEDERATION } from "../MemoryCache"; import * as request from "request"; import config from "../config"; diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts index 089cdb3..f93e7cd 100644 --- a/src/neb/NebClient.ts +++ b/src/neb/NebClient.ts @@ -2,7 +2,7 @@ import { NebConfig } from "../models/neb"; import { AppserviceStore } from "../db/AppserviceStore"; import { Client } from "./models/client"; import config from "../config"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import { Service } from "./models/service"; import * as request from "request"; import { MatrixLiteClient } from "../matrix/MatrixLiteClient"; @@ -94,4 +94,4 @@ export class NebClient { }); }); } -} \ No newline at end of file +} diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts index c466383..f21971f 100644 --- a/src/neb/NebProxy.ts +++ b/src/neb/NebProxy.ts @@ -1,7 +1,7 @@ import { NebConfig } from "../models/neb"; import NebIntegration from "../db/models/NebIntegration"; import { NebStore } from "../db/NebStore"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import * as request from "request"; import Upstream from "../db/models/Upstream"; import UserScalarToken from "../db/models/UserScalarToken"; @@ -355,4 +355,4 @@ export class NebProxy { }); }); } -} \ No newline at end of file +} diff --git a/src/scalar/ScalarClient.ts b/src/scalar/ScalarClient.ts index d3dc814..3653ed6 100644 --- a/src/scalar/ScalarClient.ts +++ b/src/scalar/ScalarClient.ts @@ -1,7 +1,7 @@ import { OpenId } from "../models/OpenId"; import { ScalarAccountResponse, ScalarLogoutResponse, ScalarRegisterResponse } from "../models/ScalarResponses"; import * as request from "request"; -import { LogService } from "matrix-js-snippets"; +import { LogService } from "matrix-bot-sdk"; import Upstream from "../db/models/Upstream"; import { SCALAR_API_VERSION } from "../utils/common-constants"; import { ITermsResponse } from "../api/controllers/TermsController"; @@ -185,4 +185,4 @@ export class ScalarClient { }); }); } -} \ No newline at end of file +}