forked from cadence/out-of-your-element
Compare commits
43 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 18b6efdd18 | |||
| 313efb29d8 | |||
| af6ea072f3 | |||
| 24c2dee7d3 | |||
| 16867d57fb | |||
| aecfde54c8 | |||
| ee406caf24 | |||
| 9b37705a73 | |||
| 7f7a366cd5 | |||
| 99eacd8c47 | |||
| e0eb7deb2f | |||
| e435b78e28 | |||
| d76936b157 | |||
| dec216c0c2 | |||
| 7781d1e34d | |||
| 93bbc5ea0f | |||
| 43b8b02b40 | |||
| eb676256e4 | |||
| 4815d28aa4 | |||
| 191a98e1dc | |||
| 678a1b77bb | |||
| 2aff1fbd06 | |||
| 92d6ada71b | |||
| d8fb4be509 | |||
| 4698835549 | |||
| e7cbfb9fc9 | |||
| 91bce76fc8 | |||
|
12f4103870 | ||
| e28eac6bfa | |||
| 857fb7583b | |||
| 59012d9613 | |||
| 953b3e7741 | |||
| 8c023cc936 | |||
| e9fe820666 | |||
| f742d8572a | |||
| 8224ed5341 | |||
| 0b513b7ee0 | |||
| 07ec9832b2 | |||
| a8b7d64e91 | |||
| 41692b11ff | |||
| d8c0a947f2 | |||
| 5c9e569a2a | |||
| 201814e9f4 |
38 changed files with 1860 additions and 376 deletions
|
|
@ -84,7 +84,7 @@ Discord display names for normal users are limited to 32 characters. For webhook
|
|||
|
||||
If the bridge software was restarted, it will attempt to catch up on messages missed while it was offline.
|
||||
|
||||
From Discord, for any given channel, if fewer than 50 messages were missed in that given channel, the bridge will catch up and transfer all of them to Matrix. If more than 50 messages were missed in that given channel, the bridge will only bridge the latest message. Happenings that aren't messages, such as edits and reactions to prior messages, might be missed during catch-up.
|
||||
From Discord, for any given channel, if fewer than 100 messages were missed in that given channel, the bridge will catch up and transfer all of them to Matrix. If more than 100 messages were missed in that given channel, the bridge will only bridge the latest message. Happenings that aren't messages, such as edits and reactions to prior messages, might be missed during catch-up.
|
||||
|
||||
From Matrix, all events should be bridged to Discord.
|
||||
|
||||
|
|
|
|||
134
package-lock.json
generated
134
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "out-of-your-element",
|
||||
"version": "3.4.0",
|
||||
"version": "3.5.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "out-of-your-element",
|
||||
"version": "3.4.0",
|
||||
"version": "3.5.1",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@chriscdn/promise-semaphore": "^3.0.1",
|
||||
|
|
@ -24,13 +24,13 @@
|
|||
"ansi-colors": "^4.1.3",
|
||||
"better-sqlite3": "^12.2.0",
|
||||
"chunk-text": "^2.0.1",
|
||||
"cloudstorm": "^0.17.0",
|
||||
"cloudstorm": "^0.17.1",
|
||||
"discord-api-types": "^0.38.38",
|
||||
"domino": "^2.1.6",
|
||||
"enquirer": "^2.4.1",
|
||||
"entities": "^5.0.0",
|
||||
"get-relative-path": "^1.0.2",
|
||||
"h3": "^1.15.1",
|
||||
"h3": "^1.15.10",
|
||||
"heatsync": "^2.7.2",
|
||||
"htmx.org": "^2.0.4",
|
||||
"lru-cache": "^11.0.2",
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
"@types/node": "^22.17.1",
|
||||
"c8": "^11.0.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"supertape": "^12.0.12"
|
||||
"supertape": "^13.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=22"
|
||||
|
|
@ -276,9 +276,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@emnapi/runtime": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.0.tgz",
|
||||
"integrity": "sha512-QN75eB0IH2ywSpRpNddCRfQIhmJYBCJ1x5Lb3IscKAL8bMnVAKnRg8dCoXbHzVLLH7P38N2Z3mtulB7W0J0FKw==",
|
||||
"version": "1.9.1",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz",
|
||||
"integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==",
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
|
|
@ -1003,9 +1003,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "22.19.15",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz",
|
||||
"integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==",
|
||||
"version": "22.19.19",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.19.tgz",
|
||||
"integrity": "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -1129,9 +1129,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/better-sqlite3": {
|
||||
"version": "12.8.0",
|
||||
"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.8.0.tgz",
|
||||
"integrity": "sha512-RxD2Vd96sQDjQr20kdP+F+dK/1OUNiVOl200vKBZY8u0vTwysfolF6Hq+3ZK2+h8My9YvZhHsF+RSGZW2VYrPQ==",
|
||||
"version": "12.10.0",
|
||||
"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.10.0.tgz",
|
||||
"integrity": "sha512-CyzaZRQKyHkB2ZInfTTl2nvT33EbDpjkLEbE8/Zck3Ll6O0qqvuGdrJ45HgtH+HykRg88ITY3AdreBGN70aBSQ==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -1139,7 +1139,7 @@
|
|||
"prebuild-install": "^7.1.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20.x || 22.x || 23.x || 24.x || 25.x"
|
||||
"node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x"
|
||||
}
|
||||
},
|
||||
"node_modules/bindings": {
|
||||
|
|
@ -1163,9 +1163,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "5.0.4",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
|
||||
"integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
|
||||
"version": "5.0.6",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
|
||||
"integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -1316,12 +1316,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/cloudstorm": {
|
||||
"version": "0.17.0",
|
||||
"resolved": "https://registry.npmjs.org/cloudstorm/-/cloudstorm-0.17.0.tgz",
|
||||
"integrity": "sha512-zsd9y5ljNnbxdvDid9TgWePDqo7il4so5spzx6NDwZ67qWQjR96UUhLxJ+BAOdBBSPF9UXFM61dAzC2g918q+A==",
|
||||
"version": "0.17.1",
|
||||
"resolved": "https://registry.npmjs.org/cloudstorm/-/cloudstorm-0.17.1.tgz",
|
||||
"integrity": "sha512-LYUwzHagRYRd93XocOqi+HCHdzPYI9cW7Yf7pYqinxgG+Qka1OiqBKWTCcLiEuiqXaOV30kr8c6aZ/c1QcDP4Q==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"discord-api-types": "^0.38.40",
|
||||
"discord-api-types": "^0.38.47",
|
||||
"snowtransfer": "^0.17.5"
|
||||
},
|
||||
"engines": {
|
||||
|
|
@ -1366,9 +1366,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cookie-es": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.2.2.tgz",
|
||||
"integrity": "sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==",
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.2.3.tgz",
|
||||
"integrity": "sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cross-env": {
|
||||
|
|
@ -1452,9 +1452,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/defu": {
|
||||
"version": "6.1.4",
|
||||
"resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
|
||||
"integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
|
||||
"version": "6.1.7",
|
||||
"resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
|
||||
"integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/destr": {
|
||||
|
|
@ -1473,9 +1473,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/discord-api-types": {
|
||||
"version": "0.38.42",
|
||||
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.42.tgz",
|
||||
"integrity": "sha512-qs1kya7S84r5RR8m9kgttywGrmmoHaRifU1askAoi+wkoSefLpZP6aGXusjNw5b0jD3zOg3LTwUa3Tf2iHIceQ==",
|
||||
"version": "0.38.47",
|
||||
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.47.tgz",
|
||||
"integrity": "sha512-XgXQodHQBAE6kfD7kMvVo30863iHX1LHSqNq6MGUTDwIFCCvHva13+rwxyxVXDqudyApMNAd32PGjgVETi5rjA==",
|
||||
"license": "MIT",
|
||||
"workspaces": [
|
||||
"scripts/actions/documentation"
|
||||
|
|
@ -1488,9 +1488,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/domino": {
|
||||
"version": "2.1.6",
|
||||
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
|
||||
"integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==",
|
||||
"version": "2.1.7",
|
||||
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.7.tgz",
|
||||
"integrity": "sha512-3rcXhx0ixJV2nj8J0tljzejTF73A35LVVdnTQu79UAqTBFEgYPMgGtykMuu/BDqaOZphATku1ddRUn/RtqUHYQ==",
|
||||
"license": "BSD-2-Clause"
|
||||
},
|
||||
"node_modules/emoji-regex": {
|
||||
|
|
@ -1587,9 +1587,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/flatted": {
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
|
||||
"integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
|
||||
"version": "3.4.2",
|
||||
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
|
||||
"integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
|
|
@ -1617,9 +1617,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/fullstore": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fullstore/-/fullstore-4.0.0.tgz",
|
||||
"integrity": "sha512-Y9hN79Q1CFU8akjGnTZoBnTzlA/o8wmtBijJOI8dKCmdC7GLX7OekpLxmbaeRetTOi4OdFGjfsg4c5dxP3jgPw==",
|
||||
"version": "4.0.2",
|
||||
"resolved": "https://registry.npmjs.org/fullstore/-/fullstore-4.0.2.tgz",
|
||||
"integrity": "sha512-syOev4kA0lZy4VkfBJZ99ZL4cIiSgiKt0G8SpP0kla1tpM1c+V/jBOVY/OqqGtR2XLVcM83SjFPFC3R2YIwqjQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
|
@ -1688,14 +1688,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/h3": {
|
||||
"version": "1.15.6",
|
||||
"resolved": "https://registry.npmjs.org/h3/-/h3-1.15.6.tgz",
|
||||
"integrity": "sha512-oi15ESLW5LRthZ+qPCi5GNasY/gvynSKUQxgiovrY63bPAtG59wtM+LSrlcwvOHAXzGrXVLnI97brbkdPF9WoQ==",
|
||||
"version": "1.15.11",
|
||||
"resolved": "https://registry.npmjs.org/h3/-/h3-1.15.11.tgz",
|
||||
"integrity": "sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cookie-es": "^1.2.2",
|
||||
"cookie-es": "^1.2.3",
|
||||
"crossws": "^0.3.5",
|
||||
"defu": "^6.1.4",
|
||||
"defu": "^6.1.6",
|
||||
"destr": "^2.0.5",
|
||||
"iron-webcrypto": "^1.2.1",
|
||||
"node-mock-http": "^1.0.4",
|
||||
|
|
@ -1753,9 +1753,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/htmx.org": {
|
||||
"version": "2.0.8",
|
||||
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.8.tgz",
|
||||
"integrity": "sha512-fm297iru0iWsNJlBrjvtN7V9zjaxd+69Oqjh4F/Vq9Wwi2kFisLcrLCiv5oBX0KLfOX/zG8AUo9ROMU5XUB44Q==",
|
||||
"version": "2.0.10",
|
||||
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.10.tgz",
|
||||
"integrity": "sha512-kdeJe7ZVwaS6QMz/ebBIVtZdpwen6L0OQ5GOhPV9MKBb196TCZeZu4yA7ZIQsaLKv7EpXz+So7KSXNuHXhj7Cw==",
|
||||
"license": "0BSD"
|
||||
},
|
||||
"node_modules/ieee754": {
|
||||
|
|
@ -1937,9 +1937,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/json-with-bigint": {
|
||||
"version": "3.5.7",
|
||||
"resolved": "https://registry.npmjs.org/json-with-bigint/-/json-with-bigint-3.5.7.tgz",
|
||||
"integrity": "sha512-7ei3MdAI5+fJPVnKlW77TKNKwQ5ppSzWvhPuSuINT/GYW9ZOC1eRKOuhV9yHG5aEsUPj9BBx5JIekkmoLHxZOw==",
|
||||
"version": "3.5.8",
|
||||
"resolved": "https://registry.npmjs.org/json-with-bigint/-/json-with-bigint-3.5.8.tgz",
|
||||
"integrity": "sha512-eq/4KP6K34kwa7TcFdtvnftvHCD9KvHOGGICWwMFc4dOOKF5t4iYqnfLK8otCRCRv06FXOzGGyqE8h8ElMvvdw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
|
|
@ -1974,9 +1974,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/lru-cache": {
|
||||
"version": "11.2.7",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
|
||||
"integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
|
||||
"version": "11.5.0",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz",
|
||||
"integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==",
|
||||
"license": "BlueOak-1.0.0",
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
|
|
@ -2579,12 +2579,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/snowtransfer": {
|
||||
"version": "0.17.5",
|
||||
"resolved": "https://registry.npmjs.org/snowtransfer/-/snowtransfer-0.17.5.tgz",
|
||||
"integrity": "sha512-nVI1UJNFoX1ndGFZxB3zb3X5SWtD9hIAcw7wCgVKWvCf42Wg2B4UFIrZWI83HxaSBY0CGbPZmZzZb3RSt/v2wQ==",
|
||||
"version": "0.17.7",
|
||||
"resolved": "https://registry.npmjs.org/snowtransfer/-/snowtransfer-0.17.7.tgz",
|
||||
"integrity": "sha512-scbOjYezo1Ycfk21atCEkeXIISTT7R7JTHCdiZ/7m7k4XbSb6o5q8Mu2fev5IqFpNyqIVjA0d/MZQ+eP/gtwfg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"discord-api-types": "^0.38.40"
|
||||
"discord-api-types": "^0.38.47"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=22.0.0"
|
||||
|
|
@ -2667,9 +2667,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/supertape": {
|
||||
"version": "12.10.5",
|
||||
"resolved": "https://registry.npmjs.org/supertape/-/supertape-12.10.5.tgz",
|
||||
"integrity": "sha512-1Px+6mhFaqcht3p4tkf3o4G8lbBazvx4pgFngm4vGwWipYm3fykm6SJ4ThXobiaNsptz53CDWA2q4B/2KtmA4w==",
|
||||
"version": "13.2.0",
|
||||
"resolved": "https://registry.npmjs.org/supertape/-/supertape-13.2.0.tgz",
|
||||
"integrity": "sha512-UoxZnyoMOdSJHvbcmD8i28MaGXsA7I0cJ0jr8anT4CkmfaE9M1y5mt9EoXyzfC8UdnQZwXOnJLUwqyKLAeUOug==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -2856,9 +2856,9 @@
|
|||
"license": "MIT"
|
||||
},
|
||||
"node_modules/uqr": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/uqr/-/uqr-0.1.2.tgz",
|
||||
"integrity": "sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==",
|
||||
"version": "0.1.3",
|
||||
"resolved": "https://registry.npmjs.org/uqr/-/uqr-0.1.3.tgz",
|
||||
"integrity": "sha512-0rjE8iEJe4YmT9TOhwsZtqCMRLc5DXZUI2UEYUUg63ikBkqqE5EYWaI0etFe/5KUcmcYwLih2RND1kq+hrUJXA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/util-deprecate": {
|
||||
|
|
@ -3028,9 +3028,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/zod": {
|
||||
"version": "4.3.6",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
|
||||
"integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
|
||||
"version": "4.4.3",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
|
||||
"integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/colinhacks"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "out-of-your-element",
|
||||
"version": "3.4.0",
|
||||
"version": "3.5.1",
|
||||
"description": "A bridge between Matrix and Discord",
|
||||
"main": "index.js",
|
||||
"repository": {
|
||||
|
|
@ -33,13 +33,13 @@
|
|||
"ansi-colors": "^4.1.3",
|
||||
"better-sqlite3": "^12.2.0",
|
||||
"chunk-text": "^2.0.1",
|
||||
"cloudstorm": "^0.17.0",
|
||||
"cloudstorm": "^0.17.1",
|
||||
"discord-api-types": "^0.38.38",
|
||||
"domino": "^2.1.6",
|
||||
"enquirer": "^2.4.1",
|
||||
"entities": "^5.0.0",
|
||||
"get-relative-path": "^1.0.2",
|
||||
"h3": "^1.15.1",
|
||||
"h3": "^1.15.10",
|
||||
"heatsync": "^2.7.2",
|
||||
"htmx.org": "^2.0.4",
|
||||
"lru-cache": "^11.0.2",
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
"@types/node": "^22.17.1",
|
||||
"c8": "^11.0.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"supertape": "^12.0.12"
|
||||
"supertape": "^13.2.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "node --enable-source-maps start.js",
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ const {prompt} = require("enquirer")
|
|||
|
||||
reg.ooye.web_password = passwordResponse.web_password
|
||||
writeRegistration(reg)
|
||||
console.log("Saved. Restart Out Of Your Element to apply this change.")
|
||||
console.log("Saved. This change should be applied instantly.")
|
||||
})()
|
||||
|
|
|
|||
|
|
@ -193,6 +193,16 @@ async function channelToKState(channel, guild, di) {
|
|||
// Don't overwrite room topic if the topic has been customised
|
||||
if (hasCustomTopic) delete channelKState["m.room.topic/"]
|
||||
|
||||
// Make voice channels be a Matrix voice room (MSC3417)
|
||||
if (channel.type === DiscordTypes.ChannelType.GuildVoice) {
|
||||
creationContent.type = "org.matrix.msc3417.call"
|
||||
channelKState["org.matrix.msc3401.call/"] = {
|
||||
"m.intent": "m.room",
|
||||
"m.type": "m.voice",
|
||||
"m.name": customName || channel.name
|
||||
}
|
||||
}
|
||||
|
||||
// Don't add a space parent if it's self service
|
||||
// (The person setting up self-service has already put it in their preferred space to be able to get this far.)
|
||||
const autocreate = select("guild_active", "autocreate", {guild_id: guild.id}).pluck().get()
|
||||
|
|
|
|||
|
|
@ -190,6 +190,17 @@ test("channel2room: read-only discord channel", async t => {
|
|||
t.equal(api.getCalled(), 2)
|
||||
})
|
||||
|
||||
test("channel2room: voice channel", async t => {
|
||||
const api = mockAPI(t)
|
||||
const state = kstateStripConditionals(await channelToKState(testData.channel.voice, testData.guild.general, {api}).then(x => x.channelKState))
|
||||
t.equal(state["m.room.create/"].type, "org.matrix.msc3417.call")
|
||||
t.deepEqual(state["org.matrix.msc3401.call/"], {
|
||||
"m.intent": "m.room",
|
||||
"m.name": "🍞丨[8user] Piece",
|
||||
"m.type": "m.voice"
|
||||
})
|
||||
})
|
||||
|
||||
test("convertNameAndTopic: custom name and topic", t => {
|
||||
t.deepEqual(
|
||||
_convertNameAndTopic({id: "123", name: "the-twilight-zone", topic: "Spooky stuff here. :ghost:", type: 0}, {id: "456"}, "hauntings"),
|
||||
|
|
|
|||
|
|
@ -34,7 +34,10 @@ async function emojisToState(emojis, guild) {
|
|||
if (e.data?.errcode === "M_TOO_LARGE") { // Very unlikely to happen. Only possible for 3x-series emojis uploaded shortly after animated emojis were introduced, when there was no 256 KB size limit.
|
||||
return
|
||||
}
|
||||
console.error(`Trying to handle emoji ${emoji.name} (${emoji.id}), but...`)
|
||||
e["emoji"] = {
|
||||
name: emoji.name,
|
||||
id: emoji.id
|
||||
}
|
||||
throw e
|
||||
})
|
||||
))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,15 @@
|
|||
|
||||
const {EventEmitter} = require("events")
|
||||
const passthrough = require("../../passthrough")
|
||||
const {select} = passthrough
|
||||
const {select, sync, from} = passthrough
|
||||
/** @type {import("../../matrix/utils")} */
|
||||
const utils = sync.require("../../matrix/utils")
|
||||
|
||||
/*
|
||||
Due to Eventual Consistency(TM) an update/delete may arrive before the original message arrives
|
||||
(or before the it has finished being bridged to an event).
|
||||
In this case, wait until the original message has finished bridging, then retrigger the passed function.
|
||||
*/
|
||||
|
||||
const DEBUG_RETRIGGER = false
|
||||
|
||||
|
|
@ -12,81 +20,140 @@ function debugRetrigger(message) {
|
|||
}
|
||||
}
|
||||
|
||||
const paused = new Set()
|
||||
const emitter = new EventEmitter()
|
||||
const storage = new class {
|
||||
/** @private @type {Set<string>} */
|
||||
paused = new Set()
|
||||
/** @private @type {Map<string, ((found: Boolean) => any)[]>} id -> list of resolvers */
|
||||
resolves = new Map()
|
||||
/** @private @type {Map<string, ReturnType<setTimeout>>} id -> timer */
|
||||
timers = new Map()
|
||||
|
||||
/**
|
||||
* Due to Eventual Consistency(TM) an update/delete may arrive before the original message arrives
|
||||
* (or before the it has finished being bridged to an event).
|
||||
* In this case, wait until the original message has finished bridging, then retrigger the passed function.
|
||||
* @template {(...args: any[]) => any} T
|
||||
* @param {string} inputID
|
||||
* @param {T} fn
|
||||
* @param {Parameters<T>} rest
|
||||
* @returns {boolean} false if the event was found and the function will be ignored, true if the event was not found and the function will be retriggered
|
||||
*/
|
||||
function eventNotFoundThenRetrigger(inputID, fn, ...rest) {
|
||||
if (!paused.has(inputID)) {
|
||||
if (inputID.match(/^[0-9]+$/)) {
|
||||
const eventID = select("event_message", "event_id", {message_id: inputID}).pluck().get()
|
||||
if (eventID) {
|
||||
debugRetrigger(`[retrigger] OK mid <-> eid = ${inputID} <-> ${eventID}`)
|
||||
return false // event was found so don't retrigger
|
||||
}
|
||||
} else if (inputID.match(/^\$/)) {
|
||||
const messageID = select("event_message", "message_id", {event_id: inputID}).pluck().get()
|
||||
if (messageID) {
|
||||
debugRetrigger(`[retrigger] OK eid <-> mid = ${inputID} <-> ${messageID}`)
|
||||
return false // message was found so don't retrigger
|
||||
}
|
||||
/**
|
||||
* The purpose of storage is to store `resolve` and call it at a later time.
|
||||
* @param {string} id
|
||||
* @param {(found: Boolean) => any} resolve
|
||||
*/
|
||||
store(id, resolve) {
|
||||
debugRetrigger(`[retrigger] STORE id = ${id}`)
|
||||
this.resolves.set(id, (this.resolves.get(id) || []).concat(resolve)) // add to list in map value
|
||||
if (!this.timers.has(id)) {
|
||||
debugRetrigger(`[retrigger] SET TIMER id = ${id}`)
|
||||
this.timers.set(id, setTimeout(() => this.resolve(id, false), 60 * 1000).unref()) // 1 minute
|
||||
}
|
||||
}
|
||||
|
||||
/** @param {string} id */
|
||||
isNotPaused(id) {
|
||||
return !storage.paused.has(id)
|
||||
}
|
||||
|
||||
debugRetrigger(`[retrigger] WAIT id = ${inputID}`)
|
||||
emitter.once(inputID, () => {
|
||||
debugRetrigger(`[retrigger] TRIGGER id = ${inputID}`)
|
||||
fn(...rest)
|
||||
})
|
||||
// if the event never arrives, don't trigger the callback, just clean up
|
||||
setTimeout(() => {
|
||||
if (emitter.listeners(inputID).length) {
|
||||
debugRetrigger(`[retrigger] EXPIRE id = ${inputID}`)
|
||||
/** @param {string} id */
|
||||
pause(id) {
|
||||
debugRetrigger(`[retrigger] PAUSE id = ${id}`)
|
||||
this.paused.add(id)
|
||||
}
|
||||
|
||||
/**
|
||||
* Go through `resolves` storage and resolve them all. (Also resets timer/paused.)
|
||||
* @param {string} id
|
||||
* @param {boolean} value
|
||||
*/
|
||||
resolve(id, value) {
|
||||
if (this.paused.has(id)) {
|
||||
debugRetrigger(`[retrigger] RESUME id = ${id}`)
|
||||
this.paused.delete(id)
|
||||
}
|
||||
emitter.removeAllListeners(inputID)
|
||||
}, 60 * 1000) // 1 minute
|
||||
return true // event was not found, then retrigger
|
||||
|
||||
if (this.resolves.has(id)) {
|
||||
debugRetrigger(`[retrigger] RESOLVE ${value} id = ${id}`)
|
||||
const fns = this.resolves.get(id) || []
|
||||
this.resolves.delete(id)
|
||||
for (const fn of fns) {
|
||||
fn(value)
|
||||
}
|
||||
}
|
||||
|
||||
if (this.timers.has(id)) {
|
||||
clearTimeout(this.timers.get(id))
|
||||
this.timers.delete(id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} id
|
||||
* @param {(found: Boolean) => any} resolve
|
||||
* @param {boolean} existsInDatabase
|
||||
*/
|
||||
function waitFor(id, resolve, existsInDatabase) {
|
||||
if (existsInDatabase && storage.isNotPaused(id)) { // if event already exists and isn't paused then resolve immediately
|
||||
debugRetrigger(`[retrigger] EXISTS id = ${id}`)
|
||||
return resolve(true)
|
||||
}
|
||||
|
||||
// doesn't exist. wait for it to exist. storage will resolve true if it exists or false if it timed out
|
||||
return storage.store(id, resolve)
|
||||
}
|
||||
|
||||
const GET_EVENT_PREPARED = from("event_message").select("event_id").and("WHERE event_id = ?").prepare().raw()
|
||||
/**
|
||||
* @param {string} eventID
|
||||
* @returns {Promise<boolean>} if true then the message did not arrive
|
||||
*/
|
||||
function waitForEvent(eventID) {
|
||||
const {promise, resolve} = Promise.withResolvers()
|
||||
waitFor(eventID, resolve, !!GET_EVENT_PREPARED.get(eventID))
|
||||
return promise
|
||||
}
|
||||
|
||||
const GET_MESSAGE_PREPARED = from("event_message").select("message_id").and("WHERE message_id = ?").prepare().raw()
|
||||
/**
|
||||
* @param {string} messageID
|
||||
* @returns {Promise<boolean>} if true then the message did not arrive
|
||||
*/
|
||||
function waitForMessage(messageID) {
|
||||
const {promise, resolve} = Promise.withResolvers()
|
||||
waitFor(messageID, resolve, !!GET_MESSAGE_PREPARED.get(messageID))
|
||||
return promise
|
||||
}
|
||||
|
||||
const GET_REACTION_EVENT_PREPARED = from("reaction").select("hashed_event_id").and("WHERE hashed_event_id = ?").prepare().raw()
|
||||
/**
|
||||
* @param {string} eventID
|
||||
* @returns {Promise<boolean>} if true then the message did not arrive
|
||||
*/
|
||||
function waitForReactionEvent(eventID) {
|
||||
const {promise, resolve} = Promise.withResolvers()
|
||||
waitFor(eventID, resolve, !!GET_REACTION_EVENT_PREPARED.get(utils.getEventIDHash(eventID)))
|
||||
return promise
|
||||
}
|
||||
|
||||
/**
|
||||
* Anything calling retrigger during the callback will be paused and retriggered after the callback resolves.
|
||||
* @template T
|
||||
* @param {string} messageID
|
||||
* @param {string} id
|
||||
* @param {Promise<T>} promise
|
||||
* @returns {Promise<T>}
|
||||
*/
|
||||
async function pauseChanges(messageID, promise) {
|
||||
async function pauseChanges(id, promise) {
|
||||
try {
|
||||
debugRetrigger(`[retrigger] PAUSE id = ${messageID}`)
|
||||
paused.add(messageID)
|
||||
storage.pause(id)
|
||||
return await promise
|
||||
} finally {
|
||||
debugRetrigger(`[retrigger] RESUME id = ${messageID}`)
|
||||
paused.delete(messageID)
|
||||
messageFinishedBridging(messageID)
|
||||
finishedBridging(id)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers any pending operations that were waiting on the corresponding event ID.
|
||||
* @param {string} messageID
|
||||
* @param {string} id
|
||||
*/
|
||||
function messageFinishedBridging(messageID) {
|
||||
if (emitter.listeners(messageID).length) {
|
||||
debugRetrigger(`[retrigger] EMIT id = ${messageID}`)
|
||||
}
|
||||
emitter.emit(messageID)
|
||||
function finishedBridging(id) {
|
||||
storage.resolve(id, true)
|
||||
}
|
||||
|
||||
module.exports.eventNotFoundThenRetrigger = eventNotFoundThenRetrigger
|
||||
module.exports.messageFinishedBridging = messageFinishedBridging
|
||||
module.exports.waitForMessage = waitForMessage
|
||||
module.exports.waitForEvent = waitForEvent
|
||||
module.exports.waitForReactionEvent = waitForReactionEvent
|
||||
module.exports.pauseChanges = pauseChanges
|
||||
module.exports.finishedBridging = finishedBridging
|
||||
|
|
@ -109,7 +109,7 @@ const embedTitleParser = markdown.markdownEngine.parserFor({
|
|||
|
||||
/**
|
||||
* @param {{room?: boolean, user_ids?: string[]}} mentions
|
||||
* @param {Omit<DiscordTypes.APIAttachment, "id" | "proxy_url">} attachment
|
||||
* @param {Omit<DiscordTypes.APIAttachment, "id" | "proxy_url" | "flags">} attachment
|
||||
* @param {boolean} [alwaysLink]
|
||||
*/
|
||||
async function attachmentToEvent(mentions, attachment, alwaysLink) {
|
||||
|
|
@ -256,8 +256,8 @@ function getFormattedInteraction(interaction, isThinkingInteraction) {
|
|||
const username = interaction.member?.nick || interaction.user.global_name || interaction.user.username
|
||||
const thinkingText = isThinkingInteraction ? " — interaction loading..." : ""
|
||||
return {
|
||||
body: `↪️ ${username} used \`/${interaction.name}\`${thinkingText}`,
|
||||
html: `<blockquote><sub>↪️ ${mxid ? tag`<a href="https://matrix.to/#/${mxid}">${username}</a>` : username} used <code>/${interaction.name}</code>${thinkingText}</sub></blockquote>`
|
||||
body: `❭ ${username} used \`/${interaction.name}\`${thinkingText}`,
|
||||
html: `<blockquote><sub>❭ ${mxid ? tag`<a href="https://matrix.to/#/${mxid}">${username}</a>` : username} used <code>/${interaction.name}</code>${thinkingText}</sub></blockquote>`
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -357,6 +357,17 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
}]
|
||||
}
|
||||
|
||||
if (message.type === DiscordTypes.MessageType.ChannelFollowAdd) {
|
||||
return [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.emote",
|
||||
body: `set this room to receive announcements from ${message.content}`,
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: tag`set this room to receive announcements from <strong>${message.content}</strong>`,
|
||||
"m.mentions": {}
|
||||
}]
|
||||
}
|
||||
|
||||
let isInteraction = (message.type === DiscordTypes.MessageType.ChatInputCommand || message.type === DiscordTypes.MessageType.ContextMenuCommand) && message.interaction && "name" in message.interaction
|
||||
let isThinkingInteraction = isInteraction && !!((message.flags || 0) & DiscordTypes.MessageFlags.Loading)
|
||||
|
||||
|
|
@ -629,8 +640,8 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
|
||||
const flags = message.flags || 0
|
||||
if (flags & DiscordTypes.MessageFlags.IsCrosspost) {
|
||||
body = `[🔀 ${message.author.username}]\n` + body
|
||||
html = `🔀 <strong>${message.author.username}</strong><br>` + html
|
||||
body = `[↷ ${message.author.username}]\n` + body
|
||||
html = `↷ <strong>${message.author.username}</strong><br>` + html
|
||||
}
|
||||
|
||||
// Fallback body/formatted_body for replies
|
||||
|
|
@ -658,7 +669,7 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
const match = repliedToEventSenderMxid.match(/^@([^:]*)/)
|
||||
assert(match)
|
||||
repliedToDisplayName = referenced.author.username || match[1] || "a Matrix user" // grab the localpart as the display name, whatever
|
||||
repliedToUserHtml = `<a href="https://matrix.to/#/${repliedToEventSenderMxid}">${repliedToDisplayName}</a>`
|
||||
repliedToUserHtml = tag`<a href="https://matrix.to/#/${repliedToEventSenderMxid}">${repliedToDisplayName}</a>`
|
||||
} else {
|
||||
repliedToDisplayName = referenced.author.global_name || referenced.author.username || "a Discord user"
|
||||
repliedToUserHtml = repliedToDisplayName
|
||||
|
|
@ -683,6 +694,12 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
+ html
|
||||
body = `${repliedToDisplayName}: ${repliedToBody}`.split("\n").map(line => "> " + line).join("\n") // scenario 1 part B for mentions
|
||||
+ "\n\n" + body
|
||||
} else if (referenced.type === DiscordTypes.MessageType.UserJoin) {
|
||||
// Discord user join messages are bridged as joins, not text events. Generate substitute text for reply.
|
||||
const joinerMxid = select("sim", "mxid", {user_id: referenced.author.id}).pluck().get()
|
||||
const joinerHtml = joinerMxid ? tag`<a href="https://matrix.to/#/${joinerMxid}">${repliedToDisplayName}</a>` : tag`<strong>${repliedToDisplayName}</strong>`
|
||||
html = `<blockquote>${joinerHtml} joined the room</blockquote>` + html
|
||||
body = `> ${repliedToDisplayName} joined the room\n\n` + body
|
||||
} else { // repliedToUnknownEvent
|
||||
const dateDisplay = dUtils.howOldUnbridgedMessage(referenced.timestamp, message.timestamp)
|
||||
html = `<blockquote>In reply to ${dateDisplay} from ${repliedToDisplayName}:`
|
||||
|
|
@ -751,20 +768,20 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
if (row && "event_id" in row) {
|
||||
const via = await getViaServersMemo(row.room_id)
|
||||
forwardedNotice.addLine(
|
||||
`[🔀 Forwarded from #${roomName}]`,
|
||||
tag`🔀 <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}/${row.event_id}?${via}">[jump to event]</a></em>`
|
||||
`[↷ Forwarded from #${roomName}]`,
|
||||
tag`↷ <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}/${row.event_id}?${via}">[jump to event]</a></em>`
|
||||
)
|
||||
} else {
|
||||
const via = await getViaServersMemo(room.room_id)
|
||||
forwardedNotice.addLine(
|
||||
`[🔀 Forwarded from #${roomName}]`,
|
||||
tag`🔀 <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}?${via}">[jump to room]</a></em>`
|
||||
`[↷ Forwarded from #${roomName}]`,
|
||||
tag`↷ <em>Forwarded from ${roomName} <a href="https://matrix.to/#/${room.room_id}?${via}">[jump to room]</a></em>`
|
||||
)
|
||||
}
|
||||
} else {
|
||||
forwardedNotice.addLine(
|
||||
`[🔀 Forwarded message]`,
|
||||
tag`🔀 <em>Forwarded message</em>`
|
||||
`[↷ Forwarded message]`,
|
||||
tag`↷ <em>Forwarded message</em>`
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -1110,7 +1127,7 @@ async function messageToEvent(message, guild, options = {}, di) {
|
|||
}
|
||||
} else {
|
||||
let body = stickerItem.name
|
||||
const sticker = guild.stickers.find(sticker => sticker.id === stickerItem.id)
|
||||
const sticker = guild.stickers?.find(sticker => sticker.id === stickerItem.id)
|
||||
if (sticker && sticker.description) body += ` - ${sticker.description}`
|
||||
return {
|
||||
$type: "m.sticker",
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ test("message2event embeds: interaction loading", async t => {
|
|||
const events = await messageToEvent(data.interaction_message.thinking_interaction, data.guild.general, {})
|
||||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
body: "↪️ Brad used `/stats` — interaction loading...",
|
||||
body: "❭ Brad used `/stats` — interaction loading...",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">Brad</a> used <code>/stats</code> — interaction loading...</sub></blockquote>",
|
||||
formatted_body: "<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">Brad</a> used <code>/stats</code> — interaction loading...</sub></blockquote>",
|
||||
"m.mentions": {},
|
||||
msgtype: "m.notice",
|
||||
}])
|
||||
|
|
@ -22,12 +22,12 @@ test("message2event embeds: nothing but a field", async t => {
|
|||
$type: "m.room.message",
|
||||
"m.mentions": {},
|
||||
msgtype: "m.notice",
|
||||
body: "↪️ PapiOphidian used `/stats`"
|
||||
body: "❭ PapiOphidian used `/stats`"
|
||||
+ "\n| ### Amanda 🎵#2192 :online:"
|
||||
+ "\n| willow tree, branch 0"
|
||||
+ "\n| **❯ Uptime:**\n| 3m 55s\n| **❯ Memory:**\n| 64.45MB",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: '<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
formatted_body: '<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
+ '<blockquote><p><strong>Amanda 🎵#2192 <img data-mx-emoticon height=\"32\" src=\"mxc://cadence.moe/LCEqjStXCxvRQccEkuslXEyZ\" title=\":online:\" alt=\":online:\">'
|
||||
+ '<br>willow tree, branch 0</strong>'
|
||||
+ '<br><strong>❯ Uptime:</strong><br>3m 55s'
|
||||
|
|
@ -153,10 +153,10 @@ test("message2event embeds: title without url", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.notice",
|
||||
body: "↪️ PapiOphidian used `/stats`"
|
||||
body: "❭ PapiOphidian used `/stats`"
|
||||
+ "\n| ## Hi, I'm Amanda!\n| \n| I condone pirating music!",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: '<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
formatted_body: '<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
+ `<blockquote><p><strong>Hi, I'm Amanda!</strong></p><p>I condone pirating music!</p></blockquote>`,
|
||||
"m.mentions": {}
|
||||
}])
|
||||
|
|
@ -167,10 +167,10 @@ test("message2event embeds: url without title", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.notice",
|
||||
body: "↪️ PapiOphidian used `/stats`"
|
||||
body: "❭ PapiOphidian used `/stats`"
|
||||
+ "\n| I condone pirating music!",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: '<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
formatted_body: '<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
+ `<blockquote><p>I condone pirating music!</p></blockquote>`,
|
||||
"m.mentions": {}
|
||||
}])
|
||||
|
|
@ -181,10 +181,10 @@ test("message2event embeds: author without url", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.notice",
|
||||
body: "↪️ PapiOphidian used `/stats`"
|
||||
body: "❭ PapiOphidian used `/stats`"
|
||||
+ "\n| ## Amanda\n| \n| I condone pirating music!",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: '<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
formatted_body: '<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
+ `<blockquote><p><strong>Amanda</strong></p><p>I condone pirating music!</p></blockquote>`,
|
||||
"m.mentions": {}
|
||||
}])
|
||||
|
|
@ -195,10 +195,10 @@ test("message2event embeds: author url without name", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.notice",
|
||||
body: "↪️ PapiOphidian used `/stats`"
|
||||
body: "❭ PapiOphidian used `/stats`"
|
||||
+ "\n| I condone pirating music!",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: '<blockquote><sub>↪️ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
formatted_body: '<blockquote><sub>❭ <a href=\"https://matrix.to/#/@_ooye_papiophidian:cadence.moe\">PapiOphidian</a> used <code>/stats</code></sub></blockquote>'
|
||||
+ `<blockquote><p>I condone pirating music!</p></blockquote>`,
|
||||
"m.mentions": {}
|
||||
}])
|
||||
|
|
@ -209,9 +209,9 @@ test("message2event embeds: 4 images", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.text",
|
||||
body: "[🔀 Forwarded message]\n» https://fixupx.com/i/status/2032003668787020046",
|
||||
body: "[↷ Forwarded message]\n» https://fixupx.com/i/status/2032003668787020046",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "🔀 <em>Forwarded message</em><br><blockquote><a href=\"https://fixupx.com/i/status/2032003668787020046\">https://fixupx.com/i/status/2032003668787020046</a></blockquote>",
|
||||
formatted_body: "↷ <em>Forwarded message</em><br><blockquote><a href=\"https://fixupx.com/i/status/2032003668787020046\">https://fixupx.com/i/status/2032003668787020046</a></blockquote>",
|
||||
"m.mentions": {}
|
||||
}, {
|
||||
$type: "m.room.message",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ const {MatrixServerError} = require("../../matrix/mreq")
|
|||
const data = require("../../../test/data")
|
||||
const {mockGetEffectivePower} = require("../../matrix/utils.test")
|
||||
const Ty = require("../../types")
|
||||
const {db} = require("../../passthrough")
|
||||
|
||||
/**
|
||||
* @param {string} roomID
|
||||
|
|
@ -733,6 +734,31 @@ test("message2event: reply to a Discord message that wasn't bridged", async t =>
|
|||
}])
|
||||
})
|
||||
|
||||
test("message2event: reply to a Discord member join (who didn't join on Matrix)", async t => {
|
||||
const events = await messageToEvent(data.message.reply_to_member_join, data.guild.general)
|
||||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.text",
|
||||
body: "> PEASANT!! joined the room\n\nwhen the broke friend who we pay to bring food shows up at the medieval lord party",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "<blockquote><strong>PEASANT!!</strong> joined the room</blockquote>when the broke friend who we pay to bring food shows up at the medieval lord party",
|
||||
"m.mentions": {}
|
||||
}])
|
||||
})
|
||||
|
||||
test("message2event: reply to a Discord member join (who did join on Matrix)", async t => {
|
||||
db.prepare("INSERT INTO sim (user_id, username, sim_name, mxid) VALUES ('1461677775554478161', 'peasant321_76775', 'peasant321_76775', '@_ooye_peasant321_76775:cadence.moe')").run()
|
||||
const events = await messageToEvent(data.message.reply_to_member_join, data.guild.general)
|
||||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.text",
|
||||
body: "> PEASANT!! joined the room\n\nwhen the broke friend who we pay to bring food shows up at the medieval lord party",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: `<blockquote><a href="https://matrix.to/#/@_ooye_peasant321_76775:cadence.moe">PEASANT!!</a> joined the room</blockquote>when the broke friend who we pay to bring food shows up at the medieval lord party`,
|
||||
"m.mentions": {}
|
||||
}])
|
||||
})
|
||||
|
||||
test("message2event: simple written @mention for matrix user", async t => {
|
||||
const events = await messageToEvent(data.message.simple_written_at_mention_for_matrix, data.guild.general, {}, {
|
||||
api: {
|
||||
|
|
@ -1142,6 +1168,19 @@ test("message2event: type 4 channel name change", async t => {
|
|||
}])
|
||||
})
|
||||
|
||||
test("message2event: type 12 channel follow add", async t => {
|
||||
const events = await messageToEvent(data.special_message.channel_follow_add, data.guild.general)
|
||||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
"m.mentions": {},
|
||||
msgtype: "m.emote",
|
||||
body: "set this room to receive announcements from PluralKit #downtime",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "set this room to receive announcements from <strong>PluralKit #downtime</strong>",
|
||||
"m.mentions": {}
|
||||
}])
|
||||
})
|
||||
|
||||
test("message2event: thread start message reference", async t => {
|
||||
const events = await messageToEvent(data.special_message.thread_start_context, data.guild.general, {}, {
|
||||
api: {
|
||||
|
|
@ -1234,9 +1273,9 @@ test("message2event: crossposted announcements say where they are crossposted fr
|
|||
$type: "m.room.message",
|
||||
"m.mentions": {},
|
||||
msgtype: "m.text",
|
||||
body: "[🔀 Chewey Bot Official Server #announcements]\nAll text based commands are now inactive on Chewey Bot\nTo continue using commands you'll need to use them as slash commands",
|
||||
body: "[↷ Chewey Bot Official Server #announcements]\nAll text based commands are now inactive on Chewey Bot\nTo continue using commands you'll need to use them as slash commands",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "🔀 <strong>Chewey Bot Official Server #announcements</strong><br>All text based commands are now inactive on Chewey Bot<br>To continue using commands you'll need to use them as slash commands"
|
||||
formatted_body: "↷ <strong>Chewey Bot Official Server #announcements</strong><br>All text based commands are now inactive on Chewey Bot<br>To continue using commands you'll need to use them as slash commands"
|
||||
}])
|
||||
})
|
||||
|
||||
|
|
@ -1305,9 +1344,9 @@ test("message2event: forwarded image", async t => {
|
|||
t.deepEqual(events, [
|
||||
{
|
||||
$type: "m.room.message",
|
||||
body: "[🔀 Forwarded message]",
|
||||
body: "[↷ Forwarded message]",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "🔀 <em>Forwarded message</em>",
|
||||
formatted_body: "↷ <em>Forwarded message</em>",
|
||||
"m.mentions": {},
|
||||
msgtype: "m.notice",
|
||||
},
|
||||
|
|
@ -1346,10 +1385,10 @@ test("message2event: constructed forwarded message", async t => {
|
|||
t.deepEqual(events, [
|
||||
{
|
||||
$type: "m.room.message",
|
||||
body: "[🔀 Forwarded from #wonderland]"
|
||||
body: "[↷ Forwarded from #wonderland]"
|
||||
+ "\n» What's cooking, good looking? :hipposcope:",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: `🔀 <em>Forwarded from wonderland <a href="https://matrix.to/#/!qzDBLKlildpzrrOnFZ:cadence.moe/$tBIT8mO7XTTCgIINyiAIy6M2MSoPAdJenRl_RLyYuaE?via=cadence.moe&via=matrix.org">[jump to event]</a></em>`
|
||||
formatted_body: `↷ <em>Forwarded from wonderland <a href="https://matrix.to/#/!qzDBLKlildpzrrOnFZ:cadence.moe/$tBIT8mO7XTTCgIINyiAIy6M2MSoPAdJenRl_RLyYuaE?via=cadence.moe&via=matrix.org">[jump to event]</a></em>`
|
||||
+ `<br><blockquote>What's cooking, good looking? <img data-mx-emoticon height="32" src="mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc" title=":hipposcope:" alt=":hipposcope:"></blockquote>`,
|
||||
"m.mentions": {},
|
||||
msgtype: "m.text",
|
||||
|
|
@ -1405,10 +1444,10 @@ test("message2event: constructed forwarded text", async t => {
|
|||
t.deepEqual(events, [
|
||||
{
|
||||
$type: "m.room.message",
|
||||
body: "[🔀 Forwarded from #amanda-spam]"
|
||||
body: "[↷ Forwarded from #amanda-spam]"
|
||||
+ "\n» What's cooking, good looking?",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: `🔀 <em>Forwarded from amanda-spam <a href="https://matrix.to/#/!CzvdIdUQXgUjDVKxeU:cadence.moe?via=cadence.moe&via=matrix.org">[jump to room]</a></em>`
|
||||
formatted_body: `↷ <em>Forwarded from amanda-spam <a href="https://matrix.to/#/!CzvdIdUQXgUjDVKxeU:cadence.moe?via=cadence.moe&via=matrix.org">[jump to room]</a></em>`
|
||||
+ `<br><blockquote>What's cooking, good looking?</blockquote>`,
|
||||
"m.mentions": {},
|
||||
msgtype: "m.text",
|
||||
|
|
@ -1428,10 +1467,10 @@ test("message2event: don't scan forwarded messages for mentions", async t => {
|
|||
t.deepEqual(events, [
|
||||
{
|
||||
$type: "m.room.message",
|
||||
body: "[🔀 Forwarded message]"
|
||||
body: "[↷ Forwarded message]"
|
||||
+ "\n» If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile https://social.luca.run/@luca/113950834185678114",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: `🔀 <em>Forwarded message</em>`
|
||||
formatted_body: `↷ <em>Forwarded message</em>`
|
||||
+ `<br><blockquote>If some folks have spare bandwidth then helping out ArchiveTeam with archiving soon to be deleted research and government data might be worthwhile <a href="https://social.luca.run/@luca/113950834185678114">https://social.luca.run/@luca/113950834185678114</a></blockquote>`,
|
||||
"m.mentions": {},
|
||||
msgtype: "m.text"
|
||||
|
|
@ -1781,9 +1820,9 @@ test("message2event: forwarded message with unreferenced mention", async t => {
|
|||
t.deepEqual(events, [{
|
||||
$type: "m.room.message",
|
||||
msgtype: "m.text",
|
||||
body: "[🔀 Forwarded message]\n» @unknown-user:\n» 🎞️ Uploaded file: https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4 (51 MB)",
|
||||
body: "[↷ Forwarded message]\n» @unknown-user:\n» 🎞️ Uploaded file: https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4 (51 MB)",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "🔀 <em>Forwarded message</em><br><blockquote>@unknown-user:<br>🎞️ Uploaded file: <a href=\"https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4\">2022-10-18_16-49-46.mp4</a> (51 MB)</blockquote>",
|
||||
formatted_body: "↷ <em>Forwarded message</em><br><blockquote>@unknown-user:<br>🎞️ Uploaded file: <a href=\"https://bridge.example.org/download/discordcdn/893634327722721290/1463174815119704114/2022-10-18_16-49-46.mp4\">2022-10-18_16-49-46.mp4</a> (51 MB)</blockquote>",
|
||||
"m.mentions": {}
|
||||
}])
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ function pinsToList(pins, kstate) {
|
|||
/** @type {string[]} */
|
||||
const result = []
|
||||
for (const pin of pins.items) {
|
||||
const eventID = select("event_message", "event_id", {message_id: pin.message.id, part: 0}).pluck().get()
|
||||
const eventID = select("event_message", "event_id", {message_id: pin.message.id}, "ORDER BY part ASC").pluck().get()
|
||||
if (eventID && !alreadyPinned.includes(eventID)) result.push(eventID)
|
||||
}
|
||||
result.reverse()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function removeReaction(data, reactions, key) {
|
|||
// Even though the bridge bot only reacted once on Discord-side, multiple Matrix users may have
|
||||
// reacted on Matrix-side. Semantically, we want to remove the reaction from EVERY Matrix user.
|
||||
// Also need to clean up the database.
|
||||
const hash = utils.getEventIDHash(event.event_id)
|
||||
const hash = utils.getEventIDHash(eventID)
|
||||
removals.push({eventID, mxid: null, hash})
|
||||
}
|
||||
if (!lookingAtMatrixReaction && !wantToRemoveMatrixReaction) {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
const assert = require("assert").strict
|
||||
const DiscordTypes = require("discord-api-types/v10")
|
||||
const {id: botID} = require("../../addbot")
|
||||
const {sync, db, select, from} = require("../passthrough")
|
||||
|
||||
/** @type {import("./actions/send-message")}) */
|
||||
|
|
@ -38,6 +39,8 @@ const removeMember = sync.require("./actions/remove-member")
|
|||
const vote = sync.require("./actions/poll-vote")
|
||||
/** @type {import("../m2d/event-dispatcher")} */
|
||||
const matrixEventDispatcher = sync.require("../m2d/event-dispatcher")
|
||||
/** @type {import("../m2d/actions/redact.js")} */
|
||||
const redact = sync.require("../m2d/actions/redact.js")
|
||||
/** @type {import("../discord/interactions/matrix-info")} */
|
||||
const matrixInfoInteraction = sync.require("../discord/interactions/matrix-info")
|
||||
|
||||
|
|
@ -102,7 +105,7 @@ module.exports = {
|
|||
// console.log(`[check missed messages] in ${channel.id} (${guild.name} / ${channel.name}) because its last message ${channel.last_message_id} is not in the database`)
|
||||
let messages
|
||||
try {
|
||||
messages = await client.snow.channel.getChannelMessages(channel.id, {limit: 50})
|
||||
messages = await client.snow.channel.getChannelMessages(channel.id, {limit: 100})
|
||||
} catch (e) {
|
||||
if (e.message === `{"message": "Missing Access", "code": 50001}`) { // pathetic error handling from SnowTransfer
|
||||
console.log(`[check missed messages] no permissions to look back in channel ${channel.name} (${channel.id})`)
|
||||
|
|
@ -316,7 +319,7 @@ module.exports = {
|
|||
// @ts-ignore
|
||||
await sendMessage.sendMessage(message, channel, guild, row)
|
||||
|
||||
retrigger.messageFinishedBridging(message.id)
|
||||
retrigger.finishedBridging(message.id)
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
@ -337,7 +340,7 @@ module.exports = {
|
|||
|
||||
if (!row) {
|
||||
// Check that the sending-to room exists, and deal with Eventual Consistency(TM)
|
||||
if (retrigger.eventNotFoundThenRetrigger(data.id, module.exports.MESSAGE_UPDATE, client, data)) return
|
||||
if (!await retrigger.waitForMessage(data.id)) return
|
||||
}
|
||||
|
||||
/** @type {DiscordTypes.GatewayMessageCreateDispatchData} */
|
||||
|
|
@ -375,6 +378,16 @@ module.exports = {
|
|||
* @param {DiscordTypes.GatewayMessageReactionRemoveDispatchData | DiscordTypes.GatewayMessageReactionRemoveEmojiDispatchData | DiscordTypes.GatewayMessageReactionRemoveAllDispatchData} data
|
||||
*/
|
||||
async onSomeReactionsRemoved(client, data) {
|
||||
// Don't attempt to double-bridge our own m2d deleted reactions back to Matrix
|
||||
if ("user_id" in data && data.user_id === botID) {
|
||||
const emojiIdOrName = data.emoji.id || data.emoji.name
|
||||
const i = redact.m2dDeletedReactions.findIndex(x => data.message_id === x.messageID && emojiIdOrName === x.emojiIdOrName)
|
||||
if (i !== -1) {
|
||||
redact.m2dDeletedReactions.splice(i, 1)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
await removeReaction.removeSomeReactions(data)
|
||||
},
|
||||
|
||||
|
|
@ -384,7 +397,7 @@ module.exports = {
|
|||
*/
|
||||
async MESSAGE_DELETE(client, data) {
|
||||
speedbump.onMessageDelete(data.id)
|
||||
if (retrigger.eventNotFoundThenRetrigger(data.id, module.exports.MESSAGE_DELETE, client, data)) return
|
||||
if (!await retrigger.waitForMessage(data.id)) return
|
||||
await deleteMessage.deleteMessage(data)
|
||||
},
|
||||
|
||||
|
|
@ -432,12 +445,12 @@ module.exports = {
|
|||
* @param {DiscordTypes.GatewayMessagePollVoteDispatchData} data
|
||||
*/
|
||||
async MESSAGE_POLL_VOTE_ADD(client, data) {
|
||||
if (retrigger.eventNotFoundThenRetrigger(data.message_id, module.exports.MESSAGE_POLL_VOTE_ADD, client, data)) return
|
||||
if (!await retrigger.waitForMessage(data.message_id)) return
|
||||
await vote.addVote(data)
|
||||
},
|
||||
|
||||
async MESSAGE_POLL_VOTE_REMOVE(client, data) {
|
||||
if (retrigger.eventNotFoundThenRetrigger(data.message_id, module.exports.MESSAGE_POLL_VOTE_REMOVE, client, data)) return
|
||||
if (!await retrigger.waitForMessage(data.message_id)) return
|
||||
await vote.removeVote(data)
|
||||
},
|
||||
|
||||
|
|
|
|||
42
src/db/migrations/0037-remove-leaked-webhooks.js
Normal file
42
src/db/migrations/0037-remove-leaked-webhooks.js
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
const {discord, db, from, select, sync} = require("../../passthrough")
|
||||
/** @type {import("../../discord/utils")} */
|
||||
const dUtils = sync.require("../../discord/utils")
|
||||
|
||||
const ones = "₀₁₂₃₄₅₆₇₈₉"
|
||||
const tens = "0123456789"
|
||||
|
||||
/* c8 ignore start */
|
||||
|
||||
module.exports = async function(db) {
|
||||
// added tolerance to https://discordstatus.com/incidents/4hpm4454hxtx
|
||||
const OUTAGE_START = 1778263200000
|
||||
const OUTAGE_END = 1778284800000
|
||||
|
||||
const startSnowflake = dUtils.timestampToSnowflakeInexact(OUTAGE_START)
|
||||
const endSnowflake = dUtils.timestampToSnowflakeInexact(OUTAGE_END)
|
||||
|
||||
const affectedChannels = from("message_room").join("historical_channel_room", "historical_room_index")
|
||||
.pluck("reference_channel_id").selectUnsafe("DISTINCT reference_channel_id")
|
||||
.and("WHERE message_id >= ? AND message_id <= ? AND length(message_id) = ?").all(startSnowflake, endSnowflake, startSnowflake.length)
|
||||
let affectedWebhooks = select("webhook", ["channel_id", "webhook_id", "webhook_token"], {channel_id: affectedChannels}).all()
|
||||
affectedWebhooks = affectedWebhooks.filter(w => BigInt(w.webhook_id) < BigInt(endSnowflake)) // if webhook ID is already newly generated then no need to replace
|
||||
|
||||
if (affectedWebhooks.length) {
|
||||
process.stdout.write(` revoking ${affectedWebhooks.length} possibly compromised webhooks... `)
|
||||
for (let counter = 1; counter <= affectedWebhooks.length; counter++) {
|
||||
const webhook = affectedWebhooks[counter-1]
|
||||
|
||||
await discord.snow.webhook.deleteWebhookToken(webhook.webhook_id, webhook.webhook_token, "Webhook token possibly compromised during 8th May 2026 outage").catch(e => {
|
||||
if (e.message === `{"message": "Unknown Webhook", "code": 10015}`) {
|
||||
// OK
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
})
|
||||
db.prepare("DELETE FROM webhook WHERE channel_id = ?").run(webhook.channel_id)
|
||||
|
||||
process.stdout.write(String(counter).at(-1) === "0" ? tens[(counter/10)%10] : ones[counter%10])
|
||||
}
|
||||
process.stdout.write("\n")
|
||||
}
|
||||
}
|
||||
5
src/db/migrations/0038-fix-emoji-file-format.sql
Normal file
5
src/db/migrations/0038-fix-emoji-file-format.sql
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
BEGIN TRANSACTION;
|
||||
|
||||
DELETE FROM emoji WHERE mxc_url NOT IN (SELECT mxc_url FROM file WHERE discord_url LIKE 'https://cdn.discordapp.com/emojis/%.webp%');
|
||||
|
||||
COMMIT;
|
||||
|
|
@ -104,6 +104,16 @@ class From {
|
|||
return r
|
||||
}
|
||||
|
||||
pluckUnsafe(col) {
|
||||
/** @type {Pluck<Table, any>} */
|
||||
// @ts-ignore
|
||||
const r = this
|
||||
r.cols = [col]
|
||||
r.makeColsSafe = false
|
||||
r.isPluck = true
|
||||
return r
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} sql
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -68,3 +68,8 @@ test("orm: select unsafe works (to select complex column names that can't be typ
|
|||
.all()
|
||||
t.equal(results[0].power_level, 150)
|
||||
})
|
||||
|
||||
test("orm: pluck unsafe works (to select complex column names that can't be type verified)", t => {
|
||||
const result = from("channel_room").where({guild_id: "112760669178241024"}).pluckUnsafe("count(*)").get()
|
||||
t.equal(result, 7)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ async function _interact({guild_id, data}, {api}) {
|
|||
// from Matrix
|
||||
const event = await api.getEvent(message.room_id, message.event_id)
|
||||
const via = await utils.getViaServersQuery(message.room_id, api)
|
||||
|
||||
const channelsInGuild = discord.guildChannelMap.get(guild_id)
|
||||
assert(channelsInGuild)
|
||||
const inChannels = channelsInGuild
|
||||
|
|
@ -61,8 +62,35 @@ async function _interact({guild_id, data}, {api}) {
|
|||
.map(/** @returns {DiscordTypes.APIGuildChannel} */ cid => discord.channels.get(cid))
|
||||
.sort((a, b) => webGuild._getPosition(a, discord.channels) - webGuild._getPosition(b, discord.channels))
|
||||
.filter(channel => from("channel_room").join("member_cache", "room_id").select("mxid").where({channel_id: channel.id, mxid: event.sender}).get())
|
||||
let inChannelsText = inChannels.map(c => `<#${c.id}>`).join(" • ")
|
||||
if (inChannelsText.length > 1024) {
|
||||
inChannelsText = `In ${inChannels.length} channels`
|
||||
}
|
||||
|
||||
const matrixMember = select("member_cache", ["displayname", "avatar_url"], {room_id: message.room_id, mxid: event.sender}).get()
|
||||
const name = matrixMember?.displayname || event.sender
|
||||
let name = matrixMember?.displayname || event.sender
|
||||
let avatar = utils.getPublicUrlForMxc(matrixMember?.avatar_url)
|
||||
|
||||
// Check for per-message profile
|
||||
const perMessageProfile = event.content?.["com.beeper.per_message_profile"]
|
||||
let profileNote = ""
|
||||
if (perMessageProfile) {
|
||||
if (perMessageProfile.displayname) {
|
||||
name = perMessageProfile.displayname
|
||||
}
|
||||
if ("avatar_url" in perMessageProfile) {
|
||||
if (perMessageProfile.avatar_url) {
|
||||
// use provided avatar_url
|
||||
avatar = utils.getPublicUrlForMxc(perMessageProfile.avatar_url)
|
||||
} else if (perMessageProfile.avatar_url === "") {
|
||||
// empty string avatar_url clears the avatar
|
||||
avatar = undefined
|
||||
}
|
||||
// else, omitted/null falls back to member avatar
|
||||
}
|
||||
profileNote = "Sent with a per-message profile.\n"
|
||||
}
|
||||
|
||||
return {
|
||||
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
|
||||
data: {
|
||||
|
|
@ -70,13 +98,13 @@ async function _interact({guild_id, data}, {api}) {
|
|||
author: {
|
||||
name,
|
||||
url: `https://matrix.to/#/${event.sender}`,
|
||||
icon_url: utils.getPublicUrlForMxc(matrixMember?.avatar_url)
|
||||
icon_url: avatar
|
||||
},
|
||||
description: `This Matrix message was delivered to Discord by **Out Of Your Element**.\n[View on Matrix →](<https://matrix.to/#/${message.room_id}/${message.event_id}?${via}>)\n\n**User ID**: [${event.sender}](<https://matrix.to/#/${event.sender}>)`,
|
||||
description: `This Matrix message was delivered to Discord by **Out Of Your Element**.\n[View on Matrix →](<https://matrix.to/#/${message.room_id}/${message.event_id}?${via}>)\n\n${profileNote}**User ID**: [${event.sender}](<https://matrix.to/#/${event.sender}>)`,
|
||||
color: 0x0dbd8b,
|
||||
fields: [{
|
||||
name: "In Channels",
|
||||
value: inChannels.map(c => `<#${c.id}>`).join(" • ")
|
||||
value: inChannelsText
|
||||
}, {
|
||||
name: "\u200b",
|
||||
value: idInfo
|
||||
|
|
|
|||
|
|
@ -85,3 +85,118 @@ test("matrix info: shows info for matrix source message", async t => {
|
|||
)
|
||||
t.equal(called, 1)
|
||||
})
|
||||
|
||||
test("matrix info: shows username for per-message profile", async t => {
|
||||
let called = 0
|
||||
const msg = await _interact({
|
||||
data: {
|
||||
target_id: "1128118177155526666",
|
||||
resolved: {
|
||||
messages: {
|
||||
"1141501302736695316": data.message.simple_reply_to_matrix_user
|
||||
}
|
||||
}
|
||||
},
|
||||
guild_id: "112760669178241024"
|
||||
}, {
|
||||
api: {
|
||||
async getEvent(roomID, eventID) {
|
||||
called++
|
||||
t.equal(roomID, "!kLRqKKUQXcibIMtOpl:cadence.moe")
|
||||
t.equal(eventID, "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4")
|
||||
return {
|
||||
event_id: eventID,
|
||||
room_id: roomID,
|
||||
type: "m.room.message",
|
||||
content: {
|
||||
msgtype: "m.text",
|
||||
body: "master chief: i like the halo",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "<strong>master chief: </strong>i like the halo",
|
||||
"com.beeper.per_message_profile": {
|
||||
has_fallback: true,
|
||||
displayname: "master chief",
|
||||
avatar_url: ""
|
||||
}
|
||||
},
|
||||
sender: "@cadence:cadence.moe"
|
||||
}
|
||||
},
|
||||
async getJoinedMembers(roomID) {
|
||||
return {
|
||||
joined: {}
|
||||
}
|
||||
},
|
||||
async getStateEventOuter(roomID, type, key) {
|
||||
return {
|
||||
content: {
|
||||
room_version: "11"
|
||||
}
|
||||
}
|
||||
},
|
||||
async getStateEvent(roomID, type, key) {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
})
|
||||
t.equal(msg.data.embeds[0].author.name, "master chief")
|
||||
t.match(msg.data.embeds[0].description, "Sent with a per-message profile")
|
||||
t.equal(called, 1)
|
||||
})
|
||||
|
||||
test("matrix info: shows avatar for per-message profile", async t => {
|
||||
let called = 0
|
||||
const msg = await _interact({
|
||||
data: {
|
||||
target_id: "1128118177155526666",
|
||||
resolved: {
|
||||
messages: {
|
||||
"1141501302736695316": data.message.simple_reply_to_matrix_user
|
||||
}
|
||||
}
|
||||
},
|
||||
guild_id: "112760669178241024"
|
||||
}, {
|
||||
api: {
|
||||
async getEvent(roomID, eventID) {
|
||||
called++
|
||||
t.equal(roomID, "!kLRqKKUQXcibIMtOpl:cadence.moe")
|
||||
t.equal(eventID, "$Ij3qo7NxMA4VPexlAiIx2CB9JbsiGhJeyt-2OvkAUe4")
|
||||
return {
|
||||
event_id: eventID,
|
||||
room_id: roomID,
|
||||
type: "m.room.message",
|
||||
content: {
|
||||
msgtype: "m.text",
|
||||
body: "?",
|
||||
format: "org.matrix.custom.html",
|
||||
formatted_body: "?",
|
||||
"com.beeper.per_message_profile": {
|
||||
avatar_url: "mxc://cadence.moe/HXfFuougamkURPPMflTJRxGc"
|
||||
}
|
||||
},
|
||||
sender: "@mystery:cadence.moe"
|
||||
}
|
||||
},
|
||||
async getJoinedMembers(roomID) {
|
||||
return {
|
||||
joined: {}
|
||||
}
|
||||
},
|
||||
async getStateEventOuter(roomID, type, key) {
|
||||
return {
|
||||
content: {
|
||||
room_version: "11"
|
||||
}
|
||||
}
|
||||
},
|
||||
async getStateEvent(roomID, type, key) {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
})
|
||||
t.equal(msg.data.embeds[0].author.name, "@mystery:cadence.moe")
|
||||
t.equal(msg.data.embeds[0].author.icon_url, "https://bridge.example.org/download/matrix/cadence.moe/HXfFuougamkURPPMflTJRxGc")
|
||||
t.match(msg.data.embeds[0].description, "Sent with a per-message profile")
|
||||
t.equal(called, 1)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -91,40 +91,32 @@ function registerInteractions() {
|
|||
async function dispatchInteraction(interaction) {
|
||||
const interactionId = interaction.data?.["custom_id"] || interaction.data?.["name"]
|
||||
try {
|
||||
if (interaction.type === DiscordTypes.InteractionType.MessageComponent || interaction.type === DiscordTypes.InteractionType.ModalSubmit) {
|
||||
// All we get is custom_id, don't know which context the button was clicked in.
|
||||
// So we namespace these ourselves in the custom_id. Currently the only existing namespace is POLL_.
|
||||
if (interaction.data.custom_id.startsWith("POLL_")) {
|
||||
await poll.interact(interaction)
|
||||
if (interactionId === "Matrix info") {
|
||||
await matrixInfo.interact(interaction)
|
||||
} else if (interactionId === "invite") {
|
||||
await invite.interact(interaction)
|
||||
} else if (interactionId === "invite_channel") {
|
||||
await invite.interactButton(interaction)
|
||||
} else if (interactionId === "Permissions") {
|
||||
await permissions.interact(interaction)
|
||||
} else if (interactionId === "permissions_edit") {
|
||||
await permissions.interactEdit(interaction)
|
||||
} else if (interactionId === "Responses") {
|
||||
/** @type {DiscordTypes.APIMessageApplicationCommandGuildInteraction} */ // @ts-ignore
|
||||
const messageInteraction = interaction
|
||||
if (select("poll", "message_id", {message_id: messageInteraction.data.target_id}).get()) {
|
||||
await pollResponses.interact(messageInteraction)
|
||||
} else {
|
||||
throw new Error(`Unknown message component ${interaction.data.custom_id}`)
|
||||
await reactions.interact(messageInteraction)
|
||||
}
|
||||
} else if (interactionId === "ping") {
|
||||
await ping.interact(interaction)
|
||||
} else if (interactionId === "privacy") {
|
||||
await privacy.interact(interaction)
|
||||
} else if (interactionId.startsWith("POLL_")) {
|
||||
await poll.interact(interaction)
|
||||
} else {
|
||||
if (interactionId === "Matrix info") {
|
||||
await matrixInfo.interact(interaction)
|
||||
} else if (interactionId === "invite") {
|
||||
await invite.interact(interaction)
|
||||
} else if (interactionId === "invite_channel") {
|
||||
await invite.interactButton(interaction)
|
||||
} else if (interactionId === "Permissions") {
|
||||
await permissions.interact(interaction)
|
||||
} else if (interactionId === "permissions_edit") {
|
||||
await permissions.interactEdit(interaction)
|
||||
} else if (interactionId === "Responses") {
|
||||
/** @type {DiscordTypes.APIMessageApplicationCommandGuildInteraction} */ // @ts-ignore
|
||||
const messageInteraction = interaction
|
||||
if (select("poll", "message_id", {message_id: messageInteraction.data.target_id}).get()) {
|
||||
await pollResponses.interact(messageInteraction)
|
||||
} else {
|
||||
await reactions.interact(messageInteraction)
|
||||
}
|
||||
} else if (interactionId === "ping") {
|
||||
await ping.interact(interaction)
|
||||
} else if (interactionId === "privacy") {
|
||||
await privacy.interact(interaction)
|
||||
} else {
|
||||
throw new Error(`Unknown interaction ${interactionId}`)
|
||||
}
|
||||
throw new Error(`Unknown interaction ${interactionId}`)
|
||||
}
|
||||
} catch (e) {
|
||||
let stackLines = null
|
||||
|
|
|
|||
|
|
@ -182,6 +182,394 @@ function filterTo(xs, fn) {
|
|||
return filtered
|
||||
}
|
||||
|
||||
const supportedPlaintextPreviewExtensions = new Set([
|
||||
"4d",
|
||||
"abnf",
|
||||
"accesslog",
|
||||
"actionscript",
|
||||
"ada",
|
||||
"adoc",
|
||||
"alan",
|
||||
"angelscript",
|
||||
"ansi",
|
||||
"apache",
|
||||
"apacheconf",
|
||||
"applescript",
|
||||
"arcade",
|
||||
"arduino",
|
||||
"arm",
|
||||
"armasm",
|
||||
"as",
|
||||
"asc",
|
||||
"asciidoc",
|
||||
"aspectj",
|
||||
"ass",
|
||||
"atom",
|
||||
"autohotkey",
|
||||
"autoit",
|
||||
"avrasm",
|
||||
"awk",
|
||||
"axapta",
|
||||
"bash",
|
||||
"basic",
|
||||
"bat",
|
||||
"bbcode",
|
||||
"bf",
|
||||
"bind",
|
||||
"blade",
|
||||
"bnf",
|
||||
"brainfuck",
|
||||
"c",
|
||||
"c++",
|
||||
"cal",
|
||||
"capnp",
|
||||
"capnproto",
|
||||
"cc",
|
||||
"chaos",
|
||||
"chapel",
|
||||
"chpl",
|
||||
"cisco",
|
||||
"clj",
|
||||
"clojure",
|
||||
"cls",
|
||||
"cmake.in",
|
||||
"cmake",
|
||||
"cmd",
|
||||
"coffee",
|
||||
"coffeescript",
|
||||
"console",
|
||||
"coq",
|
||||
"cos",
|
||||
"cpc",
|
||||
"cpp",
|
||||
"cr",
|
||||
"craftcms",
|
||||
"crm",
|
||||
"crmsh",
|
||||
"crystal",
|
||||
"cs",
|
||||
"csharp",
|
||||
"cshtml",
|
||||
"cson",
|
||||
"csp",
|
||||
"css",
|
||||
"csv",
|
||||
"cxx",
|
||||
"cypher",
|
||||
"d",
|
||||
"dart",
|
||||
"delphi",
|
||||
"dfm",
|
||||
"diff",
|
||||
"django",
|
||||
"dns",
|
||||
"docker",
|
||||
"dockerfile",
|
||||
"dos",
|
||||
"dpr",
|
||||
"dsconfig",
|
||||
"dst",
|
||||
"dts",
|
||||
"dust",
|
||||
"dylan",
|
||||
"ebnf",
|
||||
"elixir",
|
||||
"elm",
|
||||
"erl",
|
||||
"erlang",
|
||||
"ex",
|
||||
"extempore",
|
||||
"f90",
|
||||
"f95",
|
||||
"fix",
|
||||
"fortran",
|
||||
"freepascal",
|
||||
"fs",
|
||||
"fsharp",
|
||||
"gams",
|
||||
"gauss",
|
||||
"gawk",
|
||||
"gcode",
|
||||
"gdscript",
|
||||
"gemspec",
|
||||
"gf",
|
||||
"gherkin",
|
||||
"glsl",
|
||||
"gms",
|
||||
"gn",
|
||||
"gni",
|
||||
"go",
|
||||
"godot",
|
||||
"golang",
|
||||
"golo",
|
||||
"gololang",
|
||||
"gradle",
|
||||
"graph",
|
||||
"groovy",
|
||||
"gss",
|
||||
"gyp",
|
||||
"h",
|
||||
"h++",
|
||||
"haml",
|
||||
"handlebars",
|
||||
"haskell",
|
||||
"haxe",
|
||||
"hbs",
|
||||
"hcl",
|
||||
"hh",
|
||||
"hpp",
|
||||
"hs",
|
||||
"html.handlebars",
|
||||
"html.hbs",
|
||||
"html",
|
||||
"http",
|
||||
"https",
|
||||
"hx",
|
||||
"hxx",
|
||||
"hy",
|
||||
"hylang",
|
||||
"i",
|
||||
"i7",
|
||||
"iced",
|
||||
"iecst",
|
||||
"inform7",
|
||||
"ini",
|
||||
"ino",
|
||||
"instances",
|
||||
"iol",
|
||||
"irb",
|
||||
"irpf90",
|
||||
"java",
|
||||
"javascript",
|
||||
"jinja",
|
||||
"jolie",
|
||||
"js",
|
||||
"json",
|
||||
"jsp",
|
||||
"jsx",
|
||||
"julia-repl",
|
||||
"julia",
|
||||
"k",
|
||||
"kaos",
|
||||
"kdb",
|
||||
"kotlin",
|
||||
"kt",
|
||||
"lasso",
|
||||
"lassoscript",
|
||||
"lazarus",
|
||||
"ldif",
|
||||
"leaf",
|
||||
"lean",
|
||||
"less",
|
||||
"lfm",
|
||||
"lisp",
|
||||
"livecodeserver",
|
||||
"livescript",
|
||||
"ln",
|
||||
"lock",
|
||||
"log",
|
||||
"lpr",
|
||||
"ls",
|
||||
"ls",
|
||||
"lua",
|
||||
"mak",
|
||||
"make",
|
||||
"makefile",
|
||||
"markdown",
|
||||
"mathematica",
|
||||
"matlab",
|
||||
"mawk",
|
||||
"maxima",
|
||||
"md",
|
||||
"mel",
|
||||
"mercury",
|
||||
"mirc",
|
||||
"mizar",
|
||||
"mk",
|
||||
"mkd",
|
||||
"mkdown",
|
||||
"ml",
|
||||
"ml",
|
||||
"mm",
|
||||
"mma",
|
||||
"mojolicious",
|
||||
"monkey",
|
||||
"moon",
|
||||
"moonscript",
|
||||
"mrc",
|
||||
"n1ql",
|
||||
"nawk",
|
||||
"nc",
|
||||
"never",
|
||||
"nginx",
|
||||
"nginxconf",
|
||||
"nim",
|
||||
"nimrod",
|
||||
"nix",
|
||||
"nsis",
|
||||
"obj-c",
|
||||
"obj-c++",
|
||||
"objc",
|
||||
"objective-c++",
|
||||
"objectivec",
|
||||
"ocaml",
|
||||
"ocl",
|
||||
"ol",
|
||||
"openscad",
|
||||
"osascript",
|
||||
"oxygene",
|
||||
"p21",
|
||||
"parser3",
|
||||
"pas",
|
||||
"pascal",
|
||||
"patch",
|
||||
"pcmk",
|
||||
"perl",
|
||||
"pf.conf",
|
||||
"pf",
|
||||
"pgsql",
|
||||
"php",
|
||||
"php3",
|
||||
"php4",
|
||||
"php5",
|
||||
"php6",
|
||||
"php7",
|
||||
"pl",
|
||||
"plaintext",
|
||||
"plist",
|
||||
"pm",
|
||||
"podspec",
|
||||
"pony",
|
||||
"postgres",
|
||||
"postgresql",
|
||||
"powershell",
|
||||
"pp",
|
||||
"processing",
|
||||
"profile",
|
||||
"prolog",
|
||||
"properties",
|
||||
"proto",
|
||||
"protobuf",
|
||||
"ps",
|
||||
"ps1",
|
||||
"puppet",
|
||||
"py",
|
||||
"pycon",
|
||||
"python-repl",
|
||||
"python",
|
||||
"qml",
|
||||
"r",
|
||||
"razor-cshtml",
|
||||
"razor",
|
||||
"rb",
|
||||
"re",
|
||||
"reasonml",
|
||||
"rebol",
|
||||
"red-system",
|
||||
"red",
|
||||
"redbol",
|
||||
"rf",
|
||||
"rib",
|
||||
"robot",
|
||||
"rpm-spec",
|
||||
"rpm-specfile",
|
||||
"rpm",
|
||||
"rs",
|
||||
"rsl",
|
||||
"rss",
|
||||
"ruby",
|
||||
"ruleslanguage",
|
||||
"rust",
|
||||
"sas",
|
||||
"SAS",
|
||||
"sc",
|
||||
"scad",
|
||||
"scala",
|
||||
"scheme",
|
||||
"sci",
|
||||
"scilab",
|
||||
"scl",
|
||||
"scss",
|
||||
"sh",
|
||||
"shell",
|
||||
"shexc",
|
||||
"smali",
|
||||
"smalltalk",
|
||||
"sml",
|
||||
"sol",
|
||||
"solidity",
|
||||
"spec",
|
||||
"specfile",
|
||||
"sql",
|
||||
"srt",
|
||||
"ssa",
|
||||
"st",
|
||||
"stan",
|
||||
"stanfuncs",
|
||||
"stata",
|
||||
"step",
|
||||
"stp",
|
||||
"structured-text",
|
||||
"styl",
|
||||
"stylus",
|
||||
"subunit",
|
||||
"supercollider",
|
||||
"svelte",
|
||||
"svg",
|
||||
"swift",
|
||||
"tao",
|
||||
"tap",
|
||||
"tcl",
|
||||
"terraform",
|
||||
"tex",
|
||||
"text",
|
||||
"tf",
|
||||
"thor",
|
||||
"thrift",
|
||||
"tk",
|
||||
"toml",
|
||||
"tp",
|
||||
"ts",
|
||||
"tsql",
|
||||
"tsx",
|
||||
"ttml",
|
||||
"twig",
|
||||
"txt",
|
||||
"typescript",
|
||||
"unicorn-rails-log",
|
||||
"v",
|
||||
"vala",
|
||||
"vb",
|
||||
"vba",
|
||||
"vbnet",
|
||||
"vbs",
|
||||
"vbscript",
|
||||
"verilog",
|
||||
"vhdl",
|
||||
"vim",
|
||||
"vtt",
|
||||
"wl",
|
||||
"x++",
|
||||
"x86asm",
|
||||
"xhtml",
|
||||
"xjb",
|
||||
"xl",
|
||||
"xml",
|
||||
"xpath",
|
||||
"xq",
|
||||
"xquery",
|
||||
"xsd",
|
||||
"xsl",
|
||||
"xtlang",
|
||||
"xtm",
|
||||
"yaml",
|
||||
"yml",
|
||||
"zep",
|
||||
"zephir",
|
||||
"zone",
|
||||
"zsh"
|
||||
])
|
||||
|
||||
module.exports.getPermissions = getPermissions
|
||||
module.exports.getDefaultPermissions = getDefaultPermissions
|
||||
module.exports.hasPermission = hasPermission
|
||||
|
|
@ -194,3 +582,4 @@ module.exports.timestampToSnowflakeInexact = timestampToSnowflakeInexact
|
|||
module.exports.getPublicUrlForCdn = getPublicUrlForCdn
|
||||
module.exports.howOldUnbridgedMessage = howOldUnbridgedMessage
|
||||
module.exports.filterTo = filterTo
|
||||
module.exports.supportedPlaintextPreviewExtensions = supportedPlaintextPreviewExtensions
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ const retrigger = sync.require("../../d2m/actions/retrigger")
|
|||
*/
|
||||
async function addReaction(event) {
|
||||
// Wait until the corresponding channel and message have already been bridged
|
||||
if (retrigger.eventNotFoundThenRetrigger(event.content["m.relates_to"].event_id, () => as.emit("type:m.reaction", event))) return
|
||||
if (!await retrigger.waitForEvent(event.content["m.relates_to"].event_id)) return
|
||||
|
||||
// These will exist because it passed retrigger
|
||||
const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index")
|
||||
|
|
@ -50,6 +50,8 @@ async function addReaction(event) {
|
|||
}
|
||||
|
||||
db.prepare("REPLACE INTO reaction (hashed_event_id, message_id, encoded_emoji, original_encoding) VALUES (?, ?, ?, ?)").run(utils.getEventIDHash(event.event_id), messageID, discordPreferredEncoding, key)
|
||||
|
||||
retrigger.finishedBridging(event.event_id)
|
||||
}
|
||||
|
||||
module.exports.addReaction = addReaction
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ const utils = sync.require("../../matrix/utils")
|
|||
/** @type {import("../../d2m/actions/retrigger")} */
|
||||
const retrigger = sync.require("../../d2m/actions/retrigger")
|
||||
|
||||
/** @type {{messageID: string, emojiIdOrName: string}[]} */
|
||||
const m2dDeletedReactions = []
|
||||
|
||||
/**
|
||||
* @param {Ty.Event.Outer_M_Room_Redaction} event
|
||||
*/
|
||||
|
|
@ -24,6 +27,21 @@ async function deleteMessage(event) {
|
|||
db.prepare("DELETE FROM message_room WHERE message_id = ?").run(rows[0].message_id)
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Ty.Event.Outer_M_Room_Redaction} event
|
||||
*/
|
||||
async function removeMessageEvent(event) {
|
||||
// Could be for removing a message or suppressing embeds. For more information, the message needs to be bridged first.
|
||||
if (!await retrigger.waitForEvent(event.redacts)) return
|
||||
|
||||
const row = select("event_message", ["event_type", "event_subtype", "part"], {event_id: event.redacts}).get()
|
||||
if (row && row.event_type === "m.room.message" && row.event_subtype === "m.notice" && row.part === 1) {
|
||||
await suppressEmbeds(event)
|
||||
} else {
|
||||
await deleteMessage(event)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Ty.Event.Outer_M_Room_Redaction} event
|
||||
*/
|
||||
|
|
@ -41,11 +59,20 @@ async function suppressEmbeds(event) {
|
|||
* @param {Ty.Event.Outer_M_Room_Redaction} event
|
||||
*/
|
||||
async function removeReaction(event) {
|
||||
if (!await retrigger.waitForReactionEvent(event.redacts)) return
|
||||
|
||||
const hash = utils.getEventIDHash(event.redacts)
|
||||
const row = from("reaction").join("message_room", "message_id").join("historical_channel_room", "historical_room_index")
|
||||
.select("reference_channel_id", "message_id", "encoded_emoji").where({hashed_event_id: hash}).get()
|
||||
if (!row) return
|
||||
await discord.snow.channel.deleteReactionSelf(row.reference_channel_id, row.message_id, row.encoded_emoji)
|
||||
// See how many Matrix-side reactions there are, and delete if it's the last one
|
||||
const numberOfReactions = from("reaction").where({message_id: row.message_id, encoded_emoji: row.encoded_emoji}).pluckUnsafe("count(*)").get()
|
||||
if (numberOfReactions === 1) {
|
||||
// If a unicode emoji, the name is already the Discord preferred version because that's what was added and stored to encoded_emoji
|
||||
const emojiIdOrName = decodeURIComponent(row.encoded_emoji).split(":").slice(-1)[0]
|
||||
m2dDeletedReactions.push({messageID: row.message_id, emojiIdOrName})
|
||||
await discord.snow.channel.deleteReactionSelf(row.reference_channel_id, row.message_id, row.encoded_emoji)
|
||||
}
|
||||
db.prepare("DELETE FROM reaction WHERE hashed_event_id = ?").run(hash)
|
||||
}
|
||||
|
||||
|
|
@ -54,18 +81,12 @@ async function removeReaction(event) {
|
|||
* @param {Ty.Event.Outer_M_Room_Redaction} event
|
||||
*/
|
||||
async function handle(event) {
|
||||
// If this is for removing a reaction, try it
|
||||
await removeReaction(event)
|
||||
|
||||
// Or, it might be for removing a message or suppressing embeds. But to do that, the message needs to be bridged first.
|
||||
if (retrigger.eventNotFoundThenRetrigger(event.redacts, () => as.emit("type:m.room.redaction", event))) return
|
||||
|
||||
const row = select("event_message", ["event_type", "event_subtype", "part"], {event_id: event.redacts}).get()
|
||||
if (row && row.event_type === "m.room.message" && row.event_subtype === "m.notice" && row.part === 1) {
|
||||
await suppressEmbeds(event)
|
||||
} else {
|
||||
await deleteMessage(event)
|
||||
}
|
||||
// Don't know if it's a redaction for a reaction or an event, try both at the same time (otherwise waitFor will block)
|
||||
await Promise.all([
|
||||
removeMessageEvent(event),
|
||||
removeReaction(event)
|
||||
])
|
||||
}
|
||||
|
||||
module.exports.handle = handle
|
||||
module.exports.m2dDeletedReactions = m2dDeletedReactions
|
||||
|
|
@ -13,7 +13,7 @@ async function updatePins(pins, prev) {
|
|||
const diff = diffPins.diffPins(pins, prev)
|
||||
for (const [event_id, added] of diff) {
|
||||
const row = from("event_message").join("message_room", "message_id").join("historical_channel_room", "historical_room_index")
|
||||
.select("reference_channel_id", "message_id").get()
|
||||
.select("reference_channel_id", "message_id").where({event_id}).and("ORDER BY part ASC").get()
|
||||
if (!row) continue
|
||||
if (added) {
|
||||
discord.snow.channel.addChannelPinnedMessage(row.reference_channel_id, row.message_id, "Message pinned on Matrix")
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ const pollComponents = sync.require("./poll-components")
|
|||
const setupEmojis = sync.require("../actions/setup-emojis")
|
||||
/** @type {import("../../d2m/converters/user-to-mxid")} */
|
||||
const userToMxid = sync.require("../../d2m/converters/user-to-mxid")
|
||||
/** @type {import("../../web/routes/letter-avatar")} */
|
||||
const letterAvatar = sync.require("../../web/routes/letter-avatar")
|
||||
|
||||
/** @type {[RegExp, string][]} */
|
||||
const markdownEscapes = [
|
||||
|
|
@ -550,13 +552,30 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
/** @type {string[]} */
|
||||
let messageIDsToEdit = []
|
||||
let replyLine = ""
|
||||
|
||||
// Extract a basic display name from the sender
|
||||
const match = event.sender.match(/^@(.*?):/)
|
||||
if (match) displayName = match[1]
|
||||
|
||||
// Try to extract an accurate display name and avatar URL from the member event
|
||||
const member = await getMemberFromCacheOrHomeserver(event.room_id, event.sender, di?.api)
|
||||
if (member.displayname) displayName = member.displayname
|
||||
if (member.avatar_url) avatarURL = mxUtils.getPublicUrlForMxc(member.avatar_url)
|
||||
|
||||
// MSC4144: Override display name and avatar from per-message profile if present
|
||||
const perMessageProfile = event.content["com.beeper.per_message_profile"]
|
||||
if (perMessageProfile?.displayname) displayName = perMessageProfile.displayname
|
||||
if (perMessageProfile && "avatar_url" in perMessageProfile) {
|
||||
if (perMessageProfile.avatar_url) {
|
||||
// use provided avatar_url
|
||||
avatarURL = mxUtils.getPublicUrlForMxc(perMessageProfile.avatar_url)
|
||||
} else if (perMessageProfile.avatar_url === "") {
|
||||
// empty string avatar_url clears the avatar
|
||||
avatarURL = undefined
|
||||
}
|
||||
// else, omitted/null falls back to member avatar
|
||||
}
|
||||
|
||||
// If the display name is too long to be put into the webhook (80 characters is the maximum),
|
||||
// put the excess characters into displayNameRunoff, later to be put at the top of the message
|
||||
let [displayNameShortened, displayNameRunoff] = splitDisplayName(displayName)
|
||||
|
|
@ -565,6 +584,13 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
displayNameRunoff = ""
|
||||
}
|
||||
|
||||
// Avatar post-processing. Use a thumbnail for media, or generate letter avatar if none present.
|
||||
if (avatarURL) {
|
||||
avatarURL = avatarURL + "?preset=avatar"
|
||||
} else {
|
||||
avatarURL = letterAvatar.getLetterAvatarURL(event.sender, displayNameShortened)
|
||||
}
|
||||
|
||||
let content = event.content["body"] || "" // ultimate fallback
|
||||
/** @type {{id: string, filename: string}[]} */
|
||||
const attachments = []
|
||||
|
|
@ -804,7 +830,7 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
}
|
||||
|
||||
// Handling mentions of Discord users
|
||||
input = input.replace(/("https:\/\/matrix.to\/#\/((?:@|%40)[^"]+)")>/g, (whole, attributeValue, mxid) => {
|
||||
input = input.replace(/("https:\/\/matrix.to\/#\/((?:@|%40)[^"]+)")/g, (whole, attributeValue, mxid) => {
|
||||
mxid = decodeURIComponent(mxid)
|
||||
if (mxUtils.eventSenderIsFromDiscord(mxid)) {
|
||||
// Handle mention of an OOYE sim user by their mxid
|
||||
|
|
@ -859,8 +885,9 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
const doc = domino.createDocument(
|
||||
// DOM parsers arrange elements in the <head> and <body>. Wrapping in a custom element ensures elements are reliably arranged in a single element.
|
||||
'<x-turndown id="turndown-root">' + input + '</x-turndown>'
|
||||
);
|
||||
const root = doc.getElementById("turndown-root");
|
||||
)
|
||||
const root = doc.getElementById("turndown-root")
|
||||
assert(root)
|
||||
async function forEachNode(event, node) {
|
||||
for (; node; node = node.nextSibling) {
|
||||
// Check written mentions
|
||||
|
|
@ -874,9 +901,12 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
}
|
||||
// Check for incompatible backticks in code blocks
|
||||
let preNode
|
||||
if (node.nodeType === 3 && node.nodeValue.includes("```") && (preNode = nodeIsChildOf(node, ["PRE"]))) {
|
||||
let isBackticksTextInPre = node.nodeType === 3 && node.nodeValue.includes("```") && (preNode = nodeIsChildOf(node, ["PRE"]))
|
||||
let isLongPre = node.tagName === "PRE" && node.textContent.length > 1800 && (preNode = node)
|
||||
if (isBackticksTextInPre || isLongPre) {
|
||||
if (preNode.firstChild?.nodeName === "CODE") {
|
||||
const ext = preNode.firstChild.className.match(/language-(\S+)/)?.[1] || "txt"
|
||||
let ext = preNode.firstChild.className.match(/language-(\S+)/)?.[1]
|
||||
if (!dUtils.supportedPlaintextPreviewExtensions.has(ext)) ext = "txt"
|
||||
const filename = `inline_code.${ext}`
|
||||
// Build the replacement <code> node
|
||||
const replacementCode = doc.createElement("code")
|
||||
|
|
@ -913,6 +943,7 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
}
|
||||
}
|
||||
await forEachNode(event, root)
|
||||
if (perMessageProfile?.has_fallback) root.querySelectorAll("[data-mx-profile-fallback]").forEach(x => x.remove())
|
||||
|
||||
// SPRITE SHEET EMOJIS FEATURE: Emojis at the end of the message that we don't know about will be reuploaded as a sprite sheet.
|
||||
// First we need to determine which emojis are at the end.
|
||||
|
|
@ -944,6 +975,10 @@ async function eventToMessage(event, guild, channel, di) {
|
|||
} else {
|
||||
// Looks like we're using the plaintext body!
|
||||
content = event.content.body
|
||||
if (perMessageProfile?.has_fallback && perMessageProfile.displayname && content.startsWith(perMessageProfile.displayname + ": ")) {
|
||||
// Strip the display name prefix fallback added for clients that don't support per-message profiles
|
||||
content = content.slice(perMessageProfile.displayname.length + 2)
|
||||
}
|
||||
|
||||
if (event.content.msgtype === "m.emote") {
|
||||
content = `* ${displayName} ${content}`
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -94,6 +94,11 @@ function printError(type, source, e, payload) {
|
|||
console.dir(payload, {depth: null})
|
||||
}
|
||||
|
||||
/** @param {string} stack */
|
||||
function cleanErrorStack(stack) {
|
||||
return stack.replace(/(\/webhooks\/[0-9]+\/)[a-zA-Z0-9_-]+/g, "$1(redacted)")
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} roomID
|
||||
* @param {"Discord" | "Matrix"} source
|
||||
|
|
@ -134,7 +139,7 @@ async function sendError(roomID, source, type, e, payload) {
|
|||
builder.addLine(errorIntroLine)
|
||||
|
||||
// Where
|
||||
const stack = stringifyErrorStack(e)
|
||||
const stack = cleanErrorStack(stringifyErrorStack(e))
|
||||
builder.addLine(`Error trace:\n${stack}`, tag`<details><summary>Error trace</summary><pre>${stack}</pre></details>`)
|
||||
|
||||
// How
|
||||
|
|
@ -143,7 +148,7 @@ async function sendError(roomID, source, type, e, payload) {
|
|||
|
||||
// Send
|
||||
try {
|
||||
await api.sendEvent(roomID, "m.room.message", {
|
||||
const errorEventID = await api.sendEvent(roomID, "m.room.message", {
|
||||
...builder.get(),
|
||||
"moe.cadence.ooye.error": {
|
||||
source: source.toLowerCase(),
|
||||
|
|
@ -153,6 +158,14 @@ async function sendError(roomID, source, type, e, payload) {
|
|||
user_ids: ["@cadence:cadence.moe"]
|
||||
}
|
||||
})
|
||||
// Add reaction indicating that errors may be retried
|
||||
await api.sendEvent(roomID, "m.reaction", {
|
||||
"m.relates_to": {
|
||||
rel_type: "m.annotation",
|
||||
event_id: errorEventID,
|
||||
key: "🔁"
|
||||
}
|
||||
})
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
|
|
@ -172,6 +185,7 @@ const errorRetrySema = new Semaphore()
|
|||
* @param {Ty.Event.Outer<Ty.Event.M_Reaction>} reactionEvent
|
||||
*/
|
||||
async function onRetryReactionAdd(reactionEvent) {
|
||||
if (reactionEvent.sender === `@${reg.sender_localpart}:${reg.ooye.server_name}`) return // Don't respond to the bot's own indicative reaction
|
||||
const roomID = reactionEvent.room_id
|
||||
await errorRetrySema.request(async () => {
|
||||
const event = await api.getEvent(roomID, reactionEvent.content["m.relates_to"]?.event_id)
|
||||
|
|
@ -211,7 +225,7 @@ async event => {
|
|||
// @ts-ignore
|
||||
await matrixCommandHandler.execute(event)
|
||||
}
|
||||
retrigger.messageFinishedBridging(event.event_id)
|
||||
retrigger.finishedBridging(event.event_id)
|
||||
await api.ackEvent(event)
|
||||
}))
|
||||
|
||||
|
|
@ -222,7 +236,7 @@ sync.addTemporaryListener(as, "type:m.sticker", guard("m.sticker",
|
|||
async event => {
|
||||
if (utils.eventSenderIsFromDiscord(event.sender)) return
|
||||
const messageResponses = await sendEvent.sendEvent(event)
|
||||
retrigger.messageFinishedBridging(event.event_id)
|
||||
retrigger.finishedBridging(event.event_id)
|
||||
await api.ackEvent(event)
|
||||
}))
|
||||
|
||||
|
|
@ -502,5 +516,6 @@ async event => {
|
|||
}))
|
||||
|
||||
module.exports.stringifyErrorStack = stringifyErrorStack
|
||||
module.exports.cleanErrorStack = cleanErrorStack
|
||||
module.exports.sendError = sendError
|
||||
module.exports.printError = printError
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// @ts-check
|
||||
|
||||
const {test} = require("supertape")
|
||||
const {stringifyErrorStack} = require("./event-dispatcher")
|
||||
const {stringifyErrorStack, cleanErrorStack} = require("./event-dispatcher")
|
||||
|
||||
test("stringify error stack: works", t => {
|
||||
function a() {
|
||||
|
|
@ -21,3 +21,30 @@ test("stringify error stack: works", t => {
|
|||
t.match(str, /^ \[prop\]: 2.1$/m)
|
||||
}
|
||||
})
|
||||
|
||||
test("clean error stack: removes webhook token", t => {
|
||||
t.notMatch(
|
||||
cleanErrorStack(`
|
||||
DiscordAPIError: Service resource is being rate limited.
|
||||
at fn (/var/home/cadence/out-of-your-element/node_modules/snowtransfer/src/RequestHandler.ts:591:13)
|
||||
at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
|
||||
at exports.RequestHandler.request (/var/home/cadence/out-of-your-element/node_modules/snowtransfer/src/RequestHandler.ts:546:17)
|
||||
at WebhookMethods.executeWebhook (/var/home/cadence/out-of-your-element/node_modules/snowtransfer/src/methods/Webhook.ts:249:35)
|
||||
at /var/home/cadence/out-of-your-element/src/m2d/actions/channel-webhook.js:65:31
|
||||
at withWebhook (/var/home/cadence/out-of-your-element/src/m2d/actions/channel-webhook.js:47:9)
|
||||
at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
|
||||
at async Object.sendMessageWithWebhook (/var/home/cadence/out-of-your-element/src/m2d/actions/channel-webhook.js:64:17)
|
||||
at async Object.sendEvent (/var/home/cadence/out-of-your-element/src/m2d/actions/send-event.js:132:27)
|
||||
at async /var/home/cadence/out-of-your-element/src/m2d/event-dispatcher.js:208:27
|
||||
at async AppService.<anonymous> (/var/home/cadence/out-of-your-element/src/m2d/event-dispatcher.js:162:11) {
|
||||
[method]: "POST"
|
||||
[path]: "/webhooks/1160903754728611841/pfRqHl9vVZImdqwWWSZxxH8T-JJMnauxroMnHsvC6ARA-3B9_STH_bnHB9pd7QQaUVCG"
|
||||
[code]: 40062
|
||||
[httpStatus]: 429
|
||||
[request]: {"endpoint":"/webhooks/1160903754728611841/pfRqHl9vVZImdqwWWSZxxH8T-JJMnauxroMnHsvC6ARA-3B9_STH_bnHB9pd7QQaUVCG","method":"POST","dataType":"json","data":{"content":"https://discordstatus.com/#day\nOnly what discord tell us right now","allowed_mentions":{"parse":["roles"],"users":[]},"username":"lewri","avatar_url":"https://bridge.cadence.moe/download/matrix/matrix.org/URWwrtSUONGOYhfMsdUzcrir"}}
|
||||
[response]: {}
|
||||
[name]: "DiscordAPIError"`
|
||||
),
|
||||
/pfRqHl9v/
|
||||
)
|
||||
})
|
||||
|
|
|
|||
|
|
@ -463,17 +463,29 @@ async function ping() {
|
|||
}
|
||||
|
||||
/**
|
||||
* Given an mxc:// URL, and an optional height for thumbnailing, get the file from the content repository. Returns res.
|
||||
* Given an mxc:// URL, and optional parameters for thumbnailing, get the file from the content repository. Returns res.
|
||||
*
|
||||
* Note that Synapse currently doesn't support animated thumbnails: https://github.com/element-hq/synapse/pull/18831
|
||||
* @see https://spec.matrix.org/v1.18/client-server-api/#get_matrixclientv1mediathumbnailservernamemediaid
|
||||
* @param {string} mxc
|
||||
* @param {RequestInit & {height?: number | string}} [init]
|
||||
* @param {RequestInit & {thumbnail?: {height?: number | string, width?: number | string, animated?: boolean, method?: "crop" | "scale"}}} [init]
|
||||
* @return {Promise<Response & {body: streamWeb.ReadableStream<Uint8Array>}>}
|
||||
*/
|
||||
async function getMedia(mxc, init = {}) {
|
||||
init = {...init}
|
||||
|
||||
const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/(\w+)$/)
|
||||
assert(mediaParts)
|
||||
const downloadOrThumbnail = init.height ? "thumbnail" : "download"
|
||||
let url = `${mreq.baseUrl}/client/v1/media/${downloadOrThumbnail}/${mediaParts[1]}/${mediaParts[2]}`
|
||||
if (init.height) url += "?" + new URLSearchParams({height: String(init.height), width: String(init.height)})
|
||||
|
||||
let route = "download"
|
||||
let query = ""
|
||||
|
||||
if (init.thumbnail) {
|
||||
route = "thumbnail"
|
||||
query = "?" + new URLSearchParams(Object.keys(init.thumbnail).map(k => [k, String(init.thumbnail?.[k])]))
|
||||
}
|
||||
|
||||
let url = `${mreq.baseUrl}/client/v1/media/${route}/${mediaParts[1]}/${mediaParts[2]}${query}`
|
||||
const res = await fetch(url, {
|
||||
headers: {
|
||||
Authorization: `Bearer ${reg.as_token}`
|
||||
|
|
|
|||
|
|
@ -78,6 +78,15 @@ function readRegistration() {
|
|||
/** @type {import("../types").AppServiceRegistrationConfig} */ // @ts-ignore
|
||||
let reg = readRegistration()
|
||||
|
||||
if (reg) {
|
||||
fs.watch(registrationFilePath, {persistent: false}, () => {
|
||||
let newReg = readRegistration()
|
||||
if (newReg) {
|
||||
Object.assign(reg, newReg)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
module.exports.registrationFilePath = registrationFilePath
|
||||
module.exports.readRegistration = readRegistration
|
||||
module.exports.getTemplateRegistration = getTemplateRegistration
|
||||
|
|
|
|||
21
src/stdin.js
21
src/stdin.js
|
|
@ -15,18 +15,37 @@ const mreq = sync.require("./matrix/mreq")
|
|||
const api = sync.require("./matrix/api")
|
||||
const file = sync.require("./matrix/file")
|
||||
const sendEvent = sync.require("./m2d/actions/send-event")
|
||||
const redact = sync.require("./m2d/actions/redact")
|
||||
const eventDispatcher = sync.require("./d2m/event-dispatcher")
|
||||
const updatePins = sync.require("./d2m/actions/update-pins")
|
||||
const speedbump = sync.require("./d2m/actions/speedbump")
|
||||
const ks = sync.require("./matrix/kstate")
|
||||
const setPresence = sync.require("./d2m/actions/set-presence")
|
||||
const channelWebhook = sync.require("./m2d/actions/channel-webhook")
|
||||
const dUtils = sync.require("./discord/utils")
|
||||
const mxUtils = sync.require("./matrix/utils")
|
||||
const guildID = "112760669178241024"
|
||||
|
||||
async function ping() {
|
||||
const result = await api.ping().catch(e => ({ok: false, status: "net", root: e.message}))
|
||||
if (result.ok) {
|
||||
return "Ping OK. The homeserver and OOYE are talking to each other fine."
|
||||
} else {
|
||||
if (typeof result.root === "string") {
|
||||
var msg = `Cannot reach homeserver: ${result.root}`
|
||||
} else if (result.root.error) {
|
||||
var msg = `Homeserver said: [${result.status}] ${result.root.error}`
|
||||
} else {
|
||||
var msg = `Homeserver said: [${result.status}] ${JSON.stringify(result.root)}`
|
||||
}
|
||||
return msg + "\nMatrix->Discord won't work until you fix this.\nIf your installation has recently changed, consider `npm run setup` again."
|
||||
}
|
||||
}
|
||||
|
||||
if (process.stdin.isTTY) {
|
||||
setImmediate(() => {
|
||||
if (!passthrough.repl) {
|
||||
const cli = repl.start({ prompt: "", eval: customEval, writer: s => s })
|
||||
const cli = repl.start({prompt: "", eval: customEval, writer: s => s})
|
||||
Object.assign(cli.context, passthrough)
|
||||
passthrough.repl = cli
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
const assert = require("assert/strict")
|
||||
const {defineEventHandler, getValidatedRouterParams, setResponseStatus, setResponseHeader, createError, H3Event, getValidatedQuery} = require("h3")
|
||||
const {z} = require("zod")
|
||||
const {ReadableStream} = require("stream/web")
|
||||
const {Readable} = require("stream")
|
||||
const sharp = require("sharp")
|
||||
|
||||
/** @type {import("xxhash-wasm").XXHashAPI} */ // @ts-ignore
|
||||
let hasher = null
|
||||
|
|
@ -19,11 +22,27 @@ const emojiSheetConverter = sync.require("../../m2d/converters/emoji-sheet")
|
|||
/** @type {import("../../m2d/actions/sticker")} */
|
||||
const sticker = sync.require("../../m2d/actions/sticker")
|
||||
|
||||
// Resizing client-side because server-side is too slow, at least with Synapse. Really need it to be fast because webhook avatars show a placeholder in the interim.
|
||||
/** @type {{[presetKey: string]: (body: ReadableStream) => ReadableStream}} */
|
||||
const MEDIA_THUMBNAIL_PRESETS = {
|
||||
avatar: body =>
|
||||
Readable.toWeb(
|
||||
Readable.fromWeb(body).pipe(
|
||||
sharp()
|
||||
.resize({height: 210, width: 210, fit: "cover"}) // the largest display of the webhook pfp on Discord Android in screen pixels
|
||||
.jpeg({force: false, quality: 90}) // File size works out to up to ~110k for a PNG, less for a JPEG
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
const schema = {
|
||||
params: z.object({
|
||||
media: z.object({
|
||||
server_name: z.string(),
|
||||
media_id: z.string()
|
||||
}),
|
||||
mediaQuery: z.object({
|
||||
preset: z.enum(Object.keys(MEDIA_THUMBNAIL_PRESETS)) // list of possible thumbnail presets
|
||||
}),
|
||||
sheet: z.object({
|
||||
e: z.array(z.string()).or(z.string())
|
||||
}),
|
||||
|
|
@ -65,7 +84,8 @@ function verifyMediaHash(serverAndMediaID) {
|
|||
}
|
||||
|
||||
as.router.get(`/download/matrix/:server_name/:media_id`, defineEventHandler(async event => {
|
||||
const params = await getValidatedRouterParams(event, schema.params.parse)
|
||||
const params = await getValidatedRouterParams(event, schema.media.parse)
|
||||
const query = await getValidatedQuery(event, schema.mediaQuery.safeParse)
|
||||
|
||||
verifyMediaHash(`${params.server_name}/${params.media_id}`)
|
||||
const api = getAPI(event)
|
||||
|
|
@ -77,7 +97,12 @@ as.router.get(`/download/matrix/:server_name/:media_id`, defineEventHandler(asyn
|
|||
setResponseStatus(event, res.status)
|
||||
setResponseHeader(event, "Content-Type", contentType)
|
||||
setResponseHeader(event, "Transfer-Encoding", "chunked")
|
||||
return res.body
|
||||
|
||||
if (res.ok && query.success) {
|
||||
return MEDIA_THUMBNAIL_PRESETS[query.data.preset](res.body)
|
||||
} else {
|
||||
return res.body
|
||||
}
|
||||
}))
|
||||
|
||||
as.router.get(`/download/sheet`, defineEventHandler(async event => {
|
||||
|
|
|
|||
117
src/web/routes/letter-avatar.js
Normal file
117
src/web/routes/letter-avatar.js
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
// @ts-check
|
||||
|
||||
const h3 = require("h3")
|
||||
const {defineEventHandler, getValidatedQuery, setResponseHeader} = h3
|
||||
const sharp = require("sharp")
|
||||
const {z} = require("zod")
|
||||
|
||||
const {as} = require("../../passthrough")
|
||||
const {reg} = require("../../matrix/read-registration")
|
||||
|
||||
/*
|
||||
Create a 300x300 avatar image consisting of a dark coloured background, and a single character in a lighter colour centered in the middle.
|
||||
Note: Where dimensions are changed, font size must also be changed too to produce an identical image as before.
|
||||
Simply put, 100px = 60pt for font.
|
||||
*/
|
||||
|
||||
const SIZE = 300
|
||||
const POSSIBLE_HUES = 12
|
||||
|
||||
/** Helper function: To get accurate complimenting colours we need to work in HSL, then convert back to RGB at the end */
|
||||
function hslToRgb(h, s, l) {
|
||||
s /= 100;
|
||||
l /= 100;
|
||||
|
||||
const a = s * Math.min(l, 1 - l);
|
||||
|
||||
const f = n => {
|
||||
const k = (n + h / 30) % 12;
|
||||
return l - a * Math.max(-1, Math.min(Math.min(k - 3, 9 - k), 1));
|
||||
};
|
||||
|
||||
return {
|
||||
r: Math.round(255 * f(0)),
|
||||
g: Math.round(255 * f(8)),
|
||||
b: Math.round(255 * f(4))
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Use the MXID to generate deterministic avatar colours for each user.
|
||||
* Here, we use the string hash code as a hue value, with a 360 wrap modulo.
|
||||
* @param {string} mxid
|
||||
*/
|
||||
function mxidToHue(mxid) {
|
||||
// Element Classic string hasher
|
||||
let hash = 0;
|
||||
let i;
|
||||
let chr;
|
||||
if (mxid.length === 0) {
|
||||
return hash;
|
||||
}
|
||||
for (i = 0; i < mxid.length; i++) {
|
||||
chr = mxid.charCodeAt(i);
|
||||
hash = ((hash << 5) - hash) + chr;
|
||||
hash |= 0;
|
||||
}
|
||||
hash = Math.abs(hash)
|
||||
return (hash % POSSIBLE_HUES) * (360 / POSSIBLE_HUES)
|
||||
}
|
||||
|
||||
/**
|
||||
* Get first useful character in username to put in the avatar.
|
||||
* @param {string} username
|
||||
*/
|
||||
function usernameToLetter(username) {
|
||||
return (username.match(/[a-z0-9]/i)?.[0] || "#").toUpperCase()
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} mxid
|
||||
* @param {string} username
|
||||
*/
|
||||
function getLetterAvatarURL(mxid, username) {
|
||||
const p = new URLSearchParams({letter: usernameToLetter(username), hue: String(mxidToHue(mxid))})
|
||||
return `${reg.ooye.bridge_origin}/download/letter-avatar?${p}`
|
||||
}
|
||||
|
||||
const schema = {
|
||||
letterAvatar: z.object({
|
||||
hue: z.coerce.number().min(0).max(360),
|
||||
letter: z.string().regex(/^[A-Z0-9#]$/)
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Produce a PNG letter-avatar from given parameters.
|
||||
* @param {string} letter
|
||||
* @param {number} hue
|
||||
*/
|
||||
as.router.get("/download/letter-avatar", defineEventHandler(async event => {
|
||||
const {letter, hue} = await getValidatedQuery(event, schema.letterAvatar.parse)
|
||||
|
||||
const bg_rgb = hslToRgb(hue, 65, 18);
|
||||
const text_rgb = hslToRgb(hue, 70, 65);
|
||||
const text_rgbahex = `#${text_rgb.r.toString(16).padStart(2, "0")}${text_rgb.g.toString(16).padStart(2, "0")}${text_rgb.b.toString(16).padStart(2, "0")}ff`
|
||||
|
||||
const streamOut = sharp({
|
||||
create: {
|
||||
width: SIZE, height: SIZE, channels: 4,
|
||||
background: {
|
||||
r: bg_rgb.r, g: bg_rgb.g, b: bg_rgb.b, alpha: 1
|
||||
}
|
||||
}
|
||||
}).composite([{
|
||||
input: {
|
||||
text: {
|
||||
text: `<span foreground="${text_rgbahex}">${letter}</span>`,
|
||||
font: "Noto Sans Bold 180", align: "center", rgba: true
|
||||
}
|
||||
}
|
||||
}]).png()
|
||||
|
||||
setResponseHeader(event, "content-type", "image/png")
|
||||
return streamOut
|
||||
}))
|
||||
|
||||
module.exports.getLetterAvatarURL = getLetterAvatarURL
|
||||
85
src/web/routes/stats.js
Normal file
85
src/web/routes/stats.js
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
// @ts-check
|
||||
|
||||
const {defineEventHandler, getValidatedQuery, H3Event, setResponseHeader} = require("h3")
|
||||
const {as, db, sync} = require("../../passthrough")
|
||||
const {reg} = require("../../matrix/read-registration")
|
||||
|
||||
/** @type {import("../../discord/utils")} */
|
||||
const dUtils = sync.require("../../discord/utils")
|
||||
|
||||
// Calculation takes time and is single-threaded. I could add database indexes, but this is simpler and doesn't need storage.
|
||||
const STATS_CACHE_TIME = 10 * 60 * 1000 // 10 minutes
|
||||
|
||||
function getMessageCountLastDuration(duration) {
|
||||
const snowflake = dUtils.timestampToSnowflakeInexact(Date.now() - duration)
|
||||
return db.prepare("select count(*) from message_room where message_id >= ? and length(message_id) = ?").pluck().get(snowflake, snowflake.length)
|
||||
}
|
||||
|
||||
function getStats() {
|
||||
const durations = [
|
||||
["week", 7 * 24 * 60 * 60 * 1000],
|
||||
["day", 1 * 24 * 60 * 60 * 1000],
|
||||
["hour", 1 * 60 * 60 * 1000]
|
||||
]
|
||||
|
||||
// console.time("get stats")
|
||||
let temp = {
|
||||
guilds: db.prepare("select count(*) from guild_space").pluck().get(),
|
||||
channels: db.prepare("select count(*) from channel_room").pluck().get(),
|
||||
messages: db.prepare("select count(*) from message_room").pluck().get(),
|
||||
...durations.reduce((a, c) => (a[`messages_last_${c[0]}`] = getMessageCountLastDuration(c[1]), a), {}),
|
||||
message_sources: db.prepare("select count(*) from event_message where part = 0 group by source order by source").pluck().all(),
|
||||
oldest_message: new Date(dUtils.snowflakeToTimestampExact(db.prepare("select min(message_id) from event_message where source = 0").pluck().get())), // good until 2090
|
||||
discord_users: db.prepare("select count(*) from sim").pluck().get(),
|
||||
matrix_users: db.prepare("select count(distinct mxid) from member_cache where mxid not like ?").pluck().get(reg.namespaces.users[0].regex.replace(/\.\*.*/, "%")),
|
||||
}
|
||||
// console.timeEnd("get stats")
|
||||
return temp
|
||||
}
|
||||
|
||||
/** @type {ReturnType<typeof getStats>} */
|
||||
let stats
|
||||
let statsUpdatedAt = 0
|
||||
|
||||
function updateStatsIfOld() {
|
||||
if (statsUpdatedAt < Date.now() - STATS_CACHE_TIME) {
|
||||
stats = getStats()
|
||||
statsUpdatedAt = Date.now()
|
||||
}
|
||||
}
|
||||
|
||||
as.router.get("/api/stats", defineEventHandler(async event => {
|
||||
updateStatsIfOld()
|
||||
return {
|
||||
...stats,
|
||||
oldest_message: stats.oldest_message.toISOString(),
|
||||
}
|
||||
}))
|
||||
|
||||
as.router.get("/metrics", defineEventHandler(async event => {
|
||||
updateStatsIfOld()
|
||||
setResponseHeader(event, "content-type", "text/plain")
|
||||
return `
|
||||
# HELP guilds Total number of guilds
|
||||
# TYPE guilds gauge
|
||||
ooye_guilds_total ${stats.guilds}
|
||||
|
||||
# HELP channels Total number of channels
|
||||
# TYPE channels gauge
|
||||
ooye_channels_total ${stats.channels}
|
||||
|
||||
# HELP messages_total Total number of messages sent from each side
|
||||
# TYPE messages_total gauge
|
||||
ooye_messages_total{type="matrix"} ${stats.message_sources[0]}
|
||||
ooye_messages_total{type="discord"} ${stats.message_sources[1]}
|
||||
|
||||
# HELP oldest_message_timestamp Unix timestamp of the oldest message
|
||||
# TYPE oldest_message_timestamp gauge
|
||||
ooye_oldest_message_timestamp_seconds ${stats.oldest_message.getTime() / 1000}
|
||||
|
||||
# HELP ooye_users_total Total number of users on each side
|
||||
# TYPE ooye_users_total gauge
|
||||
ooye_users_total{type="matrix"} ${stats.matrix_users}
|
||||
ooye_users_total{type="discord"} ${stats.discord_users}
|
||||
`.trimStart()
|
||||
}))
|
||||
|
|
@ -130,7 +130,9 @@ sync.require("./routes/download-discord")
|
|||
sync.require("./routes/guild-settings")
|
||||
sync.require("./routes/guild")
|
||||
sync.require("./routes/info")
|
||||
sync.require("./routes/letter-avatar")
|
||||
sync.require("./routes/link")
|
||||
sync.require("./routes/log-in-with-matrix")
|
||||
sync.require("./routes/oauth")
|
||||
sync.require("./routes/password")
|
||||
sync.require("./routes/stats")
|
||||
|
|
|
|||
125
test/data.js
125
test/data.js
|
|
@ -19,6 +19,26 @@ module.exports = {
|
|||
default_thread_rate_limit_per_user: 0,
|
||||
guild_id: "112760669178241024"
|
||||
},
|
||||
voice: {
|
||||
voice_background_display: null,
|
||||
version: 1774469910848,
|
||||
user_limit: 0,
|
||||
type: 2,
|
||||
theme_color: null,
|
||||
status: null,
|
||||
rtc_region: null,
|
||||
rate_limit_per_user: 0,
|
||||
position: 0,
|
||||
permission_overwrites: [],
|
||||
parent_id: "805261291908104252",
|
||||
nsfw: false,
|
||||
name: "🍞丨[8user] Piece",
|
||||
last_message_id: "1459912691098325137",
|
||||
id: "1036840786093953084",
|
||||
flags: 0,
|
||||
bitrate: 256000,
|
||||
guild_id: "112760669178241024"
|
||||
},
|
||||
updates: {
|
||||
type: 0,
|
||||
topic: "Updates and release announcements for Out Of Your Element.",
|
||||
|
|
@ -2015,6 +2035,80 @@ module.exports = {
|
|||
tts: false
|
||||
}
|
||||
},
|
||||
reply_to_member_join: {
|
||||
type: 19,
|
||||
content: "when the broke friend who we pay to bring food shows up at the medieval lord party",
|
||||
mentions: [],
|
||||
mention_roles: [],
|
||||
attachments: [],
|
||||
embeds: [],
|
||||
timestamp: "2026-03-30T12:11:04.443000+00:00",
|
||||
edited_timestamp: null,
|
||||
flags: 0,
|
||||
components: [],
|
||||
id: "1488148556962332692",
|
||||
channel_id: "475599038536744962",
|
||||
author: {
|
||||
id: "576945009408999426",
|
||||
username: "randomllama121",
|
||||
avatar: "08510a70f957106dad1580323c40cd7a",
|
||||
discriminator: "0",
|
||||
public_flags: 128,
|
||||
flags: 128,
|
||||
banner: null,
|
||||
accent_color: null,
|
||||
global_name: "random :3",
|
||||
avatar_decoration_data: null,
|
||||
collectibles: null,
|
||||
display_name_styles: null,
|
||||
banner_color: null,
|
||||
clan: null,
|
||||
primary_guild: null
|
||||
},
|
||||
pinned: false,
|
||||
mention_everyone: false,
|
||||
tts: false,
|
||||
message_reference: {
|
||||
type: 0,
|
||||
channel_id: "475599038536744962",
|
||||
message_id: "1488146734352826478",
|
||||
guild_id: "475599038536744960"
|
||||
},
|
||||
referenced_message: {
|
||||
type: 7,
|
||||
content: "",
|
||||
mentions: [],
|
||||
mention_roles: [],
|
||||
attachments: [],
|
||||
embeds: [],
|
||||
timestamp: "2026-03-30T12:03:49.899000+00:00",
|
||||
edited_timestamp: null,
|
||||
flags: 0,
|
||||
components: [],
|
||||
id: "1488146734352826478",
|
||||
channel_id: "475599038536744962",
|
||||
author: {
|
||||
id: "1461677775554478161",
|
||||
username: "peasant321_76775",
|
||||
avatar: null,
|
||||
discriminator: "0",
|
||||
public_flags: 0,
|
||||
flags: 0,
|
||||
banner: null,
|
||||
accent_color: null,
|
||||
global_name: "PEASANT!!",
|
||||
avatar_decoration_data: null,
|
||||
collectibles: null,
|
||||
display_name_styles: null,
|
||||
banner_color: null,
|
||||
clan: null,
|
||||
primary_guild: null
|
||||
},
|
||||
pinned: false,
|
||||
mention_everyone: false,
|
||||
tts: false
|
||||
}
|
||||
},
|
||||
attachment_no_content: {
|
||||
id: "1124628646670389348",
|
||||
type: 0,
|
||||
|
|
@ -6170,6 +6264,37 @@ module.exports = {
|
|||
components: [],
|
||||
position: 12
|
||||
},
|
||||
channel_follow_add: {
|
||||
type: 12,
|
||||
content: "PluralKit #downtime",
|
||||
attachments: [],
|
||||
embeds: [],
|
||||
timestamp: "2026-03-24T23:16:04.097Z",
|
||||
edited_timestamp: null,
|
||||
flags: 0,
|
||||
components: [],
|
||||
id: "1486141581047369888",
|
||||
channel_id: "1451125453082591314",
|
||||
author: {
|
||||
id: "154058479798059009",
|
||||
username: "exaptations",
|
||||
discriminator: "0",
|
||||
avatar: "57b5cfe09a48a5902f2eb8fa65bb1b80",
|
||||
bot: false,
|
||||
flags: 0,
|
||||
globalName: "Exa",
|
||||
},
|
||||
pinned: false,
|
||||
mentions: [],
|
||||
mention_roles: [],
|
||||
mention_everyone: false,
|
||||
tts: false,
|
||||
message_reference: {
|
||||
type: 0,
|
||||
channel_id: "1015204661701124206",
|
||||
guild_id: "466707357099884544"
|
||||
}
|
||||
},
|
||||
updated_to_start_thread_from_here: {
|
||||
t: "MESSAGE_UPDATE",
|
||||
s: 19,
|
||||
|
|
|
|||
|
|
@ -192,6 +192,7 @@ INSERT INTO member_cache (room_id, mxid, displayname, avatar_url, power_level) V
|
|||
('!TqlyQmifxGUggEmdBN:cadence.moe', '@ampflower:matrix.org', 'Ampflower 🌺', 'mxc://cadence.moe/PRfhXYBTOalvgQYtmCLeUXko', 0),
|
||||
('!TqlyQmifxGUggEmdBN:cadence.moe', '@aflower:syndicated.gay', 'Rose', 'mxc://syndicated.gay/ZkBUPXCiXTjdJvONpLJmcbKP', 0),
|
||||
('!TqlyQmifxGUggEmdBN:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', NULL, 0),
|
||||
('!qzDBLKlildpzrrOnFZ:cadence.moe', '@lavender.pet:queer.sh', 'lavender.pet', NULL, 0),
|
||||
('!iSyXgNxQcEuXoXpsSn:pussthecat.org', '@austin:tchncs.de', 'Austin Huang', 'mxc://tchncs.de/090a2b5e07eed2f71e84edad5207221e6c8f8b8e', 0),
|
||||
('!zq94fae5bVKUubZLp7:agiadn.org', '@underscore_x:agiadn.org', 'underscore_x', NULL, 100);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue