Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1075 from SpecificProtagonist/get_messages_around

Browse Source 
Fix get channel messages `around` parameter
This commit is contained in:
Madeline 2023-07-18 21:04:52 +10:00 committed by GitHub
commit 5f22faa57b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/api/routes/channels/#channel_id/messages/index.ts
View File

@ -20,7 +20,6 @@ import { handleMessage, postHandleMessage, route } from "@spacebar/api";
import { import {
Attachment, Attachment,
Channel, Channel,
ChannelType,
Config, Config,
DmChannelDTO, DmChannelDTO,
FieldErrors, FieldErrors,
@ -93,8 +92,6 @@ router.get(
if (limit < 1 || limit > 100) if (limit < 1 || limit > 100)
throw new HTTPError("limit must be between 1 and 100", 422); throw new HTTPError("limit must be between 1 and 100", 422);
const halfLimit = Math.floor(limit / 2);
const permissions = await getPermission( const permissions = await getPermission(
req.user_id, req.user_id,
channel.guild_id, channel.guild_id,
@ -121,24 +118,28 @@ router.get(
], ],
}; };
let messages: Message[];
if (after) { if (after) {
if (BigInt(after) > BigInt(Snowflake.generate())) if (BigInt(after) > BigInt(Snowflake.generate()))
return res.status(422); return res.status(422);
query.where.id = MoreThan(after); query.where.id = MoreThan(after);
messages = await Message.find(query);
} else if (before) { } else if (before) {
if (BigInt(before) < BigInt(req.params.channel_id)) if (BigInt(before) < BigInt(req.params.channel_id))
return res.status(422); return res.status(422);
query.where.id = LessThan(before); query.where.id = LessThan(before);
messages = await Message.find(query);
} else if (around) { } else if (around) {
query.where.id = [ query.take = Math.floor(limit / 2);
MoreThan((BigInt(around) - BigInt(halfLimit)).toString()), query.where.id = LessThan(around);
LessThan((BigInt(around) + BigInt(halfLimit)).toString()), const messages_before = await Message.find(query);
]; query.where.id = MoreThan(around);
const messages_after = await Message.find(query);
return res.json([]); // TODO: fix around messages = messages_before.concat(messages_after);
} else {
throw new HTTPError("after, around or before must be present", 422);
} }
const messages = await Message.find(query);
const endpoint = Config.get().cdn.endpointPublic; const endpoint = Config.get().cdn.endpointPublic;
return res.json( return res.json(