From 16f13616d29a2ebac5ee58346506cbd405b8ca99 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Mon, 20 Feb 2023 05:09:57 +0100 Subject: Remove channel mentions from messages, in order to fix them in test client. Signed-off-by: TheArcaneBrony --- src/api/util/handlers/Message.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 42325681..e514d400 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -26,7 +26,7 @@ import { MessageUpdateEvent, getPermission, getRights, - CHANNEL_MENTION, + //CHANNEL_MENTION, USER_MENTION, ROLE_MENTION, Role, @@ -144,7 +144,9 @@ export async function handleMessage(opts: MessageOptions): Promise { } let content = opts.content; - const mention_channel_ids = [] as string[]; + + // root@Rory - 20/02/2023 - This breaks channel mentions in test client. We're not sure this was used in older clients. + //const mention_channel_ids = [] as string[]; const mention_role_ids = [] as string[]; const mention_user_ids = [] as string[]; let mention_everyone = false; @@ -153,10 +155,11 @@ export async function handleMessage(opts: MessageOptions): Promise { // TODO: explicit-only mentions message.content = content.trim(); content = content.replace(/ *`[^)]*` */g, ""); // remove codeblocks - for (const [, mention] of content.matchAll(CHANNEL_MENTION)) { + // root@Rory - 20/02/2023 - This breaks channel mentions in test client. We're not sure this was used in older clients. + /*for (const [, mention] of content.matchAll(CHANNEL_MENTION)) { if (!mention_channel_ids.includes(mention)) mention_channel_ids.push(mention); - } + }*/ for (const [, mention] of content.matchAll(USER_MENTION)) { if (!mention_user_ids.includes(mention)) @@ -183,9 +186,10 @@ export async function handleMessage(opts: MessageOptions): Promise { } } - message.mention_channels = mention_channel_ids.map((x) => + // root@Rory - 20/02/2023 - This breaks channel mentions in test client. We're not sure this was used in older clients. + /*message.mention_channels = mention_channel_ids.map((x) => Channel.create({ id: x }), - ); + );*/ message.mention_roles = mention_role_ids.map((x) => Role.create({ id: x })); message.mentions = mention_user_ids.map((x) => User.create({ id: x })); message.mention_everyone = mention_everyone; -- cgit 1.4.1