diff options
| -rw-r--r-- | util/src/entities/Message.ts | 8 | ||||
| -rw-r--r-- | util/src/util/Config.ts | 16 |
2 files changed, 15 insertions, 9 deletions
diff --git a/util/src/entities/Message.ts b/util/src/entities/Message.ts index a4d38315..20a44ca3 100644 --- a/util/src/entities/Message.ts +++ b/util/src/entities/Message.ts @@ -9,6 +9,7 @@ import { CreateDateColumn, Entity, FindConditions, + Index, JoinColumn, JoinTable, ManyToMany, @@ -45,9 +46,11 @@ export enum MessageType { } @Entity("messages") +@Index(["channel_id", "id"], { unique: true }) export class Message extends BaseClass { @Column({ nullable: true }) @RelationId((message: Message) => message.channel) + @Index() channel_id: string; @JoinColumn({ name: "channel_id" }) @@ -68,10 +71,13 @@ export class Message extends BaseClass { @Column({ nullable: true }) @RelationId((message: Message) => message.author) + @Index() author_id: string; @JoinColumn({ name: "author_id", referencedColumnName: "id" }) - @ManyToOne(() => User) + @ManyToOne(() => User, { + onDelete: "CASCADE", + }) author?: User; @Column({ nullable: true }) diff --git a/util/src/util/Config.ts b/util/src/util/Config.ts index 92907d0c..31b8d97c 100644 --- a/util/src/util/Config.ts +++ b/util/src/util/Config.ts @@ -4,7 +4,7 @@ import path from "path"; import fs from "fs"; // TODO: yaml instead of json -const overridePath = path.join(process.cwd(), "config.json"); +// const overridePath = path.join(process.cwd(), "config.json"); var config: ConfigValue; var pairs: ConfigEntity[]; @@ -19,12 +19,12 @@ export const Config = { config = pairsToConfig(pairs); config = (config || {}).merge(DefaultConfigOptions); - try { - const overrideConfig = JSON.parse(fs.readFileSync(overridePath, { encoding: "utf8" })); - config = overrideConfig.merge(config); - } catch (error) { - fs.writeFileSync(overridePath, JSON.stringify(config, null, 4)); - } + // try { + // const overrideConfig = JSON.parse(fs.readFileSync(overridePath, { encoding: "utf8" })); + // config = overrideConfig.merge(config); + // } catch (error) { + // fs.writeFileSync(overridePath, JSON.stringify(config, null, 4)); + // } return this.set(config); }, @@ -51,7 +51,7 @@ function applyConfig(val: ConfigValue) { pair.value = obj; return pair.save(); } - fs.writeFileSync(overridePath, JSON.stringify(val, null, 4)); + // fs.writeFileSync(overridePath, JSON.stringify(val, null, 4)); return apply(val); } |