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

Fix regression of 5f22faa57b7104ba29a01889a1bafc35b3be4f02

Browse Source
This commit is contained in:
Madeline 2023-07-28 09:45:13 +10:00
parent 5f22faa57b
commit 08f17f88e7
No known key found for this signature in database
GPG Key ID: 80D25DA3BCB24281
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,25 +119,26 @@ router.get(
}; };
let messages: Message[]; let messages: Message[];
if (around) {
query.take = Math.floor(limit / 2);
const [right, left] = await Promise.all([
Message.find({ ...query, where: { id: LessThan(around) } }),
Message.find({ ...query, where: { id: MoreThan(around) } }),
]);
messages = right.concat(left);
} else {
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(Snowflake.generate()))
return res.status(422); return res.status(422);
query.where.id = LessThan(before); query.where.id = LessThan(before);
}
messages = await Message.find(query); messages = await Message.find(query);
} else if (around) {
query.take = Math.floor(limit / 2);
query.where.id = LessThan(around);
const messages_before = await Message.find(query);
query.where.id = MoreThan(around);
const messages_after = await Message.find(query);
messages = messages_before.concat(messages_after);
} else {
throw new HTTPError("after, around or before must be present", 422);
} }
const endpoint = Config.get().cdn.endpointPublic; const endpoint = Config.get().cdn.endpointPublic;