mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'default-display-name' into 'develop' 

Show username when no display name is set

See merge request soapbox-pub/soapbox!2573
environments/review-develop-3zknud/deployments/3538
Alex Gleason 2023-06-27 16:22:02 +00:00
rodzic e58dada03a b8a3083e4d
commit 5883e43711
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/soapbox/schemas/account.ts
Wyświetl plik

@ -116,6 +116,7 @@ const transformAccount = <T extends TransformableAccount>({ pleroma, other_setti
value_plain: unescapeHTML(field.value),
}));
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
const domain = getDomain(account.url || account.uri);
if (pleroma) {
@ -127,8 +128,8 @@ const transformAccount = <T extends TransformableAccount>({ pleroma, other_setti
admin: pleroma?.is_admin || false,
avatar_static: account.avatar_static || account.avatar,
discoverable: account.discoverable || account.source?.pleroma?.discoverable || false,
display_name: account.display_name.trim().length === 0 ? account.username : account.display_name,
display_name_html: emojify(escapeTextContentForBrowser(account.display_name), customEmojiMap),
display_name: displayName,
display_name_html: emojify(escapeTextContentForBrowser(displayName), customEmojiMap),
domain,
fields: newFields,
fqn: account.fqn || (account.acct.includes('@') ? account.acct : `${account.acct}@${domain}`),