Merge remote-tracking branch 'upstream/staging' into fix/categoryNames

1 files changed, 0 insertions, 37 deletions

diff --git a/util/src/entities/UserGroup.ts b/util/src/entities/UserGroup.ts
deleted file mode 100644

index 709b9d0b..00000000
--- a/util/src/entities/UserGroup.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-
-import { BaseClass } from "./BaseClass";
-import { Guild } from "./Guild";
-import { User } from "./User";
-
-@Entity("groups")
-export class UserGroup extends BaseClass {
-	@Column()
-	color: number;
-
-	@Column()
-	hoist: boolean;
-	
-	@JoinColumn({ name: "controller", referencedColumnName: "id" })
-	@ManyToOne(() => User)
-	controller?: User;
-	 
-	@Column()
-	mentionable_by?: string;
-
-	@Column()
-	name: string;
-
-	@Column()
-	rights: string;
-
-	@Column({ nullable: true })
-	icon: string;
-	
-	@Column({ nullable: true })
-	parent?: string;
-	
-	@Column({ type: "simple-array", nullable: true})
-	associciations: string[];
-
-}