diff --git a/api/src/routes/guilds/#guild_id/members/index.ts b/api/src/routes/guilds/#guild_id/members/index.ts
index 656d3acd..0bfd71cb 100644
--- a/api/src/routes/guilds/#guild_id/members/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/index.ts
@@ -1,8 +1,7 @@
import { Request, Response, Router } from "express";
-import { Guild, Member, toObject } from "@fosscord/util";
-import { HTTPError } from "lambert-server";
+import { Guild, Member, PublicMemberProjection } from "@fosscord/util";
import { instanceOf, Length } from "../../../../util/instanceOf";
-import { PublicMemberProjection, isMember } from "../../../../util/Member";
+import { MoreThan } from "typeorm";
const router = Router();
@@ -11,7 +10,7 @@ const router = Router();
router.get("/", async (req: Request, res: Response) => {
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({ id: guild_id });
- await isMember(req.user_id, guild_id);
+ await Member.IsInGuildOrFail(req.user_id, guild_id);
try {
instanceOf({ $limit: new Length(Number, 1, 1000), $after: String }, req.query, {
@@ -23,12 +22,16 @@ router.get("/", async (req: Request, res: Response) => {
return res.status(400).json({ code: 50035, message: "Invalid Query", success: false, errors: error });
}
- // @ts-ignore
- if (!req.query.limit) req.query.limit = 1;
- const { limit, after } = (<unknown>req.query) as { limit: number; after: string };
- const query = after ? { id: { $gt: after } } : {};
+ const { limit, after } = (<unknown>req.query) as { limit?: number; after?: string };
+ const query = after ? { id: MoreThan(after) } : {};
+
+ const members = await Member.find({
+ where: { guild_id, ...query },
+ select: PublicMemberProjection,
+ take: limit || 1,
+ order: { id: "ASC" }
+ });
- var members = await Member.find({ guild_id, ...query }, PublicMemberProjection).limit(limit);
return res.json(members);
});
|
