Merge branch 'master' of https://github.com/fosscord/fosscord-server

2 files changed, 10 insertions, 7 deletions

diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts

index 4bf81901..98766a9d 100644
--- a/util/src/entities/Channel.ts
+++ b/util/src/entities/Channel.ts
@@ -352,6 +352,16 @@ export class Channel extends BaseClass {
 	isDm() {

 		return this.type === ChannelType.DM || this.type === ChannelType.GROUP_DM;

 	}

+

+	// Does the channel support sending messages ( eg categories do not )

+	isWritable() {

+		const disallowedChannelTypes = [

+			ChannelType.GUILD_CATEGORY,

+			ChannelType.GUILD_STAGE_VOICE,

+			ChannelType.VOICELESS_WHITEBOARD,

+		];

+		return disallowedChannelTypes.indexOf(this.type) == -1;

+	}

 }

 

 export interface ChannelPermissionOverwrite {

diff --git a/util/src/entities/UserGroup.ts b/util/src/entities/UserGroup.ts

index b32c2d6d..709b9d0b 100644
--- a/util/src/entities/UserGroup.ts
+++ b/util/src/entities/UserGroup.ts
@@ -27,13 +27,6 @@ export class UserGroup extends BaseClass {
 
 	@Column({ nullable: true })
 	icon: string;
-
-	@Column({ type: "simple-json", nullable: true })
-	tags?: {
-		bot_id?: string;
-		integration_id?: string;
-		premium_subscriber?: boolean;
-	};
 	
 	@Column({ nullable: true })
 	parent?: string;