Merge pull request #1121 from DEVTomatoCake/fix-deleting-non-empty-categories-1117

Allow deletion of non-empty categories

src/api/routes/channels/#channel_id/index.ts

@@ -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({

src/util/entities/Channel.ts

@@ -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)