From 58d58928ec6a6d8cc0bb510f5ca348a3b834b3fe Mon Sep 17 00:00:00 2001 From: Iratu Date: Wed, 16 Feb 2022 21:23:50 +0000 Subject: Fix for Premium Since to show the 'Guild Boost' and store it correctly in the database --- util/src/entities/Member.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/src') diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index 0f7be2a7..3c5f9db0 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId { joined_at: Date; @Column({ nullable: true }) - premium_since?: number; + premium_since?: Date; @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: undefined, + premium_since: new Date(), deaf: false, mute: false, pending: false, -- cgit 1.5.1 From 46f77f8e380b3e377e72c4bdab3d888b903d00af Mon Sep 17 00:00:00 2001 From: Iratu Date: Wed, 16 Feb 2022 22:00:13 +0000 Subject: changed user.premium_since to also load from the database. --- api/assets/openapi.json | 4 ++++ api/src/routes/users/#id/profile.ts | 2 +- gateway/src/opcodes/Identify.ts | 2 ++ util/src/entities/User.ts | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) (limited to 'util/src') diff --git a/api/assets/openapi.json b/api/assets/openapi.json index 33118b4b..1af0600d 100644 --- a/api/assets/openapi.json +++ b/api/assets/openapi.json @@ -2821,6 +2821,10 @@ "type": "string", "format": "date-time" }, + "premium_since": { + "type": "string", + "format": "date-time" + }, "verified": { "type": "boolean" }, diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts index 06be66ae..4dbb84cf 100644 --- a/api/src/routes/users/#id/profile.ts +++ b/api/src/routes/users/#id/profile.ts @@ -39,7 +39,7 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }), res.json({ connected_accounts: user.connected_accounts, premium_guild_since: premium_guild_since, // TODO - premium_since: null, // TODO + premium_since: user.premium_since, // TODO mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true user: { username: user.username, diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts index f39ac808..904aa963 100644 --- a/gateway/src/opcodes/Identify.ts +++ b/gateway/src/opcodes/Identify.ts @@ -173,6 +173,7 @@ export async function onIdentify(this: WebSocket, data: Payload) { avatar: related_user.avatar, bot: related_user.bot, bio: related_user.bio, + premium_since: user.premium_since }; users.push(public_related_user); } @@ -225,6 +226,7 @@ export async function onIdentify(this: WebSocket, data: Payload) { accent_color: user.accent_color || 0, banner: user.banner, bio: user.bio, + premium_since: user.premium_since }; const d: ReadyEventData = { diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index f157ac39..1d18c838 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -16,6 +16,7 @@ export enum PublicUserEnum { banner, bio, bot, + premium_since, } export type PublicUserKeys = keyof typeof PublicUserEnum; @@ -110,6 +111,9 @@ export class User extends BaseClass { @Column() created_at: Date; // registration date + @Column({ nullable: true }) + premium_since: Date; // premium date + @Column({ select: false }) verified: boolean; // if the user is offically verified @@ -246,6 +250,7 @@ export class User extends BaseClass { id: Snowflake.generate(), bot: false, system: false, + premium_since: new Date(), desktop: false, mobile: false, premium: true, -- cgit 1.5.1 From 7cce144eabe89f1fc0e4ff9cc4deef68b8a077c3 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Fri, 4 Mar 2022 22:00:59 +0300 Subject: Initial work on public read receipts Progress on #416 --- util/src/entities/ReadState.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'util/src') diff --git a/util/src/entities/ReadState.ts b/util/src/entities/ReadState.ts index ebef89be..885b702e 100644 --- a/util/src/entities/ReadState.ts +++ b/util/src/entities/ReadState.ts @@ -33,6 +33,12 @@ export class ReadState extends BaseClass { @Column({ nullable: true }) last_message_id: string; + + @Column({ nullable: true }) + public_ack: string; + + @Column({ nullable: true }) + notifications_cursor: string; @Column({ nullable: true }) last_pin_timestamp?: Date; -- cgit 1.5.1 From 57fc690457acd2b1e1147cfa97fa42867b0d33a4 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Fri, 4 Mar 2022 22:12:24 +0300 Subject: document which field is which --- util/src/entities/ReadState.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'util/src') diff --git a/util/src/entities/ReadState.ts b/util/src/entities/ReadState.ts index 885b702e..e6d73105 100644 --- a/util/src/entities/ReadState.ts +++ b/util/src/entities/ReadState.ts @@ -31,12 +31,15 @@ export class ReadState extends BaseClass { }) user: User; + // fully read marker @Column({ nullable: true }) - last_message_id: string; + last_message_id: string; + // public read receipt @Column({ nullable: true }) public_ack: string; + // notification cursor / private read receipt @Column({ nullable: true }) notifications_cursor: string; -- cgit 1.5.1