From fac61d7f6a52145580c167c8f3394820604db512 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Mon, 4 Apr 2022 18:22:37 +0300 Subject: Revert "Make member.premium_since ISO8601 timestamp" (#710) This reverts commit 093ae5558007031253b5dadb5a5be96dd265683d. --- util/src/entities/Member.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util/src/entities/Member.ts') diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index 928a25d7..a246b891 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -85,8 +85,8 @@ export class Member extends BaseClassWithoutId { @Column() joined_at: Date; - @Column() - premium_since?: Date; + @Column({ type: "bigint", nullable: true }) + premium_since?: number; @Column() deaf: boolean; @@ -245,7 +245,7 @@ export class Member extends BaseClassWithoutId { nick: undefined, roles: [guild_id], // @everyone role joined_at: new Date(), - premium_since: new Date(), + premium_since: (new Date()).getTime(), deaf: false, mute: false, pending: false, -- cgit 1.5.1 From 5774c037eedba9f7c05d66f86f350a0a480f82a6 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Fri, 8 Apr 2022 10:53:05 +0300 Subject: add joined_by to allow for separate treatment of force-joiners --- util/src/entities/Member.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'util/src/entities/Member.ts') diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index a246b891..ae889a85 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -70,7 +70,7 @@ export class Member extends BaseClassWithoutId { @Column({ nullable: true }) nick?: string; - + @JoinTable({ name: "member_roles", joinColumn: { name: "index", referencedColumnName: "index" }, @@ -102,8 +102,17 @@ export class Member extends BaseClassWithoutId { @Column({ nullable: true }) last_message_id?: string; + + /** + @JoinColumn({ name: "id" }) + @ManyToOne(() => User, { + onDelete: "DO NOTHING", + // do not auto-kick force-joined members just because their joiners left the server + }) **/ + @Column({ nullable: true }) + joined_by: string; - // TODO: update + // TODO: add this when we have proper read receipts // @Column({ type: "simple-json" }) // read_state: ReadState; -- cgit 1.5.1 From 68d1b6efd20d9c666e86326c4437f113809a6d82 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Fri, 8 Apr 2022 10:53:49 +0300 Subject: optional --- util/src/entities/Member.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/src/entities/Member.ts') diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index ae889a85..fe2d5590 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -109,8 +109,8 @@ export class Member extends BaseClassWithoutId { onDelete: "DO NOTHING", // do not auto-kick force-joined members just because their joiners left the server }) **/ - @Column({ nullable: true }) - joined_by: string; + @Column({ nullable: true}) + joined_by?: string; // TODO: add this when we have proper read receipts // @Column({ type: "simple-json" }) -- cgit 1.5.1