From de0066d6892aa1aad27c08a71f52e3bab8cc1acf Mon Sep 17 00:00:00 2001
From: James Lu <james@overdrivenetworks.com>
Date: Thu, 11 Aug 2022 13:07:33 -0700
Subject: [PATCH] Update to @mx-puppet/matrix-discord-parser 0.1.10 (#829)
* Update to @mx-puppet/matrix-discord-parser 0.1.10
This pulls in https://gitlab.com/mx-puppet/discord/matrix-discord-parser/-/merge_requests/21, which removes matrix.to links for non-Discord user mentions
Fixes #652
Fixes #772
Signed-off-by: James Lu <james@overdrivenetworks.com>
* Update tests for new matrix-discord-parser version
Signed-off-by: James Lu <james@overdrivenetworks.com>
* Add changelog entry
Signed-off-by: James Lu <james@overdrivenetworks.com>
Signed-off-by: James Lu <james@overdrivenetworks.com>
---
.npmrc | 1 +
changelog.d/829.bugfix | 2 +
package.json | 2 +-
src/bot.ts | 2 +-
src/discordmessageprocessor.ts | 2 +-
src/matrixmessageprocessor.ts | 2 +-
test/test_discordmessageprocessor.ts | 6 +-
test/test_matrixmessageprocessor.ts | 4 +-
yarn.lock | 169 ++++++++++++++-------------
9 files changed, 97 insertions(+), 93 deletions(-)
create mode 100644 changelog.d/829.bugfix
diff --git a/.npmrc b/.npmrc
index c42da84..215c407 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
engine-strict = true
+@mx-puppet:registry="https://gitlab.com/api/v4/packages/npm/"
diff --git a/changelog.d/829.bugfix b/changelog.d/829.bugfix
new file mode 100644
index 0000000..7fd6155
--- /dev/null
+++ b/changelog.d/829.bugfix
@@ -0,0 +1,2 @@
+Remove matrix.to hyperlinks when relaying non-Discord user mentions to Discord.
+Fix mentioning Matrix users in Discord.
diff --git a/package.json b/package.json
index c0722c3..d285b0a 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
},
"homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
"dependencies": {
+ "@mx-puppet/matrix-discord-parser": "0.1.10",
"better-discord.js": "git+https://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117",
"better-sqlite3": "^7.1.0",
"command-line-args": "^5.1.1",
@@ -49,7 +50,6 @@
"js-yaml": "^3.14.0",
"marked": "^1.2.2",
"matrix-appservice-bridge": "^5.0.0",
- "matrix-discord-parser": "0.1.5",
"mime": "^2.4.6",
"node-html-parser": "^1.2.19",
"p-queue": "^6.4.0",
diff --git a/src/bot.ts b/src/bot.ts
index 2e34e56..64ed030 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -20,7 +20,7 @@ import { DiscordStore } from "./store";
import { DbEmoji } from "./db/dbdataemoji";
import { DbEvent } from "./db/dbdataevent";
import { DiscordMessageProcessor } from "./discordmessageprocessor";
-import { IDiscordMessageParserResult } from "matrix-discord-parser";
+import { IDiscordMessageParserResult } from "@mx-puppet/matrix-discord-parser";
import { MatrixEventProcessor, MatrixEventProcessorOpts, IMatrixEventProcessorResult } from "./matrixeventprocessor";
import { PresenceHandler } from "./presencehandler";
import { Provisioner } from "./provisioner";
diff --git a/src/discordmessageprocessor.ts b/src/discordmessageprocessor.ts
index 6dee16d..b7a2fb2 100644
--- a/src/discordmessageprocessor.ts
+++ b/src/discordmessageprocessor.ts
@@ -22,7 +22,7 @@ import {
IDiscordMessageParserOpts,
IDiscordMessageParserCallbacks,
IDiscordMessageParserResult,
-} from "matrix-discord-parser";
+} from "@mx-puppet/matrix-discord-parser";
const log = new Log("DiscordMessageProcessor");
diff --git a/src/matrixmessageprocessor.ts b/src/matrixmessageprocessor.ts
index c33a19e..a257e3e 100644
--- a/src/matrixmessageprocessor.ts
+++ b/src/matrixmessageprocessor.ts
@@ -25,7 +25,7 @@ import {
IMatrixMessageParserCallbacks,
IMatrixMessageParserOpts,
MatrixMessageParser,
-} from "matrix-discord-parser";
+} from "@mx-puppet/matrix-discord-parser";
const DEFAULT_ROOM_NOTIFY_POWER_LEVEL = 50;
diff --git a/test/test_discordmessageprocessor.ts b/test/test_discordmessageprocessor.ts
index 2ff272d..283f351 100644
--- a/test/test_discordmessageprocessor.ts
+++ b/test/test_discordmessageprocessor.ts
@@ -134,7 +134,7 @@ describe("DiscordMessageProcessor", () => {
msg.embeds = [];
msg.content = "<@12345>";
const result = await processor.FormatMessage(msg);
- expect(result.body).to.equal("@_discord_12345:localhost");
+ expect(result.body).to.equal("@_discord_12345:localhost (@_discord_12345:localhost)");
expect(result.formattedBody).to.equal("<a href=\"https://matrix.to/#/@_discord_12345:l" +
"ocalhost\">@_discord_12345:localhost</a>");
});
@@ -148,7 +148,7 @@ describe("DiscordMessageProcessor", () => {
msg.embeds = [];
msg.content = "<@12345>";
const result = await processor.FormatMessage(msg);
- expect(result.body).to.equal("TestUsername");
+ expect(result.body).to.equal("TestUsername (@_discord_12345:localhost)");
expect(result.formattedBody).to.equal("<a href=\"https://matrix.to/#/@_discord_123" +
"45:localhost\">TestUsername</a>");
});
@@ -162,7 +162,7 @@ describe("DiscordMessageProcessor", () => {
msg.embeds = [];
msg.content = "<@12345>";
const result = await processor.FormatMessage(msg);
- expect(result.body).to.equal("TestNickname");
+ expect(result.body).to.equal("TestNickname (@_discord_12345:localhost)");
expect(result.formattedBody).to.equal("<a href=\"https://matrix.to/#/@_disc" +
"ord_12345:localhost\">TestNickname</a>");
});
diff --git a/test/test_matrixmessageprocessor.ts b/test/test_matrixmessageprocessor.ts
index bcbf78c..eb38026 100644
--- a/test/test_matrixmessageprocessor.ts
+++ b/test/test_matrixmessageprocessor.ts
@@ -165,14 +165,14 @@ describe("MatrixMessageProcessor", () => {
const result = await mp.FormatMessage(msg, guild as any);
expect(result).is.equal("<@12345>");
});
- it("Ignores invalid user pills", async () => {
+ it("Ignores invalid user pills, while removing matrix.to links", async () => {
const mp = new MatrixMessageProcessor(bot, config);
const guild = new MockGuild("1234");
const member = new MockMember("12345", "TestUsername", guild);
guild.members.cache.set("12345", member);
const msg = getHtmlMessage("<a href=\"https://matrix.to/#/@_discord_789:localhost\">TestUsername</a>");
const result = await mp.FormatMessage(msg, guild as any);
- expect(result).is.equal("[TestUsername](https://matrix.to/#/@_discord_789:localhost)");
+ expect(result).is.equal("TestUsername");
});
it("Parses channel pills", async () => {
const mp = new MatrixMessageProcessor(bot, config);
diff --git a/yarn.lock b/yarn.lock
index b632353..c5df317 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -328,6 +328,27 @@
dependencies:
node-downloader-helper "^2.1.1"
+"@mx-puppet/discord-markdown@2.3.1":
+ version "2.3.1"
+ resolved "https://gitlab.com/api/v4/projects/35809145/packages/npm/@mx-puppet/discord-markdown/-/@mx-puppet/discord-markdown-2.3.1.tgz#52b0e8bb808a1202602899af67939b049dd42402"
+ integrity sha1-UrDou4CKEgJgKJmvZ5ObBJ3UJAI=
+ dependencies:
+ highlight.js "^10.4.1"
+ node-emoji "^1.10.0"
+ simple-markdown "^0.7.2"
+
+"@mx-puppet/matrix-discord-parser@0.1.10":
+ version "0.1.10"
+ resolved "https://gitlab.com/api/v4/projects/35066311/packages/npm/@mx-puppet/matrix-discord-parser/-/@mx-puppet/matrix-discord-parser-0.1.10.tgz#0a37a3f9430ff7c29512d29882e25ae738a31283"
+ integrity sha1-Cjej+UMP98KVEtKYguJa5zijEoM=
+ dependencies:
+ "@mx-puppet/discord-markdown" "2.3.1"
+ escape-html "^1.0.3"
+ got "^11.6.0"
+ highlight.js "^10.4.1"
+ node-html-parser "^1.4.5"
+ unescape-html "^1.1.0"
+
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -483,9 +504,9 @@
integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
"@types/node@*":
- version "18.6.4"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.6.4.tgz#fd26723a8a3f8f46729812a7f9b4fc2d1608ed39"
- integrity sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==
+ version "18.7.1"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.1.tgz#352bee64f93117d867d05f7406642a52685cbca6"
+ integrity sha512-GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ==
"@types/node@^14":
version "14.18.23"
@@ -508,9 +529,9 @@
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
"@types/react@>=16.0.0":
- version "18.0.16"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.16.tgz#8de9bf7feebfa520777e8d30815070b39cb663c0"
- integrity sha512-3vX1dzVucqc2nhXtzyaParTIIRZeNbisRqLE7QdeLomVybEyeiuAouzZXgz71P+2kbJOqj3dy0fzoATg2I06GQ==
+ version "18.0.17"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.17.tgz#4583d9c322d67efe4b39a935d223edcc7050ccf4"
+ integrity sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
@@ -537,13 +558,13 @@
"@types/node" "*"
"@typescript-eslint/eslint-plugin@^5.4.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz#e27e38cffa4a61226327c874a7be965e9a861624"
- integrity sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz#059798888720ec52ffa96c5f868e31a8f70fa3ec"
+ integrity sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==
dependencies:
- "@typescript-eslint/scope-manager" "5.32.0"
- "@typescript-eslint/type-utils" "5.32.0"
- "@typescript-eslint/utils" "5.32.0"
+ "@typescript-eslint/scope-manager" "5.33.0"
+ "@typescript-eslint/type-utils" "5.33.0"
+ "@typescript-eslint/utils" "5.33.0"
debug "^4.3.4"
functional-red-black-tree "^1.0.1"
ignore "^5.2.0"
@@ -552,68 +573,68 @@
tsutils "^3.21.0"
"@typescript-eslint/parser@^5.4.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.32.0.tgz#1de243443bc6186fb153b9e395b842e46877ca5d"
- integrity sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.33.0.tgz#26ec3235b74f0667414613727cb98f9b69dc5383"
+ integrity sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==
dependencies:
- "@typescript-eslint/scope-manager" "5.32.0"
- "@typescript-eslint/types" "5.32.0"
- "@typescript-eslint/typescript-estree" "5.32.0"
+ "@typescript-eslint/scope-manager" "5.33.0"
+ "@typescript-eslint/types" "5.33.0"
+ "@typescript-eslint/typescript-estree" "5.33.0"
debug "^4.3.4"
-"@typescript-eslint/scope-manager@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz#763386e963a8def470580cc36cf9228864190b95"
- integrity sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==
+"@typescript-eslint/scope-manager@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz#509d7fa540a2c58f66bdcfcf278a3fa79002e18d"
+ integrity sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==
dependencies:
- "@typescript-eslint/types" "5.32.0"
- "@typescript-eslint/visitor-keys" "5.32.0"
+ "@typescript-eslint/types" "5.33.0"
+ "@typescript-eslint/visitor-keys" "5.33.0"
-"@typescript-eslint/type-utils@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz#45a14506fe3fb908600b4cef2f70778f7b5cdc79"
- integrity sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==
+"@typescript-eslint/type-utils@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz#92ad1fba973c078d23767ce2d8d5a601baaa9338"
+ integrity sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==
dependencies:
- "@typescript-eslint/utils" "5.32.0"
+ "@typescript-eslint/utils" "5.33.0"
debug "^4.3.4"
tsutils "^3.21.0"
-"@typescript-eslint/types@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.32.0.tgz#484273021eeeae87ddb288f39586ef5efeb6dcd8"
- integrity sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==
+"@typescript-eslint/types@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.33.0.tgz#d41c584831805554b063791338b0220b613a275b"
+ integrity sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==
-"@typescript-eslint/typescript-estree@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz#282943f34babf07a4afa7b0ff347a8e7b6030d12"
- integrity sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==
+"@typescript-eslint/typescript-estree@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz#02d9c9ade6f4897c09e3508c27de53ad6bfa54cf"
+ integrity sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==
dependencies:
- "@typescript-eslint/types" "5.32.0"
- "@typescript-eslint/visitor-keys" "5.32.0"
+ "@typescript-eslint/types" "5.33.0"
+ "@typescript-eslint/visitor-keys" "5.33.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/utils@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.32.0.tgz#eccb6b672b94516f1afc6508d05173c45924840c"
- integrity sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==
+"@typescript-eslint/utils@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.33.0.tgz#46797461ce3146e21c095d79518cc0f8ec574038"
+ integrity sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==
dependencies:
"@types/json-schema" "^7.0.9"
- "@typescript-eslint/scope-manager" "5.32.0"
- "@typescript-eslint/types" "5.32.0"
- "@typescript-eslint/typescript-estree" "5.32.0"
+ "@typescript-eslint/scope-manager" "5.33.0"
+ "@typescript-eslint/types" "5.33.0"
+ "@typescript-eslint/typescript-estree" "5.33.0"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
-"@typescript-eslint/visitor-keys@5.32.0":
- version "5.32.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz#b9715d0b11fdb5dd10fd0c42ff13987470525394"
- integrity sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==
+"@typescript-eslint/visitor-keys@5.33.0":
+ version "5.33.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz#fbcbb074e460c11046e067bc3384b5d66b555484"
+ integrity sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==
dependencies:
- "@typescript-eslint/types" "5.32.0"
+ "@typescript-eslint/types" "5.33.0"
eslint-visitor-keys "^3.3.0"
"@ungap/promise-all-settled@1.1.2":
@@ -1047,9 +1068,9 @@ camelcase@^6.0.0:
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
caniuse-lite@^1.0.30001370:
- version "1.0.30001374"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz#3dab138e3f5485ba2e74bd13eca7fe1037ce6f57"
- integrity sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==
+ version "1.0.30001375"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz#8e73bc3d1a4c800beb39f3163bf0190d7e5d7672"
+ integrity sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==
caseless@~0.12.0:
version "0.12.0"
@@ -1408,14 +1429,6 @@ discontinuous-range@1.0.0:
resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==
-"discord-markdown@git://github.com/Sorunome/discord-markdown.git#7958a03a952ed02cbd588b09eb04bc070b3a11f2":
- version "2.3.1"
- resolved "git://github.com/Sorunome/discord-markdown.git#7958a03a952ed02cbd588b09eb04bc070b3a11f2"
- dependencies:
- highlight.js "^9.18.1"
- node-emoji "^1.10.0"
- simple-markdown "^0.7.2"
-
doctrine@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -1467,9 +1480,9 @@ ee-first@1.1.1:
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
electron-to-chromium@^1.4.202:
- version "1.4.211"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz#afaa8b58313807501312d598d99b953568d60f91"
- integrity sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==
+ version "1.4.215"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.215.tgz#553372e74bde3164290d61f6792f93e443b16733"
+ integrity sha512-vqZxT8C5mlDZ//hQFhneHmOLnj1LhbzxV0+I1yqHV8SB1Oo4Y5Ne9+qQhwHl7O1s9s9cRuo2l5CoLEHdhMTwZg==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -2154,10 +2167,10 @@ he@1.2.0, he@^1.2.0:
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-highlight.js@^9.18.1:
- version "9.18.5"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
- integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
+highlight.js@^10.4.1:
+ version "10.7.3"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
+ integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
html-escaper@^2.0.0:
version "2.0.2"
@@ -2734,9 +2747,9 @@ matrix-appservice-bridge@^5.0.0:
winston-daily-rotate-file "^4.5.1"
matrix-appservice@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/matrix-appservice/-/matrix-appservice-1.0.0.tgz#8a1225b248131eb8d37618bd88f76d705c647c28"
- integrity sha512-SoWTp92xKsKiC6T8147gTxChyp0aNisxLWtX15vGMIeIdV3ZsUzoQsLVhABzuVzW1ExZ5FAoD1HpYz1Du9lk6A==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/matrix-appservice/-/matrix-appservice-1.1.0.tgz#e567945042000485e4ea4bfeef92246e93296f01"
+ integrity sha512-6hJdmo9YIbh6dS9MfMHCpHMhklN/+NOcfGQ/3UbbEEfIE8dt0bHqi1nnIiias5IqDFl6ED9y+YQdtyqnIXx+Ww==
dependencies:
"@types/express" "^4.17.8"
body-parser "^1.19.0"
@@ -2767,18 +2780,6 @@ matrix-bot-sdk@^0.6.1:
request-promise "^4.2.6"
sanitize-html "^2.7.0"
-matrix-discord-parser@0.1.5:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/matrix-discord-parser/-/matrix-discord-parser-0.1.5.tgz#dd6a481a569567e8e30d70599d4dcb173261504c"
- integrity sha512-SilBNcNeJCrL6XEHVfbOhupNJICFdyFWfwv85Wtyh1Xxc0XPv4zK/gpEPogVeuKJD3TE0KT4iHq0nLgUJ8GBiQ==
- dependencies:
- discord-markdown "git://github.com/Sorunome/discord-markdown.git#7958a03a952ed02cbd588b09eb04bc070b3a11f2"
- escape-html "^1.0.3"
- got "^11.6.0"
- highlight.js "^9.18.1"
- node-html-parser "^1.4.5"
- unescape-html "^1.1.0"
-
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
--
GitLab