From 4b5d22f17268419abf00b0621f2f833d895b1380 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 10 Apr 2021 13:10:44 -0500 Subject: [PATCH] Refactor account FQN with Pleroma BE field --- app/soapbox/utils/accounts.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/soapbox/utils/accounts.js b/app/soapbox/utils/accounts.js index 7e25f868c..7dc8b1cc5 100644 --- a/app/soapbox/utils/accounts.js +++ b/app/soapbox/utils/accounts.js @@ -16,13 +16,17 @@ export const getDomain = account => { return domain; }; -// user@domain even for local users -export const acctFull = account => { +export const guessFqn = account => { const [user, domain] = account.get('acct').split('@'); if (!domain) return [user, guessDomain(account)].join('@'); return account.get('acct'); }; +// user@domain even for local users +export const acctFull = account => { + return account.get('fqn') || guessFqn(account); +}; + export const isStaff = (account = ImmutableMap()) => ( [isAdmin, isModerator].some(f => f(account) === true) );