From e275d2c77d7798f3dc3043f2afeaa3f9b07183c0 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Wed, 12 Jan 2022 01:27:55 +1100 Subject: Message fixes | Character limits and embed fixes (#581) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds message character limits (#503) * Fixed message `embeds` being ignored for `embed` * Update Message.ts Co-authored-by: Erkin Alp Güney --- api/src/util/handlers/Message.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'api/src/util/handlers/Message.ts') diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index ba676394..29414177 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -17,13 +17,14 @@ import { User, Application, Webhook, - Attachment + Attachment, + Config, } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import fetch from "node-fetch"; import cheerio from "cheerio"; import { MessageCreateSchema } from "../../routes/channels/#channel_id/messages"; - +const allow_empty = false; // TODO: check webhook, application, system author, stickers // TODO: embed gifs/videos/images @@ -55,6 +56,10 @@ export async function handleMessage(opts: MessageOptions): Promise { type: opts.type ?? 0 }); + if (message.content && message.content.length > Config.get().limits.message.maxCharacters) { + throw new HTTPError("Content length over max character limit") + } + // TODO: are tts messages allowed in dm channels? should permission be checked? if (opts.author_id) { message.author = await User.getPublicUser(opts.author_id); @@ -67,7 +72,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } const permission = await getPermission(opts.author_id, channel.guild_id, opts.channel_id); - permission.hasThrow("SEND_MESSAGES"); + permission.hasThrow("SEND_MESSAGES"); // TODO: add the rights check if (permission.cache.member) { message.member = permission.cache.member; } @@ -75,6 +80,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.tts) permission.hasThrow("SEND_TTS_MESSAGES"); if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); + // code below has to be redone when we add custom message routing and cross-channel replies if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); // TODO: should be checked if the referenced message exists? @@ -83,7 +89,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } // TODO: stickers/activity - if (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length) { + if (!allow_empty || (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { throw new HTTPError("Empty messages are not allowed", 50006); } @@ -93,7 +99,7 @@ export async function handleMessage(opts: MessageOptions): Promise { var mention_user_ids = [] as string[]; var mention_everyone = false; - if (content) { + if (content) { // TODO: explicit-only mentions message.content = content.trim(); for (const [_, mention] of content.matchAll(CHANNEL_MENTION)) { if (!mention_channel_ids.includes(mention)) mention_channel_ids.push(mention); @@ -135,7 +141,7 @@ export async function postHandleMessage(message: Message) { const data = { ...message }; data.embeds = data.embeds.filter((x) => x.type !== "link"); - links = links.slice(0, 5); // embed max 5 links + links = links.slice(0, 20); // embed max 20 links — TODO: make this configurable with instance policies for (const link of links) { try { @@ -188,7 +194,7 @@ export async function sendMessage(opts: MessageOptions) { emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data: message.toJSON() } as MessageCreateEvent) ]); - postHandleMessage(message).catch((e) => {}); // no await as it shouldnt block the message send function and silently catch error + postHandleMessage(message).catch((e) => {}); // no await as it should catch error non-blockingly return message; } -- cgit 1.5.1 From 1887703c56b56ec7d9f2c66f5b740cb30db08122 Mon Sep 17 00:00:00 2001 From: ced777ric Date: Tue, 11 Jan 2022 18:38:10 +0100 Subject: fix the message endpoint always returning Empty message error (cherry picked from commit 8b8344e860920f3c3b911dfde1a7a078fef43c9b) --- api/src/util/handlers/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/src/util/handlers/Message.ts') diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index 29414177..a3055aed 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -89,7 +89,7 @@ export async function handleMessage(opts: MessageOptions): Promise { } // TODO: stickers/activity - if (!allow_empty || (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { + if (!allow_empty && (!opts.content && !opts.embeds?.length && !opts.attachments?.length && !opts.sticker_ids?.length)) { throw new HTTPError("Empty messages are not allowed", 50006); } -- cgit 1.5.1 From 4baa6e0620760b93e68e780b8746cf2a257800df Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Wed, 12 Jan 2022 09:58:22 +0300 Subject: Add cross channel replies Resolves #533 --- api/src/util/handlers/Message.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'api/src/util/handlers/Message.ts') diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index a3055aed..dae6f7e8 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -81,8 +81,10 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies - if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); - if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); + if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { + if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); + if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); + } // TODO: should be checked if the referenced message exists? // @ts-ignore message.type = MessageType.REPLY; -- cgit 1.5.1 From 072a60fb03fbf5f261c0e9888ce49847e1a350d4 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Wed, 12 Jan 2022 16:04:34 +0300 Subject: Fix the feature check --- api/src/util/handlers/Message.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'api/src/util/handlers/Message.ts') diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index dae6f7e8..92bb2335 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -2,6 +2,7 @@ import { Channel, Embed, emitEvent, + Guild, Message, MessageCreateEvent, MessageUpdateEvent, @@ -81,6 +82,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies + const guild = await Guild.findOneOrFail({ id: guild_id }); if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); -- cgit 1.5.1 From 41fca13db2e88e4e2c53544658ee99cf1800f664 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Thu, 13 Jan 2022 18:45:23 +1100 Subject: Fix typo in commit 277b28c --- api/src/util/handlers/Message.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/src/util/handlers/Message.ts') diff --git a/api/src/util/handlers/Message.ts b/api/src/util/handlers/Message.ts index 92bb2335..21664368 100644 --- a/api/src/util/handlers/Message.ts +++ b/api/src/util/handlers/Message.ts @@ -82,7 +82,7 @@ export async function handleMessage(opts: MessageOptions): Promise { if (opts.message_reference) { permission.hasThrow("READ_MESSAGE_HISTORY"); // code below has to be redone when we add custom message routing and cross-channel replies - const guild = await Guild.findOneOrFail({ id: guild_id }); + const guild = await Guild.findOneOrFail({ id: channel.guild_id }); if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) { if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild"); if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel"); -- cgit 1.5.1