dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-05-24 19:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix other bug

Browse Source
This commit is contained in:
MathMan05
2025-11-30 23:41:00 -06:00
parent 6bf6a961ea
commit 3a9821626f
2 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/routes/channels/#channel_id/messages/search.ts
+3 -1
View File
@@ -99,6 +99,8 @@ router.get(
if (content) query.where.content = Like(`%${content}%`);
const messages: Message[] = await Message.find(query);
delete query.take;
const total_results = await Message.count(query);
const messagesDto = messages.map((x) => [
{
@@ -132,7 +134,7 @@ router.get(
return res.json({
messages: messagesDto,
total_results: messages.length,
total_results,
});
},
);
src/api/routes/guilds/#guild_id/messages/search.ts
+11 -37
View File
@@ -54,14 +54,10 @@ router.get(
} = req.query;
const parsedLimit = Number(limit) || 50;
if (parsedLimit < 1 || parsedLimit > 100)
throw new HTTPError("limit must be between 1 and 100", 422);
if (parsedLimit < 1 || parsedLimit > 100) throw new HTTPError("limit must be between 1 and 100", 422);
if (sort_order) {
if (
typeof sort_order != "string" ||
["desc", "asc"].indexOf(sort_order) == -1
)
if (typeof sort_order != "string" || ["desc", "asc"].indexOf(sort_order) == -1)
throw FieldErrors({
sort_order: {
message: "Value must be one of ('desc', 'asc').",
@@ -70,20 +66,13 @@ router.get(
}); // todo this is wrong
}
const permissions = await getPermission(
req.user_id,
req.params.guild_id,
channel_id as string | undefined,
);
const permissions = await getPermission(req.user_id, req.params.guild_id, channel_id as string | undefined);
permissions.hasThrow("VIEW_CHANNEL");
if (!permissions.has("READ_MESSAGE_HISTORY"))
return res.json({ messages: [], total_results: 0 });
if (!permissions.has("READ_MESSAGE_HISTORY")) return res.json({ messages: [], total_results: 0 });
const query: FindManyOptions<Message> = {
order: {
timestamp: sort_order
? (sort_order.toUpperCase() as "ASC" | "DESC")
: "DESC",
timestamp: sort_order ? (sort_order.toUpperCase() as "ASC" | "DESC") : "DESC",
},
take: parsedLimit || 0,
where: {
@@ -91,16 +80,7 @@ router.get(
id: req.params.guild_id,
},
},
relations: [
"author",
"webhook",
"application",
"mentions",
"mention_roles",
"mention_channels",
"sticker_items",
"attachments",
],
relations: ["author", "webhook", "application", "mentions", "mention_roles", "mention_channels", "sticker_items", "attachments"],
skip: offset ? Number(offset) : 0,
};
//@ts-ignore
@@ -114,16 +94,8 @@ router.get(
const ids = [];
for (const channel of channels) {
const perm = await getPermission(
req.user_id,
req.params.guild_id,
channel.id,
);
if (
!perm.has("VIEW_CHANNEL") ||
!perm.has("READ_MESSAGE_HISTORY")
)
continue;
const perm = await getPermission(req.user_id, req.params.guild_id, channel.id);
if (!perm.has("VIEW_CHANNEL") || !perm.has("READ_MESSAGE_HISTORY")) continue;
ids.push(channel.id);
}
@@ -136,6 +108,8 @@ router.get(
if (content) query.where.content = Like(`%${content}%`);
const messages: Message[] = await Message.find(query);
delete query.take;
const total_results = await Message.count(query);
const messagesDto = messages.map((x) => [
{
@@ -169,7 +143,7 @@ router.get(
return res.json({
messages: messagesDto,
total_results: messages.length,
total_results,
});
},
);