diff --git a/fluxer_app/src/features/app/components/dialogs/shared/RecipientList.tsx b/fluxer_app/src/features/app/components/dialogs/shared/RecipientList.tsx index 8feef23dd..310abc6c2 100644 --- a/fluxer_app/src/features/app/components/dialogs/shared/RecipientList.tsx +++ b/fluxer_app/src/features/app/components/dialogs/shared/RecipientList.tsx @@ -138,7 +138,7 @@ export const RecipientList = observer((props: RecipientListProps) => { const query = searchQuery.toLowerCase(); return props.recipients.filter((item) => { const username = item.user.username.toLowerCase(); - const displayName = NicknameUtils.getNickname(item.user).toLowerCase(); + const displayName = NicknameUtils.getNickname(item.user, null).toLowerCase(); const channelName = (item.channelName || '').toLowerCase(); return username.includes(query) || displayName.includes(query) || channelName.includes(query); }); @@ -186,7 +186,8 @@ export const RecipientList = observer((props: RecipientListProps) => { const userId = item.type === 'group_dm' ? item.id : item.user.id; const isSending = props.sendingTo.has(userId); const isSent = props.sentTo.has(userId); - const displayName = item.type === 'group_dm' ? item.channelName : NicknameUtils.getNickname(item.user); + const displayName = + item.type === 'group_dm' ? item.channelName : NicknameUtils.getNickname(item.user, null); const secondaryText = (() => { if (item.type === 'dm') return i18n._(DIRECT_MESSAGE_DESCRIPTOR); if (item.type === 'group_dm') return i18n._(GROUP_DM_DESCRIPTOR); diff --git a/fluxer_app/src/features/app/components/floating/UserAreaPopout.tsx b/fluxer_app/src/features/app/components/floating/UserAreaPopout.tsx index 56fc0262f..9915897e5 100644 --- a/fluxer_app/src/features/app/components/floating/UserAreaPopout.tsx +++ b/fluxer_app/src/features/app/components/floating/UserAreaPopout.tsx @@ -518,7 +518,7 @@ export const UserAreaPopout = observer(() => { const accentColor = getUserAccentColor(currentUser, profileData?.accent_color); const borderColor = accentColor; const bannerColor = accentColor; - const displayName = currentUser ? NicknameUtils.getNickname(currentUser) : ''; + const displayName = currentUser ? NicknameUtils.getNickname(currentUser, null) : ''; const customStatus = currentUserId ? Presence.getCustomStatus(currentUserId) : null; const hasCustomStatus = Boolean(normalizeCustomStatus(customStatus)); const popoutContainerRef = useRef(null); diff --git a/fluxer_app/src/features/app/components/layout/UserArea.tsx b/fluxer_app/src/features/app/components/layout/UserArea.tsx index 2688c4651..ad73c43bc 100644 --- a/fluxer_app/src/features/app/components/layout/UserArea.tsx +++ b/fluxer_app/src/features/app/components/layout/UserArea.tsx @@ -243,7 +243,7 @@ const UserAreaInner = observer( if (isDeafened) return i18n._(VOICE_UNDEAFEN_SELF_DESCRIPTOR); return i18n._(VOICE_DEAFEN_SELF_DESCRIPTOR); })(); - const displayName = NicknameUtils.getNickname(user); + const displayName = NicknameUtils.getNickname(user, null); return (
= observer( return friends .map((relationship) => Users.getUser(relationship.id)) .filter((user): user is User => Boolean(user)) - .sort((a, b) => NicknameUtils.getNickname(a).localeCompare(NicknameUtils.getNickname(b))); + .sort((a, b) => NicknameUtils.getNickname(a, null).localeCompare(NicknameUtils.getNickname(b, null))); }, [relationships, excludeUserIds]); const activeStickyUserIds = useMemo(() => { return stickyUserIds.filter((id) => selectedUserIds.includes(id)); @@ -89,13 +89,13 @@ export const FriendSelector: React.FC = observer( const groupedFriends = useMemo(() => { const filtered = friendUsers.filter((user) => { if (!searchQuery) return true; - return NicknameUtils.getNickname(user).toLowerCase().includes(searchQuery.toLowerCase()); + return NicknameUtils.getNickname(user, null).toLowerCase().includes(searchQuery.toLowerCase()); }); const stickySet = new Set(activeStickyUserIds); const groups: Record> = {}; filtered.forEach((user) => { if (stickySet.has(user.id)) return; - const firstLetter = NicknameUtils.getNickname(user)[0].toUpperCase(); + const firstLetter = NicknameUtils.getNickname(user, null)[0].toUpperCase(); if (!groups[firstLetter]) { groups[firstLetter] = []; } @@ -153,14 +153,16 @@ export const FriendSelector: React.FC = observer( data-flx="app.friend-selector.render-search-input.selected-pill" > - {NicknameUtils.getNickname(user)} + + {NicknameUtils.getNickname(user, null)} +