Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Premium Since to show the 'Guild Boost' and store it correctly in the database

Browse Source
This commit is contained in:
Iratu 2022-02-16 21:23:50 +00:00 committed by Erkin Alp Güney
parent 8ed310e0d3
commit 58d58928ec
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/routes/users/#id/profile.ts
View File

@ -16,21 +16,29 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }),
const user = await User.getPublicUser(req.params.id, { relations: ["connected_accounts"] }); const user = await User.getPublicUser(req.params.id, { relations: ["connected_accounts"] });
var mutual_guilds: object[] = []; var mutual_guilds: object[] = [];
var premium_guild_since;
const requested_member = await Member.find( { id: req.params.id, }) const requested_member = await Member.find( { id: req.params.id, })
const self_member = await Member.find( { id: req.user_id, }) const self_member = await Member.find( { id: req.user_id, })
for(const rmem of requested_member) { for(const rmem of requested_member) {
if(rmem.premium_since) {
if(premium_guild_since){
if(premium_guild_since > rmem.premium_since) {
premium_guild_since = rmem.premium_since;
}
} else {
premium_guild_since = rmem.premium_since;
}
}
for(const smem of self_member) { for(const smem of self_member) {
if (smem.guild_id === rmem.guild_id) { if (smem.guild_id === rmem.guild_id) {
mutual_guilds.push({id: rmem.guild_id, nick: rmem.nick}) mutual_guilds.push({id: rmem.guild_id, nick: rmem.nick})
} }
} }
} }
res.json({ res.json({
connected_accounts: user.connected_accounts, connected_accounts: user.connected_accounts,
premium_guild_since: null, // TODO premium_guild_since: premium_guild_since, // TODO
premium_since: null, // TODO premium_since: null, // TODO
mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true
user: { user: {

4
util/src/entities/Member.ts
View File

@ -86,7 +86,7 @@ export class Member extends BaseClassWithoutId {
joined_at: Date; joined_at: Date;
@Column({ nullable: true }) @Column({ nullable: true })
premium_since?: number; premium_since?: Date;
@Column() @Column()
deaf: boolean; deaf: boolean;
@ -245,7 +245,7 @@ export class Member extends BaseClassWithoutId {
nick: undefined, nick: undefined,
roles: [guild_id], // @everyone role roles: [guild_id], // @everyone role
joined_at: new Date(), joined_at: new Date(),
premium_since: undefined, premium_since: new Date(),
deaf: false, deaf: false,
mute: false, mute: false,
pending: false, pending: false,