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

* allow limit=1

Browse Source 
* fix GET messages?around order
This commit is contained in:
Madeline 2023-09-05 23:29:22 +10:00
parent 372bd749fc
commit add16ab26e
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,13 @@ import {
import { Request, Response, Router } from "express"; import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server"; import { HTTPError } from "lambert-server";
import multer from "multer"; import multer from "multer";
import { FindManyOptions, FindOperator, LessThan, MoreThan } from "typeorm"; import {
FindManyOptions,
FindOperator,
LessThan,
MoreThan,
MoreThanOrEqual,
} from "typeorm";
import { URL } from "url"; import { URL } from "url";
const router: Router = Router(); const router: Router = Router();
@ -122,12 +128,24 @@ router.get(
if (around) { if (around) {
query.take = Math.floor(limit / 2); query.take = Math.floor(limit / 2);
const [right, left] = await Promise.all([ if (query.take != 0) {
Message.find({ ...query, where: { id: LessThan(around) } }), const [right, left] = await Promise.all([
Message.find({ ...query, where: { id: MoreThan(around) } }), Message.find({ ...query, where: { id: LessThan(around) } }),
]); Message.find({
right.push(...left); ...query,
messages = right; where: { id: MoreThanOrEqual(around) },
}),
]);
left.push(...right);
messages = left;
} else {
query.take = 1;
const message = await Message.findOne({
...query,
where: { id: around },
});
messages = message ? [message] : [];
}
} else { } else {
if (after) { if (after) {
if (BigInt(after) > BigInt(Snowflake.generate())) if (BigInt(after) > BigInt(Snowflake.generate()))