summary refs log tree commit diff
path: root/util/src/entities
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-03-12 13:07:16 +1100
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-03-12 13:07:16 +1100
commit6ffe277f2fa1c33eb4a63fdbb27c2c736b75b1af (patch)
tree8926074d0b0f2749fb945c815c2913150e4eb313 /util/src/entities
parentMerge branch 'master' into slowcord (diff)
parentUpdate Rights.ts (diff)
downloadserver-6ffe277f2fa1c33eb4a63fdbb27c2c736b75b1af.tar.xz
Merge branch 'master' into slowcord
Diffstat (limited to 'util/src/entities')
-rw-r--r--util/src/entities/Member.ts6
-rw-r--r--util/src/entities/User.ts2
2 files changed, 4 insertions, 4 deletions
diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts

index 3c5f9db0..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({ nullable: true }) - 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, diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 1d18c838..ed7bd4ce 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts
@@ -360,7 +360,7 @@ export interface UserSettings { render_reactions: boolean; restricted_guilds: string[]; show_current_game: boolean; - status: "online" | "offline" | "dnd" | "idle"; + status: "online" | "offline" | "dnd" | "idle" | "invisible"; stream_notifications_enabled: boolean; theme: "dark" | "white"; // dark timezone_offset: number; // e.g -60