From 06e33083556ae750f25bd07abff0670e0efacda7 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 15:27:19 +0100 Subject: Mention inbox, hopefully --- src/api/routes/users/@me/mentions.ts | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 src/api/routes/users/@me/mentions.ts (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts new file mode 100644 index 00000000..c4491ad0 --- /dev/null +++ b/src/api/routes/users/@me/mentions.ts @@ -0,0 +1,161 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2025 Spacebar and Spacebar Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import { route } from "@spacebar/api"; +import { Snowflake, User, Message, Member, Channel, Permissions, timePromise } from "@spacebar/util"; +import { Request, Response, Router } from "express"; +import { In } from "typeorm"; + +const router: Router = Router({ mergeParams: true }); + +router.get( + "", + route({ + responses: { + 200: { + body: "MessageListResponse", + }, + 404: { + body: "APIErrorResponse", + }, + }, + }), + // AFAICT this endpoint doesn't list DMs + async (req: Request, res: Response) => { + const limit = req.query.limit && !isNaN(Number(req.query.limit)) ? Number(req.query.limit) : 50; + const everyone = !!req.query.everyone; + const roles = !!req.query.roles; + + const user = await User.findOneOrFail({ + where: { id: req.user_id }, + }); + + const memberships = await Member.find({ + where: { id: req.user_id }, + select: { + guild_id: true, + id: true, + communication_disabled_until: true, + roles: { + // We don't want to include all guild roles, as this could cause a lot more explosive behavior + id: true, + position: true, + permissions: true, + mentionable: true, // cause we can skip querying for unmentionable roles + }, + guild: { + id: true, + owner_id: true, + }, + }, + relations: ["guild", "roles"], + }); + + const channels = await Channel.find({ + where: { + guild_id: In(memberships.map((m) => m.guild_id)), + }, + select: { id: true, permission_overwrites: true }, + }); + + const visibleChannels = channels.filter((c) => { + const member = memberships.find((m) => m.guild_id === c.guild_id)!; + return Permissions.finalPermission({ + user: { id: member.id, roles: member.roles.map((r) => r.id), communication_disabled_until: member.communication_disabled_until, flags: 0 }, + guild: { id: member.guild.id, owner_id: member.guild.owner_id!, roles: member.guild.roles }, + channel: c, + }).has("VIEW_CHANNEL"); + }); + const visibleChannelIds = visibleChannels.map((c) => c.id); + const ownedMentionableRoleIds = memberships.reduce((acc, m) => { + acc.push(...m.roles.filter((r) => r.mentionable).map((r) => r.id)); + return acc; + }, [] as Snowflake[]); + + const [ + { result: userMentions, elapsed: userMentionQueryTime }, + { result: roleMentions, elapsed: roleMentionQueryTime }, + { result: everyoneMentions, elapsed: everyoneMentionQueryTime }, + ] = await Promise.all([ + await timePromise(() => + Message.find({ + where: { + channel_id: In(visibleChannelIds), + mentions: { id: user.id }, + }, + select: { + id: true, + timestamp: true, + }, + order: { + timestamp: "DESC", + }, + take: limit ? Number(limit) : 50, + }), + ), + await timePromise(() => + !roles + ? Promise.resolve([]) + : Message.find({ + where: { + channel_id: In(visibleChannelIds), + mention_roles: { id: In(ownedMentionableRoleIds) }, + }, + select: { + id: true, + timestamp: true, + }, + order: { + timestamp: "DESC", + }, + take: limit ? Number(limit) : 50, + }), + ), + await timePromise(() => + !everyone + ? Promise.resolve([]) + : Message.find({ + where: { + channel_id: In(visibleChannelIds), + mention_everyone: true, + }, + select: { + id: true, + timestamp: true, + }, + order: { + timestamp: "DESC", + }, + take: limit ? Number(limit) : 50, + }), + ), + ]); + + const allMentions = [...userMentions, ...roleMentions, ...everyoneMentions]; + console.log(`[Inbox/mentions] User ${user.id} query results: totalRecs=${allMentions.length} | user=${userMentions.length} (took ${userMentionQueryTime}ms), role=${roleMentions.length} (took ${roleMentionQueryTime}ms), everyone=${everyoneMentions.length} (took ${everyoneMentionQueryTime}ms)`); + + return res.json( + allMentions + .sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()) + .distinctBy((m) => m.id) + .slice(0, limit), + ); + }, +); + +export default router; -- cgit 1.5.1 From 3477f624599332f8e3194acce515b580e9f1ab75 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 16:16:01 +0100 Subject: Mentions inbox: include channel guild id --- src/api/routes/users/@me/mentions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index c4491ad0..5b799956 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -70,7 +70,7 @@ router.get( where: { guild_id: In(memberships.map((m) => m.guild_id)), }, - select: { id: true, permission_overwrites: true }, + select: { id: true, guild_id: true, permission_overwrites: true }, }); const visibleChannels = channels.filter((c) => { -- cgit 1.5.1 From cfb88d7fe971ffc9d1ae2f587f0993ccab5a6814 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 16:18:41 +0100 Subject: Mentions inbox: use the right roles prop... --- src/api/routes/users/@me/mentions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index 5b799956..6ac64ef2 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -77,10 +77,11 @@ router.get( const member = memberships.find((m) => m.guild_id === c.guild_id)!; return Permissions.finalPermission({ user: { id: member.id, roles: member.roles.map((r) => r.id), communication_disabled_until: member.communication_disabled_until, flags: 0 }, - guild: { id: member.guild.id, owner_id: member.guild.owner_id!, roles: member.guild.roles }, + guild: { id: member.guild.id, owner_id: member.guild.owner_id!, roles: member.roles }, channel: c, }).has("VIEW_CHANNEL"); }); + const visibleChannelIds = visibleChannels.map((c) => c.id); const ownedMentionableRoleIds = memberships.reduce((acc, m) => { acc.push(...m.roles.filter((r) => r.mentionable).map((r) => r.id)); -- cgit 1.5.1 From ad0b0245dd2e1ec7a25f02e5005b3c414f4b611f Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 17:04:46 +0100 Subject: Actually include messages in mentions result --- src/api/routes/users/@me/mentions.ts | 58 +++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 10 deletions(-) (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index 6ac64ef2..f13edf0a 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -17,7 +17,7 @@ */ import { route } from "@spacebar/api"; -import { Snowflake, User, Message, Member, Channel, Permissions, timePromise } from "@spacebar/util"; +import { Snowflake, User, Message, Member, Channel, Permissions, timePromise, NewUrlUserSignatureData, Stopwatch } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { In } from "typeorm"; @@ -40,6 +40,7 @@ router.get( const limit = req.query.limit && !isNaN(Number(req.query.limit)) ? Number(req.query.limit) : 50; const everyone = !!req.query.everyone; const roles = !!req.query.roles; + const before = req.query.before && BigInt(req.query.before as string); const user = await User.findOneOrFail({ where: { id: req.user_id }, @@ -106,7 +107,7 @@ router.get( order: { timestamp: "DESC", }, - take: limit ? Number(limit) : 50, + take: limit, }), ), await timePromise(() => @@ -124,7 +125,7 @@ router.get( order: { timestamp: "DESC", }, - take: limit ? Number(limit) : 50, + take: limit, }), ), await timePromise(() => @@ -142,20 +143,57 @@ router.get( order: { timestamp: "DESC", }, - take: limit ? Number(limit) : 50, + take: limit, }), ), ]); const allMentions = [...userMentions, ...roleMentions, ...everyoneMentions]; - console.log(`[Inbox/mentions] User ${user.id} query results: totalRecs=${allMentions.length} | user=${userMentions.length} (took ${userMentionQueryTime}ms), role=${roleMentions.length} (took ${roleMentionQueryTime}ms), everyone=${everyoneMentions.length} (took ${everyoneMentionQueryTime}ms)`); + console.log( + `[Inbox/mentions] User ${user.id} query results: totalRecs=${allMentions.length} | user=${userMentions.length} (took ${userMentionQueryTime.totalMilliseconds}ms), role=${roleMentions.length} (took ${roleMentionQueryTime.totalMilliseconds}ms), everyone=${everyoneMentions.length} (took ${everyoneMentionQueryTime.totalMilliseconds}ms)`, + ); + const messageIdsToReturn = allMentions + .sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()) + .distinctBy((m) => m.id) + .slice(0, limit); - return res.json( - allMentions - .sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime()) - .distinctBy((m) => m.id) - .slice(0, limit), + const sw = Stopwatch.startNew(); + const finalMessages = ( + await Message.find({ + where: { id: In(messageIdsToReturn.map((m) => m.id)) }, + order: { timestamp: "DESC" }, + relations: [ + "author", + "webhook", + "application", + "mentions", + "mention_roles", + "mention_channels", + "sticker_items", + "attachments", + "referenced_message", + "referenced_message.author", + "referenced_message.webhook", + "referenced_message.application", + "referenced_message.mentions", + "referenced_message.mention_roles", + "referenced_message.mention_channels", + "referenced_message.sticker_items", + "referenced_message.attachments", + ], + }) + ).map((m) => + m.toJSON().withSignedAttachments( + new NewUrlUserSignatureData({ + ip: req.ip, + userAgent: req.headers["user-agent"] as string, + }), + ), ); + + console.log(`[Inbox/mentions] User ${user.id} fetched full message data for ${finalMessages.length} messages in ${sw.elapsed().totalMilliseconds}ms`); + + return res.json(finalMessages); }, ); -- cgit 1.5.1 From de4a1ed58b51e42d8655faa874cccf11929253ce Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 17:06:06 +0100 Subject: Swap around toJSON and withSignedAttachments (oops) --- src/api/routes/users/@me/mentions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index f13edf0a..0bee6bb0 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -183,12 +183,12 @@ router.get( ], }) ).map((m) => - m.toJSON().withSignedAttachments( + m.withSignedAttachments( new NewUrlUserSignatureData({ ip: req.ip, userAgent: req.headers["user-agent"] as string, }), - ), + ).toJSON(), ); console.log(`[Inbox/mentions] User ${user.id} fetched full message data for ${finalMessages.length} messages in ${sw.elapsed().totalMilliseconds}ms`); -- cgit 1.5.1 From ce3a46ed2c6fd1d45918275e8f39ff3734089ef0 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 26 Nov 2025 17:20:57 +0100 Subject: Maybe? --- src/api/routes/users/@me/mentions.ts | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/api') diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts index 0bee6bb0..cd3bb684 100644 --- a/src/api/routes/users/@me/mentions.ts +++ b/src/api/routes/users/@me/mentions.ts @@ -17,7 +17,7 @@ */ import { route } from "@spacebar/api"; -import { Snowflake, User, Message, Member, Channel, Permissions, timePromise, NewUrlUserSignatureData, Stopwatch } from "@spacebar/util"; +import { Snowflake, User, Message, Member, Channel, Permissions, timePromise, NewUrlUserSignatureData, Stopwatch, Attachment } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { In } from "typeorm"; @@ -182,14 +182,20 @@ router.get( "referenced_message.attachments", ], }) - ).map((m) => - m.withSignedAttachments( - new NewUrlUserSignatureData({ - ip: req.ip, - userAgent: req.headers["user-agent"] as string, - }), - ).toJSON(), - ); + ).map((m) => { + return { + ...m.toJSON(), + attachments: m.attachments?.map((attachment: Attachment) => + Attachment.prototype.signUrls.call( + attachment, + new NewUrlUserSignatureData({ + ip: req.ip, + userAgent: req.headers["user-agent"] as string, + }), + ), + ), + }; + }); console.log(`[Inbox/mentions] User ${user.id} fetched full message data for ${finalMessages.length} messages in ${sw.elapsed().totalMilliseconds}ms`); -- cgit 1.5.1