From 4ae03f5c13d2b58f75d7de2afb23580068b3f077 Mon Sep 17 00:00:00 2001
From: Elliu <elliu@hashi.re>
Date: Tue, 9 May 2023 22:13:59 +0200
Subject: [PATCH] Take @deurstann/matrix-appservice-discord for html encoding
fixes
---
package.json | 2 +-
src/bot.ts | 2 +-
src/discordmessageprocessor.ts | 2 +-
src/matrixmessageprocessor.ts | 2 +-
yarn.lock | 24 ++++++++++++------------
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/package.json b/package.json
index d382f29..a9b864d 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
"dependencies": {
- "@mx-puppet/matrix-discord-parser": "0.1.10",
+ "@deurstann/matrix-discord-parser": "1.10.7",
"better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f",
"better-sqlite3": "^7.1.0",
"command-line-args": "^5.1.1",
diff --git a/src/bot.ts b/src/bot.ts
index 4346ff4..8ebafa2 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 "@mx-puppet/matrix-discord-parser";
+import { IDiscordMessageParserResult } from "@deurstann/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 b7a2fb2..d09f459 100644
--- a/src/discordmessageprocessor.ts
+++ b/src/discordmessageprocessor.ts
@@ -22,7 +22,7 @@ import {
IDiscordMessageParserOpts,
IDiscordMessageParserCallbacks,
IDiscordMessageParserResult,
-} from "@mx-puppet/matrix-discord-parser";
+} from "@deurstann/matrix-discord-parser";
const log = new Log("DiscordMessageProcessor");
diff --git a/src/matrixmessageprocessor.ts b/src/matrixmessageprocessor.ts
index e8fc737..74ec6f9 100644
--- a/src/matrixmessageprocessor.ts
+++ b/src/matrixmessageprocessor.ts
@@ -24,7 +24,7 @@ import {
IMatrixMessageParserCallbacks,
IMatrixMessageParserOpts,
MatrixMessageParser,
-} from "@mx-puppet/matrix-discord-parser";
+} from "@deurstann/matrix-discord-parser";
const DEFAULT_ROOM_NOTIFY_POWER_LEVEL = 50;
diff --git a/yarn.lock b/yarn.lock
index 25a1f0a..ea30c1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -215,6 +215,18 @@
enabled "2.0.x"
kuler "^2.0.0"
+"@deurstann/matrix-discord-parser@1.10.7":
+ version "1.10.7"
+ resolved "https://registry.yarnpkg.com/@deurstann/matrix-discord-parser/-/matrix-discord-parser-1.10.7.tgz#570d0563c3f916faed877cdf6c06be0f3cf607ee"
+ integrity sha512-Ud/KKGkCdsDMoBW2UZNwiR5UNvkmJJJODAmsSQL/vXh9Iz7zfLqnI/cbP4nUrv1Txd5XqGi/pGSNnZ5Kd6AreQ==
+ 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"
+
"@discordjs/collection@^0.1.6":
version "0.1.6"
resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.1.6.tgz#9e9a7637f4e4e0688fd8b2b5c63133c91607682c"
@@ -337,18 +349,6 @@
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"
--
GitLab