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

Merge branch 'master' into slowcord

Browse Source
This commit is contained in:
Madeline
2022-03-12 13:07:16 +11:00
parent 24ecf9133f 771e9c1cae
commit 6ffe277f2f
15 changed files with 167 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/routes/guilds/#guild_id/bans.ts
+23 -8
View File
@@ -33,17 +33,32 @@ router.get("/", route({ permission: "BAN_MEMBERS" }), async (req: Request, res:
const { guild_id } = req.params;
let bans = await Ban.find({ guild_id: guild_id });
let promisesToAwait: object[] = [];
const bansObj: object[] = [];
/* Filter secret from database registry.*/
bans.filter((ban) => ban.user_id !== ban.executor_id); // pretend self-bans don't exist to prevent victim chasing
bans.filter(ban => ban.user_id !== ban.executor_id);
// pretend self-bans don't exist to prevent victim chasing
bans.forEach((registry: BanRegistrySchema) => {
delete registry.ip;
bans.forEach((ban) => {
promisesToAwait.push(User.getPublicUser(ban.user_id));
});
return res.json(bans);
const bannedUsers: object[] = await Promise.all(promisesToAwait);
bans.forEach((ban, index) => {
const user = bannedUsers[index] as User;
bansObj.push({
reason: ban.reason,
user: {
username: user.username,
discriminator: user.discriminator,
id: user.id,
avatar: user.avatar,
public_flags: user.public_flags
}
});
});
return res.json(bansObj);
});
router.get("/:user", route({ permission: "BAN_MEMBERS" }), async (req: Request, res: Response) => {
api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+6
View File
@@ -25,13 +25,19 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
const member = await Member.findOneOrFail({ where: { id: member_id, guild_id }, relations: ["roles", "user"] });
const permission = await getPermission(req.user_id, guild_id);
const everyone = await Role.findOneOrFail({ guild_id: guild_id, name: "@everyone", position: 0 });
if (body.roles) {
permission.hasThrow("MANAGE_ROLES");
if (body.roles.indexOf(everyone.id) === -1) body.roles.push(everyone.id);
member.roles = body.roles.map((x) => new Role({ id: x })); // foreign key constraint will fail if role doesn't exist
}
await member.save();
member.roles = member.roles.filter((x) => x.id !== everyone.id);
// do not use promise.all as we have to first write to db before emitting the event to catch errors
await emitEvent({
event: "GUILD_MEMBER_UPDATE",
api/src/routes/guilds/#guild_id/vanity-url.ts
+28 -5
View File
@@ -9,11 +9,19 @@ const InviteRegex = /\W/g;
router.get("/", route({ permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => {
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({ id: guild_id });
const invite = await Invite.findOne({ where: { guild_id: guild_id, vanity_url: true } });
if (!invite) return res.json({ code: null });
if (!guild.features.includes("ALIASABLE_NAMES")) {
const invite = await Invite.findOne({ where: { guild_id: guild_id, vanity_url: true } });
if (!invite) return res.json({ code: null });
return res.json({ code: invite.code, uses: invite.uses });
return res.json({ code: invite.code, uses: invite.uses });
} else {
const invite = await Invite.find({ where: { guild_id: guild_id, vanity_url: true } });
if (!invite || invite.length == 0) return res.json({ code: null });
return res.json(invite.map((x) => ({ code: x.code, uses: x.uses })));
}
});
export interface VanityUrlSchema {
@@ -24,18 +32,33 @@ export interface VanityUrlSchema {
code?: string;
}
// TODO: check if guild is elgible for vanity url
router.patch("/", route({ body: "VanityUrlSchema", permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => {
const { guild_id } = req.params;
const body = req.body as VanityUrlSchema;
const code = body.code?.replace(InviteRegex, "");
const guild = await Guild.findOneOrFail({ id: guild_id });
if (!guild.features.includes("VANITY_URL")) throw new HTTPError("Your guild doesn't support vanity urls");
if (!code || code.length === 0) throw new HTTPError("Code cannot be null or empty");
const invite = await Invite.findOne({ code });
if (invite) throw new HTTPError("Invite already exists");
const { id } = await Channel.findOneOrFail({ guild_id, type: ChannelType.GUILD_TEXT });
await Invite.update({ vanity_url: true, guild_id }, { code: code, channel_id: id });
await new Invite({
vanity_url: true,
code: code,
temporary: false,
uses: 0,
max_uses: 0,
max_age: 0,
created_at: new Date(),
expires_at: new Date(),
guild_id: guild_id,
channel_id: id
}).save();
return res.json({ code: code });
});
api/src/routes/users/@me/index.ts
+8 -6
View File
@@ -64,12 +64,14 @@ router.patch("/", route({ body: "UserModifySchema" }), async (req: Request, res:
user.data.hash = await bcrypt.hash(body.new_password, 12);
}
var check_username = body?.username?.replace(/\s/g, '');
if(!check_username && !body?.avatar && !body?.banner) {
throw FieldErrors({
username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
});
}
if(body.username){
var check_username = body?.username?.replace(/\s/g, '');
if(!check_username) {
throw FieldErrors({
username: { code: "BASE_TYPE_REQUIRED", message: req.t("common:field.BASE_TYPE_REQUIRED") }
});
}
}
await user.save();
api/src/routes/users/@me/notes.ts
+3 -3
View File
@@ -6,9 +6,9 @@ const router: Router = Router();
router.put("/:id", route({}), async (req: Request, res: Response) => {
//TODO
res.json({
message: "400: Bad Request",
code: 0
}).status(400);
message: "Unknown User",
code: 10013
}).status(404);
});
export default router;
api/src/util/handlers/Message.ts
+6 -4
View File
@@ -82,10 +82,12 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
if (opts.message_reference) {
permission.hasThrow("READ_MESSAGE_HISTORY");
// code below has to be redone when we add custom message routing and cross-channel replies
const guild = await Guild.findOneOrFail({ id: channel.guild_id });
if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) {
if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild");
if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel");
if (message.guild_id !== null) {
const guild = await Guild.findOneOrFail({ id: channel.guild_id });
if (!guild.features.includes("CROSS_CHANNEL_REPLIES")) {
if (opts.message_reference.guild_id !== channel.guild_id) throw new HTTPError("You can only reference messages from this guild");
if (opts.message_reference.channel_id !== opts.channel_id) throw new HTTPError("You can only reference messages from this channel");
}
}
// TODO: should be checked if the referenced message exists?
// @ts-ignore