summary refs log tree commit diff
path: root/util
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-23 20:56:26 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-23 20:56:26 +1000
commitcc21ae7f6ad1ac7825a2ad3b274ba4a1a594af08 (patch)
tree99d76b1d6ae91e67e3de30d99eab223da36c0a08 /util
parentBot update (diff)
parentMoved user notes into separate table (diff)
downloadserver-cc21ae7f6ad1ac7825a2ad3b274ba4a1a594af08.tar.xz
Merge branch 'feat/notesTable' into slowcord
Diffstat (limited to 'util')
-rw-r--r--util/src/entities/Note.ts18
-rw-r--r--util/src/entities/User.ts4
-rw-r--r--util/src/entities/index.ts3
3 files changed, 21 insertions, 4 deletions
diff --git a/util/src/entities/Note.ts b/util/src/entities/Note.ts
new file mode 100644

index 00000000..36017c5e --- /dev/null +++ b/util/src/entities/Note.ts
@@ -0,0 +1,18 @@ +import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm"; +import { BaseClass } from "./BaseClass"; +import { User } from "./User"; + +@Entity("notes") +@Unique(["owner", "target"]) +export class Note extends BaseClass { + @JoinColumn({ name: "owner_id" }) + @ManyToOne(() => User, { onDelete: "CASCADE" }) + owner: User; + + @JoinColumn({ name: "target_id" }) + @ManyToOne(() => User, { onDelete: "CASCADE" }) + target: User; + + @Column() + content: string; +} \ No newline at end of file diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 954ade5c..a8f7f0c3 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts
@@ -5,6 +5,7 @@ import { Relationship } from "./Relationship"; import { ConnectedAccount } from "./ConnectedAccount"; import { Config, FieldErrors, Snowflake, trimSpecial } from ".."; import { Member, Session } from "."; +import { Note } from "./Note"; export enum PublicUserEnum { username, @@ -174,9 +175,6 @@ export class User extends BaseClass { @Column({ type: "simple-json", select: false }) extended_settings: string; - @Column({ type: "simple-json" }) - notes: { [key: string]: string }; //key is ID of user - toPublicUser() { const user: any = {}; PublicUserProjection.forEach((x) => { diff --git a/util/src/entities/index.ts b/util/src/entities/index.ts
index 1b6259ae..c439a4b7 100644 --- a/util/src/entities/index.ts +++ b/util/src/entities/index.ts
@@ -28,4 +28,5 @@ export * from "./User"; export * from "./VoiceState"; export * from "./Webhook"; export * from "./ClientRelease"; -export * from "./BackupCodes"; \ No newline at end of file +export * from "./BackupCodes"; +export * from "./Note";