From aa412e0e60257029ee6dd92ba7099231f43d2774 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:59:29 +0200
Subject: [PATCH] Remove parent for childs on category deletion
---
src/api/routes/channels/#channel_id/index.ts | 24 +++++++++++++++++---
src/util/entities/Channel.ts | 8 +++----
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts
index 567c7c92..99f9a647 100644
--- a/src/api/routes/channels/#channel_id/index.ts
+++ b/src/api/routes/channels/#channel_id/index.ts
@@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors
-
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
-
+
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
@@ -90,6 +90,24 @@ router.delete(
} else if (channel.type === ChannelType.GROUP_DM) {
await Channel.removeRecipientFromChannel(channel, req.user_id);
} else {
+ if (channel.type == ChannelType.GUILD_CATEGORY) {
+ const channels = await Channel.find({
+ where: { parent_id: channel_id },
+ });
+ for await (const c of channels) {
+ c.parent_id = null;
+
+ await Promise.all([
+ c.save(),
+ emitEvent({
+ event: "CHANNEL_UPDATE",
+ data: c,
+ channel_id: c.id,
+ } as ChannelUpdateEvent),
+ ]);
+ }
+ }
+
await Promise.all([
Channel.delete({ id: channel_id }),
emitEvent({
diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
index 169eab3d..71ccf49e 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -1,17 +1,17 @@
/*
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
Copyright (C) 2023 Spacebar and Spacebar Contributors
-
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
-
+
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
@@ -105,7 +105,7 @@ export class Channel extends BaseClass {
@Column({ nullable: true })
@RelationId((channel: Channel) => channel.parent)
- parent_id: string;
+ parent_id: string | null;
@JoinColumn({ name: "parent_id" })
@ManyToOne(() => Channel)