RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1395 from MathMan05/readStateFix

Browse Source
This commit is contained in:
Cyber 2025-11-19 18:47:38 +01:00 committed by GitHub
commit 7cea7facf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/api/util/handlers/Message.ts
View File

@ -49,6 +49,7 @@ import fetch from "node-fetch-commonjs";
import { CloudAttachment } from "../../../util/entities/CloudAttachment"; import { CloudAttachment } from "../../../util/entities/CloudAttachment";
import { ReadState } from "../../../util/entities/ReadState"; import { ReadState } from "../../../util/entities/ReadState";
import { Member } from "../../../util/entities/Member"; import { Member } from "../../../util/entities/Member";
import { Session } from "../../../util/entities/Session";
import { ChannelType } from "@spacebar/schemas"; import { ChannelType } from "@spacebar/schemas";
import { Embed, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas"; import { Embed, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas";
import { EmbedType } from "../../../schemas/api/messages/Embeds"; import { EmbedType } from "../../../schemas/api/messages/Embeds";
@ -324,12 +325,35 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
]; ];
message.mention_everyone = mention_everyone; message.mention_everyone = mention_everyone;
async function fillInMissingIDs(ids: string[]) {
if (mention_everyone || channel.type === ChannelType.DM || channel.type === ChannelType.GROUP_DM) { const states = await ReadState.findBy({
user_id: Or(...ids.map((id) => Equal(id))),
channel_id: channel.id,
});
const users = new Set(ids);
states.forEach((state) => users.delete(state.user_id));
if (!users.size) {
return;
}
return Promise.all(
[...users].map((user_id) => {
return ReadState.create({ user_id, channel_id: channel.id }).save();
}),
);
}
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));
}
} else {
console.log(channel.guild_id);
await fillInMissingIDs((await Member.find({ where: { guild_id: channel.guild_id } })).map(({ id }) => id));
}
const repository = ReadState.getRepository(); const repository = ReadState.getRepository();
const condition = { channel_id: channel.id }; const condition = { channel_id: channel.id };
repository.update({ ...condition, mention_count: IsNull() }, { mention_count: 0 }); await repository.update({ ...condition, mention_count: IsNull() }, { mention_count: 0 });
repository.increment(condition, "mention_count", 1); await repository.increment(condition, "mention_count", 1);
} else { } else {
const users = new Set<string>([ const users = new Set<string>([
...(message.mention_roles.length ...(message.mention_roles.length
@ -344,11 +368,19 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
).map((member) => member.id), ).map((member) => member.id),
...message.mentions.map((user) => user.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 };
const repository = ReadState.getRepository(); await fillInMissingIDs([...users]);
const condition = { user_id: Or(...[...users].map((id) => Equal(id))), channel_id: channel.id };
repository.update({ ...condition, mention_count: IsNull() }, { mention_count: 0 }); await repository.update({ ...condition, mention_count: IsNull() }, { mention_count: 0 });
repository.increment(condition, "mention_count", 1); await repository.increment(condition, "mention_count", 1);
}
} }
// TODO: check and put it all in the body // TODO: check and put it all in the body