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

Merge pull request #1184 from DEVTomatoCake/fix/widget.json-channel-ordering-deleted-channels

Browse Source
This commit is contained in:
Madeline 2024-08-22 09:54:18 +10:00 committed by GitHub
commit 346641cf5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ router.delete(
}
await Promise.all([
Channel.delete({ id: channel_id }),
Channel.deleteChannel(channel),
emitEvent({
event: "CHANNEL_DELETE",
data: channel,

7
src/api/routes/guilds/#guild_id/widget.json.ts
View File

@ -53,7 +53,12 @@ router.get(
async (req: Request, res: Response) => {
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({ where: { id: guild_id } });
const guild = await Guild.findOneOrFail({
where: { id: guild_id },
select: {
channel_ordering: true,
},
});
if (!guild.widget_enabled) throw DiscordApiErrors.EMBED_DISABLED;
// Fetch existing widget invite for widget channel

32
src/util/entities/Channel.ts
View File

@ -459,9 +459,21 @@ export class Channel extends BaseClass {
}
static async deleteChannel(channel: Channel) {
await Message.delete({ channel_id: channel.id }); //TODO we should also delete the attachments from the cdn but to do that we need to move cdn.ts in util
//TODO before deleting the channel we should check and delete other relations
// TODO Delete attachments from the CDN for messages in the channel
await Channel.delete({ id: channel.id });
const guild = await Guild.findOneOrFail({
where: { id: channel.guild_id },
select: { channel_ordering: true },
});
const updatedOrdering = guild.channel_ordering.filter(
(id) => id != channel.id,
);
await Guild.update(
{ id: channel.guild_id },
{ channel_ordering: updatedOrdering },
);
}
static async calculatePosition(
@ -487,15 +499,19 @@ export class Channel extends BaseClass {
const channels = await Promise.all(
guild.channel_ordering.map((id) =>
Channel.findOneOrFail({ where: { id } }),
Channel.findOne({ where: { id } }),
),
);
return channels.reduce((r, v) => {
v.position = (guild as Guild).channel_ordering.indexOf(v.id);
r[v.position] = v;
return r;
}, [] as Array<Channel>);
return channels
.filter((channel) => channel !== null)
.reduce((r, v) => {
v = v as Channel;
v.position = (guild as Guild).channel_ordering.indexOf(v.id);
r[v.position] = v;
return r;
}, [] as Array<Channel>);
}
isDm() {