From a5b51295425c6da9cd19c5489752dbcb7648bda0 Mon Sep 17 00:00:00 2001
From: MathMan05 <mathmanrm@gmail.com>
Date: Wed, 19 Nov 2025 11:42:08 -0600
Subject: [PATCH] fixes

---
 src/api/util/handlers/Message.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 47623298..6ba66985 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -49,6 +49,7 @@ import fetch from "node-fetch-commonjs";
 import { CloudAttachment } from "../../../util/entities/CloudAttachment";
 import { ReadState } from "../../../util/entities/ReadState";
 import { Member } from "../../../util/entities/Member";
+import { Session } from "../../../util/entities/Session";
 import { ChannelType } from "@spacebar/schemas";
 import { Embed, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas";
 import { EmbedType } from "../../../schemas/api/messages/Embeds";
@@ -340,7 +341,7 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
 			}),
 		);
 	}
-	if (!!message.content?.match(EVERYONE_MENTION) || channel.type === ChannelType.DM || channel.type === ChannelType.GROUP_DM) {
+	if ((!!message.content?.match(EVERYONE_MENTION) && permission?.has("MENTION_EVERYONE")) || channel.type === ChannelType.DM || channel.type === ChannelType.GROUP_DM) {
 		if (channel.type === ChannelType.DM || channel.type === ChannelType.GROUP_DM) {
 			if (channel.recipients) {
 				await fillInMissingIDs(channel.recipients.map(({ user_id }) => user_id));
@@ -367,6 +368,10 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
 			).map((member) => member.id),
 			...message.mentions.map((user) => user.id),
 		]);
+		if (!!message.content?.match(HERE_MENTION) && permission?.has("MENTION_EVERYONE")) {
+			const ids = (await Member.find({ where: { guild_id: channel.guild_id } })).map(({ id }) => id);
+			(await Session.find({ where: { user_id: Or(...ids.map((id) => Equal(id))) } })).forEach(({ user_id }) => users.add(user_id));
+		}
 		if (users.size) {
 			const repository = ReadState.getRepository();
 			const condition = { user_id: Or(...[...users].map((id) => Equal(id))), channel_id: channel.id };