diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts
index 6d9db470..edce92a9 100644
--- a/util/src/entities/Config.ts
+++ b/util/src/entities/Config.ts
@@ -125,6 +125,7 @@ export interface ConfigValue {
required: boolean;
minimum: number; // in years
};
+ disabled: boolean;
requireCaptcha: boolean;
requireInvite: boolean;
allowNewRegistration: boolean;
@@ -143,6 +144,10 @@ export interface ConfigValue {
useDefaultAsOptimal: boolean;
available: Region[];
};
+
+ guild: {
+ showAllGuildsInDiscovery: boolean;
+ };
rabbitmq: {
host: string | null;
};
@@ -266,6 +271,7 @@ export const DefaultConfigOptions: ConfigValue = {
required: false,
minimum: 13,
},
+ disabled: false,
requireInvite: false,
requireCaptcha: true,
allowNewRegistration: true,
@@ -293,6 +299,10 @@ export const DefaultConfigOptions: ConfigValue = {
},
],
},
+
+ guild: {
+ showAllGuildsInDiscovery: false,
+ },
rabbitmq: {
host: null,
},
diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts
index c4901693..04c3c7aa 100644
--- a/util/src/entities/Message.ts
+++ b/util/src/entities/Message.ts
@@ -74,9 +74,7 @@ export class Message extends BaseClass {
author_id: string;
@JoinColumn({ name: "author_id", referencedColumnName: "id" })
- @ManyToOne(() => User, {
- onDelete: "CASCADE",
- })
+ @ManyToOne(() => User)
author?: User;
@Column({ nullable: true })
@@ -120,7 +118,7 @@ export class Message extends BaseClass {
mention_everyone?: boolean;
@JoinTable({ name: "message_user_mentions" })
- @ManyToMany(() => User, { orphanedRowAction: "delete", onDelete: "CASCADE", cascade: true })
+ @ManyToMany(() => User)
mentions: User[];
@JoinTable({ name: "message_role_mentions" })
diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 5af755ed..b6f3723c 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -3,7 +3,6 @@ import { BaseClass } from "./BaseClass";
import { BitField } from "../util/BitField";
import { Relationship } from "./Relationship";
import { ConnectedAccount } from "./ConnectedAccount";
-import { HTTPError } from "lambert-server";
export enum PublicUserEnum {
username,
@@ -126,6 +125,9 @@ export class User extends BaseClass {
@Column()
public_flags: number;
+ @Column()
+ rights: string; // Rights
+
@JoinColumn({ name: "relationship_ids" })
@OneToMany(() => Relationship, (relationship: Relationship) => relationship.from, {
cascade: true,
@@ -278,5 +280,7 @@ export class UserFlags extends BitField {
UNDERAGE_DELETED: BigInt(1) << BigInt(15),
VERIFIED_BOT: BigInt(1) << BigInt(16),
EARLY_VERIFIED_BOT_DEVELOPER: BigInt(1) << BigInt(17),
+ CERTIFIED_MODERATOR: BigInt(1) << BigInt(18),
+ BOT_HTTP_INTERACTIONS: BigInt(1) << BigInt(19),
};
}
|
