diff --git a/src/routes/guilds/#guild_id/bans.ts b/src/routes/guilds/#guild_id/bans.ts
index f84950f9..87d2e7f8 100644
--- a/src/routes/guilds/#guild_id/bans.ts
+++ b/src/routes/guilds/#guild_id/bans.ts
@@ -11,17 +11,17 @@ import { getPublicUser } from "../../../util/User";
const router: Router = Router();
router.get("/", async (req: Request, res: Response) => {
- const guild_id = req.params.id;
+ const { guild_id } = req.params;
const guild = await GuildModel.exists({ id: guild_id });
if (!guild) throw new HTTPError("Guild not found", 404);
- var bans = await BanModel.find({ guild_id: guild_id }).exec();
+ var bans = await BanModel.find({ guild_id: guild_id }, { user: true, reason: true }).exec();
return res.json(toObject(bans));
});
router.get("/:user", async (req: Request, res: Response) => {
- const guild_id = req.params.id;
+ const { guild_id } = req.params;
const user_id = req.params.ban;
var ban = await BanModel.findOne({ guild_id: guild_id, user_id: user_id }).exec();
@@ -29,8 +29,8 @@ router.get("/:user", async (req: Request, res: Response) => {
return res.json(ban);
});
-router.post("/:user_id", check(BanCreateSchema), async (req: Request, res: Response) => {
- const guild_id = req.params.id;
+router.put("/:user_id", check(BanCreateSchema), async (req: Request, res: Response) => {
+ const { guild_id } = req.params;
const banned_user_id = req.params.user_id;
const banned_user = await getPublicUser(banned_user_id);
@@ -45,19 +45,19 @@ router.post("/:user_id", check(BanCreateSchema), async (req: Request, res: Respo
guild_id: guild_id,
ip: getIpAdress(req),
executor_id: req.user_id,
- reason: req.body.reason, // || otherwise empty
+ reason: req.body.reason // || otherwise empty
}).save();
await emitEvent({
event: "GUILD_BAN_ADD",
data: {
guild_id: guild_id,
- user: banned_user,
+ user: banned_user
},
- guild_id: guild_id,
+ guild_id: guild_id
} as GuildBanAddEvent);
- return res.json(ban).send();
+ return res.json(toObject(ban));
});
router.delete("/:user_id", async (req: Request, res: Response) => {
@@ -73,16 +73,16 @@ router.delete("/:user_id", async (req: Request, res: Response) => {
await BanModel.deleteOne({
user_id: banned_user_id,
- guild_id,
+ guild_id
}).exec();
await emitEvent({
event: "GUILD_BAN_REMOVE",
data: {
guild_id,
- user: banned_user,
+ user: banned_user
},
- guild_id,
+ guild_id
} as GuildBanRemoveEvent);
return res.status(204).send();
diff --git a/src/routes/guilds/index.ts b/src/routes/guilds/index.ts
index c286ad51..17ade355 100644
--- a/src/routes/guilds/index.ts
+++ b/src/routes/guilds/index.ts
@@ -1,9 +1,8 @@
import { Router, Request, Response } from "express";
-import { RoleModel, GuildModel, Snowflake, Guild, RoleDocument } from "@fosscord/server-util";
+import { RoleModel, GuildModel, Snowflake, Guild, RoleDocument, Config } from "@fosscord/server-util";
import { HTTPError } from "lambert-server";
import { check } from "./../../util/instanceOf";
import { GuildCreateSchema } from "../../schema/Guild";
-import Config from "../../util/Config";
import { getPublicUser } from "../../util/User";
import { addMember } from "../../util/Member";
import { createChannel } from "../../util/Channel";
diff --git a/src/routes/guilds/templates/index.ts b/src/routes/guilds/templates/index.ts
index 7e32e94c..f23d4fbe 100644
--- a/src/routes/guilds/templates/index.ts
+++ b/src/routes/guilds/templates/index.ts
@@ -1,11 +1,10 @@
import { Request, Response, Router } from "express";
const router: Router = Router();
-import { TemplateModel, GuildModel, toObject, UserModel, RoleModel, Snowflake, Guild } from "@fosscord/server-util";
+import { TemplateModel, GuildModel, toObject, UserModel, RoleModel, Snowflake, Guild, Config } from "@fosscord/server-util";
import { HTTPError } from "lambert-server";
import { GuildTemplateCreateSchema } from "../../../schema/Guild";
import { getPublicUser } from "../../../util/User";
import { check } from "../../../util/instanceOf";
-import Config from "../../../util/Config";
import { addMember } from "../../../util/Member";
router.get("/:code", async (req: Request, res: Response) => {
@@ -37,7 +36,7 @@ router.post("/:code", check(GuildTemplateCreateSchema), async (req: Request, res
...body,
...template.serialized_source_guild,
id: guild_id,
- owner_id: req.user_id,
+ owner_id: req.user_id
};
const [guild_doc, role] = await Promise.all([
@@ -52,8 +51,8 @@ router.post("/:code", check(GuildTemplateCreateSchema), async (req: Request, res
name: "@everyone",
permissions: 2251804225n,
position: 0,
- tags: null,
- }).save(),
+ tags: null
+ }).save()
]);
await addMember(req.user_id, guild_id, { guild: guild_doc });
|
