Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-11 05:02:37 +01:00
Code Issues Releases Activity

Merge pull request #386 from ChrisChrome/master

Browse Source 
Delete messages before deleting channel
This commit is contained in:
Flam3rboy 2021-09-20 18:34:13 +02:00 committed by GitHub
commit e463a7cc4f
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ router.delete("/", route({ permission: "MANAGE_CHANNELS" }), async (req: Request
} else if (channel.type === ChannelType.GROUP_DM) { } else if (channel.type === ChannelType.GROUP_DM) {
await Channel.removeRecipientFromChannel(channel, req.user_id) await Channel.removeRecipientFromChannel(channel, req.user_id)
} else { } else {
//TODO messages in this channel should be deleted before deleting the channel
await Promise.all([ await Promise.all([
Channel.delete({ id: channel_id }), Channel.delete({ id: channel_id }),
emitEvent({ event: "CHANNEL_DELETE", data: channel, channel_id } as ChannelDeleteEvent) emitEvent({ event: "CHANNEL_DELETE", data: channel, channel_id } as ChannelDeleteEvent)

2
api/src/routes/users/@me/relationships.ts
View File

@ -59,7 +59,7 @@ router.post("/", route({ body: "RelationshipPostSchema" }), async (req: Request,
relations: ["relationships", "relationships.to"], relations: ["relationships", "relationships.to"],
select: userProjection, select: userProjection,
where: { where: {
discriminator: String(req.body.discriminator,).padStart(4, '0'), //Discord send the discriminator as integer, we need to add leading zeroes discriminator: String(req.body.discriminator).padStart(4, '0'), //Discord send the discriminator as integer, we need to add leading zeroes
username: req.body.username username: req.body.username
} }
}), }),

1
api/src/util/route.ts
View File

@ -14,6 +14,7 @@ export const ajv = new Ajv({
parseDate: true, parseDate: true,
allowDate: true, allowDate: true,
schemas, schemas,
coerceTypes: true,
messages: true, messages: true,
strict: true, strict: true,
strictRequired: true strictRequired: true