From 0939236cc0aed4449621040d00a917c05efb3cef Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Sat, 6 May 2023 01:11:37 -0400 Subject: [PATCH] remove display_name --- assets/openapi.json | Bin 576003 -> 574762 bytes assets/schemas.json | Bin 18409703 -> 18377081 bytes .../channels/#channel_id/messages/index.ts | 5 ++--- src/api/routes/guilds/#guild_id/bans.ts | 1 - .../guilds/#guild_id/messages/search.ts | 1 - src/api/routes/oauth2/authorize.ts | 3 --- src/api/routes/users/#id/relationships.ts | 1 - src/connections/Discord/index.ts | 10 ++++++---- src/util/dtos/UserDTO.ts | 7 +++---- src/util/entities/User.ts | 8 +------- .../schemas/responses/GuildBansResponse.ts | 3 +-- .../responses/GuildWidgetJsonResponse.ts | 3 +-- .../responses/UserRelationsResponse.ts | 1 - src/util/util/email/index.ts | 2 -- 14 files changed, 14 insertions(+), 31 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index d1796bbdef491193990912dc8c25a4cb72426106..7132ad932a235fc506d061c03f779a02f24cebb3 100644 GIT binary patch delta 534 zcmZvZPiPZC6vml-v)#mEO%_p`EXlSxBn|insX{?Z6}0L_j};59P$&ekLG+-I8jvbh zQ0XiERD^C1UIb-f(Y2x^H$8~iR;gl(25;VS^4NAqFeeWm%zQKN&F_74b2j&EI_LQ> zQLWP$ycgtP-j;m`H^d;GEDHy%d9BEf9D(~qJof9ar?+cYE+F|(%ksYDVGJD;cTsy! z2XUrX7Wqc4lkMlb{KZc(0ml_-9(>mc_XF*O^IaJJ@$jcm^$Q!+4R2M8`+JsG)`RHv zkU0D{tXd7gt56T0x6<4Z!_ORk$8CP_2-TW<%^&Uiy}) zy)xMo=om9xZGF4K>jb delta 707 zcmaJ zio+$J^q~$$ClRyC@?n|5C;_!y=d++ytzxR9Z<%)Ul zq3N{RtbBd`c59~1TvmL4O$x z$ql4(c2*b55ky=l`{@505E_nxehTb81WK7iAD#pHw))>`(wGobZ*zAP)G*vE`fn#Dve>FhADQI4%%dx<>57N=blH3nv(qaJ7v%E{xp8fWF&*5V7ym@LA4Z4~sGbUX6$TgZs!5w8|&XCyX+qxdRDasjfbP zR*^dj#%#qyw>%h!=bNP0E9@9vR&`Uy-^R;oNy>yeJaq5FIy0IRKovJ!M55~_-NzdM zrLf_ltF==i(aZ)YI-AInr$yk^W_xx-XD*s2q}gWtf+jvtbUwM$H>(_tf@nrZrQ)H# z7dKagm)g6#=Xc_vufDh-4NsZ$mY9a`(8{t!73+a!YGilxlFew!K-}sccaonOC&Jsg zMx2V*<)Ml1_w=JoG78*HQ9K1kNpsqCAbpM)@@8et9}W;QFM#5USkEu)$&!4g&Smd^wD6OAc}V zCISQFHxa(#2>T!P_>X_@9p^UeHHpyAhrFdS?`FVm(+|xt++s1W`TI0)`}aSTop4nE zuAz0Y$l8qJZFptb=5>-!jK@nl&;|gMf`h?^~bXp$j*h-h_wln|pRXk|zkXP*ET131-`jG`c;S0+ZjFG7aL& znC5+Kj-aZia+k# z@6Gn2F%nW^ZT^sf^rPM?aD+(%Ky8Q_4;h8h#o6s1Bi}p*l3}p{VEaep4a(!qQpl)N z=)iC^SPG5`x)Qx1C4KehD++MRPoO1Beagy_wu2PiI`vXI3k(X@kbX_qMqLttrJF_d zb1q#rA2$g^-sHPhvg~28V_kaa8-_0+lf{)eY?D|kg|Y#aB5S~aPf4Hwl*dsy*Wc`X5Nz~EMm~}G9Y1yd+vGx=Rou`H5p(EvGmQ_5a7|C|H+Oj(b1WYZ`5Gee#N_S=elJQXZM=wRpMl^V! ruaa`gxD#Aa3Df=sAuS3s delta 17884 zcmds;c~BE~6vt=7W)leEz6=pk7(m4X9fJWy!BOjhh$0p1F=)|(as*URyrM#7uqs0J zfe66^>D*ha_Bvj>4!GJBoST6DGFbs;~0cE;mt^U`4AJhMKlKt&|_Py_WzxUhU z+Ye1$!sm_MLQUVVv@&|bE)uYDg3_Lj+z=Z92X+Y8g05F^o#+>)9HGGfk04XKtSo!s0wehgkayZ?BM(t()CE(C4&C*&b%- zu{!&`rzv?{GrkI&gs>!~*a?HAc}&j7&g7&j)T_P-J4D83PD??DSlBQfePSh-hP;c> zh1u`v(~d68=x=8>p+mH$`Q>BhZpeQbASTY&=R83-2TP(yhcI@S7lb~6y#9JYAbOm( zCN6w;4mo#2LtCH_W~`H(g3en`$&gY1!4WbRZKpw3Yh6BT$KTNByG zw`O2#0ybB;d4lrxMn%?~M5inje-eaiWB6G*i7ogOS_;ajkVT}gGDeC`N-p-qrJzGp zOA;QULnsz)??#8Xnw0nq9b!h&&V1||fGAs&qp^!Kk|f-_4ci@ANftIF$9q4%IPEtb z_#53Nr9T}S#GdJZg%FUy>eLu)agdd74tHQfaGPHbT+-cnf(Wk50pfQv$JBkzHdF%0 zhBi5zEO5P`R^5StTC^S56Z>F1ynN~rJs7lpexqXon1Bvp@0@U zL2&9S26VL81(fm|3}~E1&Y2VqUafiF(8*gl0aUu6@!<8GedB2nPxC>u#ME`AUTY+lv3nvI4k_kaC zrybQ9i+Pk2#2xhuBdS01tVV~4r?zvG_f~`(TRpm|Wl^faFt2@B;=mXn)Z^$U5Pg6IBfs$)+l2e&Ctf8-8X9`|5 zA~VR7x=UeMX`K)06eU!;bB8?TV&%(>hAt;WtX+zSVY2}-o1mZIs-_pRl_}O5HiJIe;*wp zC#H$UmOoMC{{9i&67{vsL+B6@11s&p{GqUyT2K| z%XnPeTl}J;=FB@i_R5+o?7i=O@Ea8*!1e { diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index ede9f4bde..87fcc7f17 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -71,7 +71,6 @@ router.get( username: user.username, discriminator: user.discriminator, global_name: user.global_name, - display_name: user.display_name, id: user.id, avatar: user.avatar, public_flags: user.public_flags, diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index bf5fc4cd4..158c83f31 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -150,7 +150,6 @@ router.get( avatar_decoration: null, discriminator: x.author?.discriminator, global_name: x.author?.global_name, - display_name: x.author?.display_name, public_flags: x.author?.public_flags, }, attachments: x.attachments, diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index 11255b98f..b7d1cb71b 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -90,7 +90,6 @@ router.get( "avatar", "discriminator", "global_name", - "display_name", "public_flags", ], }); @@ -140,7 +139,6 @@ router.get( avatar_decoration: null, // TODO discriminator: user.discriminator, global_name: user.global_name, - display_name: user.display_name, public_flags: user.public_flags, }, application: { @@ -164,7 +162,6 @@ router.get( avatar_decoration: null, // TODO discriminator: bot.discriminator, global_name: bot.global_name, - display_name: bot.display_name, public_flags: bot.public_flags, bot: true, approximated_guild_count: 0, // TODO diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index 0008e75d0..323ce44b5 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -59,7 +59,6 @@ router.get( avatar: relation_user.avatar, discriminator: relation_user.discriminator, global_name: relation_user.global_name, - display_name: relation_user.display_name, public_flags: relation_user.public_flags, }); } diff --git a/src/connections/Discord/index.ts b/src/connections/Discord/index.ts index 206aa6719..a88a38ce2 100644 --- a/src/connections/Discord/index.ts +++ b/src/connections/Discord/index.ts @@ -17,6 +17,7 @@ */ import { + Config, ConnectedAccount, ConnectedAccountCommonOAuthTokenResponse, Connection, @@ -31,8 +32,7 @@ interface UserResponse { id: string; username: string; discriminator: string; - global_name: string; - display_name?: string; + global_name: string | null; avatar_url: string | null; } @@ -130,12 +130,14 @@ export default class DiscordConnection extends Connection { if (exists) return null; - // TODO: pomelo + const { pomeloEnabled } = Config.get().general; return await this.createConnection({ user_id: userId, external_id: userInfo.id, friend_sync: params.friend_sync, - name: `${userInfo.username}#${userInfo.discriminator}`, + name: pomeloEnabled + ? userInfo.username + : `${userInfo.username}#${userInfo.discriminator}`, type: this.id, }); } diff --git a/src/util/dtos/UserDTO.ts b/src/util/dtos/UserDTO.ts index 5687bcefb..063490fa4 100644 --- a/src/util/dtos/UserDTO.ts +++ b/src/util/dtos/UserDTO.ts @@ -21,8 +21,7 @@ import { User } from "../entities"; export class MinimalPublicUserDTO { id: string; username: string; - global_name: string; - display_name?: string; + global_name: string | null = null; discriminator: string; public_flags: number; avatar?: string | null; @@ -30,10 +29,10 @@ export class MinimalPublicUserDTO { constructor(user: User) { this.id = user.id; this.username = user.username; - this.global_name = user.global_name; - this.display_name = user.display_name; this.discriminator = user.discriminator; this.public_flags = user.public_flags; this.avatar = user.avatar; + + if (user.global_name) this.global_name = user.global_name; } } diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index 85dc56ee2..c1a05e516 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -38,7 +38,6 @@ import { UserSettings } from "./UserSettings"; export enum PublicUserEnum { username, global_name, - display_name, discriminator, id, public_flags, @@ -93,10 +92,7 @@ export class User extends BaseClass { username: string; // username max length 32, min 2 (should be configurable) @Column({ nullable: true }) - global_name: string; // puyo: pomelo - - @Column({ nullable: true }) - display_name?: string; // puyo: pomelo + global_name?: string; // puyo: pomelo @Column() discriminator: string; // opaque string: 4 digits on discord.com, 0 for pomelo @@ -388,8 +384,6 @@ export class User extends BaseClass { const user = User.create({ username: username, - global_name: username, // TODO: convert to lowercase, strip special characters,etc??? - // display_name: username, // TODO: how should we do this? discriminator, id: id || Snowflake.generate(), email: email, diff --git a/src/util/schemas/responses/GuildBansResponse.ts b/src/util/schemas/responses/GuildBansResponse.ts index aa53105d2..0505327a5 100644 --- a/src/util/schemas/responses/GuildBansResponse.ts +++ b/src/util/schemas/responses/GuildBansResponse.ts @@ -21,8 +21,7 @@ export interface GuildBansResponse { user: { username: string; discriminator: string; - global_name: string; - display_name: string | null; + global_name?: string; id: string; avatar: string | null; public_flags: number; diff --git a/src/util/schemas/responses/GuildWidgetJsonResponse.ts b/src/util/schemas/responses/GuildWidgetJsonResponse.ts index 60e8e7cc7..320f14dde 100644 --- a/src/util/schemas/responses/GuildWidgetJsonResponse.ts +++ b/src/util/schemas/responses/GuildWidgetJsonResponse.ts @@ -30,8 +30,7 @@ export interface GuildWidgetJsonResponse { members: { id: string; username: string; - global_name: string; - display_name: string | null; + global_name: string | null; discriminator: string; avatar: string | null; status: ClientStatus; diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/util/schemas/responses/UserRelationsResponse.ts index 59db277f6..586c8fac9 100644 --- a/src/util/schemas/responses/UserRelationsResponse.ts +++ b/src/util/schemas/responses/UserRelationsResponse.ts @@ -20,7 +20,6 @@ import { User } from "@spacebar/util"; export type UserRelationsResponse = (Pick & Pick & Pick & - Pick & Pick & Pick & Pick)[]; diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index 6d34e2349..b7df5cb94 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -112,12 +112,10 @@ export const Email: { ) { const { instanceName } = Config.get().general; - // TODO: pomelo: display_name should take precedence over username if pomelo is enabled. maybe we should use global_name as the username? const replacements = [ ["{instanceName}", instanceName], ["{userUsername}", user.username], ["{userGlobalName}", user.global_name], - ["{userDisplayName}", user.display_name], ["{userDiscriminator}", user.discriminator], ["{userId}", user.id], ["{phoneNumber}", user.phone?.slice(-4)],