mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-26 04:03:03 +01:00
Prettier, remove manual deletion of msgs
This commit is contained in:
parent
cae9d7ebed
commit
b7f966c8c2
@ -51,7 +51,7 @@ router.get(
|
|||||||
where: { id: guild_id },
|
where: { id: guild_id },
|
||||||
select: {
|
select: {
|
||||||
channel_ordering: true,
|
channel_ordering: true,
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404);
|
if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404);
|
||||||
|
|
||||||
|
@ -459,8 +459,6 @@ export class Channel extends BaseClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static async deleteChannel(channel: Channel) {
|
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
|
|
||||||
await Channel.delete({ id: channel.id });
|
await Channel.delete({ id: channel.id });
|
||||||
|
|
||||||
const guild = await Guild.findOneOrFail({
|
const guild = await Guild.findOneOrFail({
|
||||||
@ -471,7 +469,10 @@ export class Channel extends BaseClass {
|
|||||||
const updatedOrdering = guild.channel_ordering.filter(
|
const updatedOrdering = guild.channel_ordering.filter(
|
||||||
(id) => id != channel.id,
|
(id) => id != channel.id,
|
||||||
);
|
);
|
||||||
await Guild.update({id: channel.guild_id}, { channel_ordering: updatedOrdering });
|
await Guild.update(
|
||||||
|
{ id: channel.guild_id },
|
||||||
|
{ channel_ordering: updatedOrdering },
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static async calculatePosition(
|
static async calculatePosition(
|
||||||
@ -501,7 +502,9 @@ export class Channel extends BaseClass {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
return channels.filter(channel => channel !== null).reduce((r, v) => {
|
return channels
|
||||||
|
.filter((channel) => channel !== null)
|
||||||
|
.reduce((r, v) => {
|
||||||
v = v as Channel;
|
v = v as Channel;
|
||||||
|
|
||||||
v.position = (guild as Guild).channel_ordering.indexOf(v.id);
|
v.position = (guild as Guild).channel_ordering.indexOf(v.id);
|
||||||
|
Loading…
Reference in New Issue
Block a user