pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-17 21:15:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): apply streamer mode to member nicknames and stop guild scope leaking into global surfaces (#1697)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-08-17 14:58:56 +02:00
1 parent 3fa766c39c
commit 3ff7189566
32 files changed
+82 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/app/components/dialogs/shared/RecipientList.tsx
+3 -2
View File
@@ -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);
fluxer_app/src/features/app/components/floating/UserAreaPopout.tsx
+1 -1
View File
@@ -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<HTMLDivElement | null>(null);
fluxer_app/src/features/app/components/layout/UserArea.tsx
+1 -1
View File
@@ -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 (
<section
className={wrapperClassName}
fluxer_app/src/features/app/components/shared/FriendSelector.tsx
+9 -7
View File
@@ -81,7 +81,7 @@ export const FriendSelector: React.FC<FriendSelectorProps> = 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<FriendSelectorProps> = 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<string, Array<User>> = {};
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<FriendSelectorProps> = observer(
data-flx="app.friend-selector.render-search-input.selected-pill"
>
<Avatar user={user} size={16} data-flx="app.friend-selector.render-search-input.avatar" />
<span data-flx="app.friend-selector.render-search-input.span">{NicknameUtils.getNickname(user)}</span>
<span data-flx="app.friend-selector.render-search-input.span">
{NicknameUtils.getNickname(user, null)}
</span>
<FocusRing offset={-2} data-flx="app.friend-selector.render-search-input.focus-ring">
<button
type="button"
onClick={() => handleRemovePill(userId)}
className={styles.removeButton}
aria-label={i18n._(REMOVE_DESCRIPTOR, {
displayName: NicknameUtils.getNickname(user),
displayName: NicknameUtils.getNickname(user, null),
})}
data-flx="app.friend-selector.render-search-input.remove-button.remove-pill"
>
@@ -252,7 +254,7 @@ export const FriendSelector: React.FC<FriendSelectorProps> = observer(
data-flx="app.friend-selector.status-aware-avatar"
/>
<span className={styles.friendName} data-flx="app.friend-selector.friend-name">
{NicknameUtils.getNickname(user)}
{NicknameUtils.getNickname(user, null)}
</span>
</div>
<div className={styles.checkboxContainer} data-flx="app.friend-selector.checkbox-container">
@@ -306,7 +308,7 @@ export const FriendSelector: React.FC<FriendSelectorProps> = observer(
data-flx="app.friend-selector.status-aware-avatar--2"
/>
<span className={styles.friendName} data-flx="app.friend-selector.friend-name--2">
{NicknameUtils.getNickname(user)}
{NicknameUtils.getNickname(user, null)}
</span>
</div>
<div
fluxer_app/src/features/channel/components/ChannelMembers.tsx
+6 -2
View File
@@ -487,7 +487,9 @@ const LazyMemberList = observer(function LazyMemberList({guild, channel}: LazyMe
continue;
}
const user = member.user;
const displayName = member.nick ?? NicknameUtils.getNickname(user, guild.id);
const displayName = member.nick
? NicknameUtils.formatNicknameForStreamerMode(member.nick)
: NicknameUtils.getNickname(user, guild.id);
const status = resolveMemberListPresence({guildId: guild.id, channelId: channel.id, userId: user.id});
const customStatus = resolveMemberListCustomStatus({
guildId: guild.id,
@@ -599,7 +601,9 @@ const LazyMemberList = observer(function LazyMemberList({guild, channel}: LazyMe
continue;
}
const user = member.user;
const displayName = member.nick ?? NicknameUtils.getNickname(user, guild.id);
const displayName = member.nick
? NicknameUtils.formatNicknameForStreamerMode(member.nick)
: NicknameUtils.getNickname(user, guild.id);
const status = resolveMemberListPresence({guildId: guild.id, channelId: channel.id, userId: user.id});
const customStatus = resolveMemberListCustomStatus({
guildId: guild.id,
fluxer_app/src/features/channel/components/bottomsheets/ChannelDetailsBottomSheet.tsx
+1 -1
View File
@@ -305,7 +305,7 @@ export const ChannelDetailsBottomSheet: React.FC<ChannelDetailsBottomSheetProps>
<ConfirmModal
title={i18n._(CLOSE_DM_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_CLOSE_YOUR_DESCRIPTOR, {
recipientUsername: recipient ? NicknameUtils.getNickname(recipient) : '',
recipientUsername: recipient ? NicknameUtils.getNickname(recipient, null) : '',
})}
primaryText={i18n._(CLOSE_DM_DESCRIPTOR)}
primaryVariant="danger"
fluxer_app/src/features/channel/components/bottomsheets/ChannelDetailsBottomSheetMemberList.tsx
+3 -1
View File
@@ -129,7 +129,9 @@ export const MobileMemberListItem = observer(
const handleLongPress = useCallback(() => {
onLongPress?.(member);
}, [member, onLongPress]);
const displayName = member.nick ?? NicknameUtils.getNickname(member.user, guild.id);
const displayName = member.nick
? NicknameUtils.formatNicknameForStreamerMode(member.nick)
: NicknameUtils.getNickname(member.user, guild.id);
const avatarUrl = useMemo(
() =>
AvatarUtils.getGuildMemberDisplayAvatarURL({
fluxer_app/src/features/channel/components/channel_view/DMChannelView.tsx
+1 -1
View File
@@ -491,7 +491,7 @@ export const DMChannelView = observer(({channelId}: DMChannelViewProps) => {
) : isDM && isRecipientBlocked && recipient ? (
<BlockedUserBarrier
userId={recipient.id}
username={NicknameUtils.getNickname(recipient)}
username={NicknameUtils.getNickname(recipient, null)}
data-flx="channel.channel-view.dm-channel-view.blocked-user-barrier"
/>
) : isCurrentUserUnclaimed && isDM && !isPersonalNotes && !isGroupDM ? (
fluxer_app/src/features/channel/components/channel_view/dm_channel_view/CallParticipantsRow.tsx
+2 -2
View File
@@ -72,7 +72,7 @@ export const CallParticipantsRow = observer(
event.preventDefault();
event.stopPropagation();
const participantEntry = participantEntryByUserId.get(user.id);
const participantName = NicknameUtils.getNickname(user, channel.guildId ?? undefined, channel.id) || user.id;
const participantName = NicknameUtils.getNickname(user, channel.guildId ?? null, channel.id) || user.id;
ContextMenuCommands.openFromEvent(event, ({onClose}) =>
participantEntry ? (
<VoiceParticipantContextMenu
@@ -155,7 +155,7 @@ export const CallParticipantsRow = observer(
>
{participants.map(({user, isRinging}) => {
const participantEntry = participantEntryByUserId.get(user.id);
const displayName = NicknameUtils.getNickname(user, channel.guildId ?? undefined, channel.id);
const displayName = NicknameUtils.getNickname(user, channel.guildId ?? null, channel.id);
return (
<motion.button
type="button"
fluxer_app/src/features/channel/components/direct_message/useDMListItemHandlers.tsx
+1 -1
View File
@@ -175,7 +175,7 @@ export function useDMListItemHandlers({
closeAllSheets();
}, [channel.id, closeAllSheets]);
const handleCloseDm = useCallback(() => {
const username = recipient ? NicknameUtils.getNickname(recipient) : '';
const username = recipient ? NicknameUtils.getNickname(recipient, null) : '';
const description = isGroupDM
? i18n._(ARE_YOU_SURE_YOU_WANT_TO_CLOSE_THIS_DESCRIPTOR)
: i18n._(ARE_YOU_SURE_YOU_WANT_TO_CLOSE_YOUR_DESCRIPTOR, {username});
fluxer_app/src/features/channel/components/friends/FriendListItem.tsx
+1 -1
View File
@@ -367,7 +367,7 @@ export const FriendListItem: React.FC<FriendListItemProps> = observer((props) =>
<div className={styles.friendDetails} data-flx="channel.friends.friend-list-item.friend-details">
<div className={styles.friendNameRow} data-flx="channel.friends.friend-list-item.friend-name-row">
<span className={styles.friendName} data-flx="channel.friends.friend-list-item.friend-name">
{NicknameUtils.getNickname(user)}
{NicknameUtils.getNickname(user, null)}
</span>
<span className={styles.friendTag} data-flx="channel.friends.friend-list-item.friend-tag">
{NicknameUtils.formatTagForStreamerMode(user.tag)}
fluxer_app/src/features/channel/components/friends/MobileFriendRequestItem.tsx
+2 -2
View File
@@ -167,7 +167,7 @@ export const MobileFriendRequestItem: React.FC<MobileFriendRequestItemProps> = o
/>
<div className={styles.userInfo} data-flx="channel.friends.mobile-friend-request-item.user-info">
<span className={styles.userName} data-flx="channel.friends.mobile-friend-request-item.user-name">
{NicknameUtils.getNickname(user)}
{NicknameUtils.getNickname(user, null)}
</span>
<span className={styles.requestStatus} data-flx="channel.friends.mobile-friend-request-item.request-status">
{statusText}
@@ -179,7 +179,7 @@ export const MobileFriendRequestItem: React.FC<MobileFriendRequestItemProps> = o
onClick={() => setMenuOpen(true)}
className={styles.actionButton}
aria-label={i18n._(FRIEND_REQUEST_ACTIONS_FOR_DESCRIPTOR, {
displayName: NicknameUtils.getNickname(user),
displayName: NicknameUtils.getNickname(user, null),
})}
aria-haspopup="dialog"
data-flx="channel.friends.mobile-friend-request-item.action-button.set-menu-open"
fluxer_app/src/features/channel/components/friends/views/FriendsList.tsx
+2 -2
View File
@@ -70,7 +70,7 @@ export const FriendsList: React.FC<FriendsListProps> = observer(({showOnlineOnly
return true;
}
const user = Users.getUser(userId);
const nickname = user ? NicknameUtils.getNickname(user) : '';
const nickname = user ? NicknameUtils.getNickname(user, null) : '';
const username = user?.username ?? '';
return `${nickname} ${username}`.toLowerCase().includes(normalizedQuery);
};
@@ -84,7 +84,7 @@ export const FriendsList: React.FC<FriendsListProps> = observer(({showOnlineOnly
const userA = Users.getUser(a);
const userB = Users.getUser(b);
if (!userA || !userB) return 0;
return NicknameUtils.getNickname(userA).localeCompare(NicknameUtils.getNickname(userB));
return NicknameUtils.getNickname(userA, null).localeCompare(NicknameUtils.getNickname(userB, null));
});
const reportedTab = showOnlineOnly ? SkeletonFriendsTab.ONLINE : SkeletonFriendsTab.ALL;
useEffect(() => {
fluxer_app/src/features/channel/components/friends/views/PendingFriendsView.tsx
+2 -2
View File
@@ -68,7 +68,7 @@ export const PendingFriendsView: React.FC<PendingFriendsViewProps> = observer(
return true;
}
const user = Users.getUser(userId);
const nickname = user ? NicknameUtils.getNickname(user) : '';
const nickname = user ? NicknameUtils.getNickname(user, null) : '';
const username = user?.username ?? '';
return `${nickname} ${username}`.toLowerCase().includes(normalizedQuery);
};
@@ -77,7 +77,7 @@ export const PendingFriendsView: React.FC<PendingFriendsViewProps> = observer(
const userA = Users.getUser(a.id);
const userB = Users.getUser(b.id);
if (!userA || !userB) return 0;
return NicknameUtils.getNickname(userA).localeCompare(NicknameUtils.getNickname(userB));
return NicknameUtils.getNickname(userA, null).localeCompare(NicknameUtils.getNickname(userB, null));
});
const visibleIncoming = sortByDisplayName(
hasSearch ? incomingRequests.filter((request) => matchesSearch(request.id)) : incomingRequests,
fluxer_app/src/features/channel/components/guild_members_page/MemberTableRow.tsx
+1 -1
View File
@@ -268,7 +268,7 @@ export const MemberTableRow: React.FC<MemberTableRowProps> = observer(
},
[topRole],
);
const displayName = member?.nick ?? data.nickname ?? data.displayName;
const displayName = NicknameUtils.formatNicknameForStreamerMode(member?.nick || data.nickname || data.displayName);
const tag = user?.tag ?? data.tag;
return (
<div
fluxer_app/src/features/channel/components/guild_members_page/SearchApi.ts
+3 -1
View File
@@ -13,6 +13,7 @@ import GuildMembers from '@app/features/member/state/GuildMembers';
import {http} from '@app/features/platform/transport/RestTransport';
import {Logger} from '@app/features/platform/utils/AppLogger';
import Users from '@app/features/user/state/Users';
import * as NicknameUtils from '@app/features/user/utils/NicknameUtils';
import {extractTimestampFromSnowflakeAsDate} from '@fluxer/snowflake/src/SnowflakeUtils';
export const logger = new Logger('GuildMembersPage');
@@ -27,7 +28,8 @@ export async function searchGuildMembers(guildId: string, params: SearchParams):
export function toMemberDisplayData(searchMember: SearchableGuildMember, guildId: string): MemberDisplayData {
const user = Users.getUser(searchMember.user_id);
const member = GuildMembers.getMember(guildId, searchMember.user_id);
const displayName = member?.nick ?? searchMember.nickname ?? searchMember.global_name ?? searchMember.username;
const resolvedName = member?.nick || searchMember.nickname || searchMember.global_name || searchMember.username;
const displayName = NicknameUtils.formatNicknameForStreamerMode(resolvedName);
const tag = user ? user.tag : `${searchMember.username}#${searchMember.discriminator}`;
return {
userId: searchMember.user_id,
fluxer_app/src/features/relationship/utils/FriendsListUtils.tsx
+4 -4
View File
@@ -63,14 +63,14 @@ const useFriendGroups = (friendIds: Array<string>, searchQuery: string) => {
const user = Users.getUser(userId);
if (!user) return false;
if (!searchQuery) return true;
const nickname = NicknameUtils.getNickname(user).toLowerCase();
const nickname = NicknameUtils.getNickname(user, null).toLowerCase();
return nickname.includes(searchQuery.toLowerCase());
});
const groups: Record<string, Array<string>> = {};
for (const userId of filtered) {
const user = Users.getUser(userId);
if (!user) continue;
const firstLetter = NicknameUtils.getNickname(user)[0].toUpperCase();
const firstLetter = NicknameUtils.getNickname(user, null)[0].toUpperCase();
if (!groups[firstLetter]) {
groups[firstLetter] = [];
}
@@ -81,7 +81,7 @@ const useFriendGroups = (friendIds: Array<string>, searchQuery: string) => {
const userA = Users.getUser(a);
const userB = Users.getUser(b);
if (!userA || !userB) return 0;
return NicknameUtils.getNickname(userA).localeCompare(NicknameUtils.getNickname(userB));
return NicknameUtils.getNickname(userA, null).localeCompare(NicknameUtils.getNickname(userB, null));
});
}
const groupArray: Array<FriendGroup> = Object.keys(groups)
@@ -143,7 +143,7 @@ const FriendItem = observer(({userId}: {userId: string}) => {
className={styles.friendItemName}
data-flx="relationship.friends-list-utils.friend-item.friend-item-name"
>
{NicknameUtils.getNickname(user)}
{NicknameUtils.getNickname(user, null)}
</div>
{statusLabel && (
<div
fluxer_app/src/features/relationship/utils/RelationshipActionUtils.tsx
+5 -5
View File
@@ -184,7 +184,7 @@ export function showSendFriendRequestConfirmation(i18n: I18n, user: User): void
<ConfirmModal
title={i18n._(ADD_FRIEND_DESCRIPTOR)}
description={i18n._(SEND_A_FRIEND_REQUEST_TO_OR_USE_THE_DESCRIPTOR, {
userName: NicknameUtils.getNickname(user),
userName: NicknameUtils.getNickname(user, null),
})}
primaryText={i18n._(ADD_FRIEND_DESCRIPTOR)}
onPrimary={async (staffForceAccept) => {
@@ -225,7 +225,7 @@ export function showAcceptFriendRequestConfirmation(
<ConfirmModal
title={i18n._(ACCEPT_FRIEND_REQUEST_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_ACCEPT_THE_DESCRIPTOR, {
userName: NicknameUtils.getNickname(user),
userName: NicknameUtils.getNickname(user, null),
})}
primaryText={i18n._(ACCEPT_FRIEND_REQUEST_ACTION_DESCRIPTOR)}
primaryVariant="primary"
@@ -273,7 +273,7 @@ export function showRemoveFriendConfirmation(
<ConfirmModal
title={i18n._(REMOVE_FRIEND_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_REMOVE_AS_DESCRIPTOR, {
userName: NicknameUtils.getNickname(user),
userName: NicknameUtils.getNickname(user, null),
})}
primaryText={i18n._(REMOVE_FRIEND_DESCRIPTOR)}
primaryVariant="danger"
@@ -307,7 +307,7 @@ export function showBlockUserConfirmation(i18n: I18n, user: User, options: Relat
<ConfirmModal
title={i18n._(BLOCK_USER_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_BLOCK_THEY_DESCRIPTOR, {
userName: NicknameUtils.getNickname(user),
userName: NicknameUtils.getNickname(user, null),
})}
primaryText={i18n._(BLOCK_DESCRIPTOR)}
primaryVariant="danger"
@@ -345,7 +345,7 @@ export function showUnblockUserConfirmation(
<ConfirmModal
title={i18n._(UNBLOCK_USER_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_UNBLOCK_DESCRIPTOR, {
userName: NicknameUtils.getNickname(user),
userName: NicknameUtils.getNickname(user, null),
})}
primaryText={i18n._(UNBLOCK_USER_ACTION_DESCRIPTOR)}
primaryVariant="primary"
fluxer_app/src/features/search/state/QuickSwitcherCandidateBuilder.ts
+6 -4
View File
@@ -107,7 +107,7 @@ export function buildChannelCandidate(
const participantNames = channel.recipientIds
.map((recipientId) => {
const user = Users.getUser(recipientId);
return user ? NicknameUtils.getNickname(user) : null;
return user ? NicknameUtils.getNickname(user, null) : null;
})
.filter(Boolean) as Array<string>;
const subtitle = participantNames.length > 0 ? participantNames.join(', ') : i18n._(GROUP_MESSAGE_DESCRIPTOR);
@@ -233,7 +233,7 @@ export function buildCandidateSets(i18n: I18n): CandidateSets {
}
const user = relationship.user;
if (!userCandidates.has(user.id)) {
const title = NicknameUtils.getNickname(user);
const title = NicknameUtils.getNickname(user, null);
const subtitle = NicknameUtils.formatUserTagForStreamerMode(user);
const searchValues = [title, subtitle, user.username, user.id].filter(Boolean);
userCandidates.set(user.id, {
@@ -251,7 +251,7 @@ export function buildCandidateSets(i18n: I18n): CandidateSets {
for (const user of Users.getUsers()) {
if (user.id === currentUserId) continue;
if (!userCandidates.has(user.id)) {
const title = NicknameUtils.getNickname(user);
const title = NicknameUtils.getNickname(user, null);
const subtitle = NicknameUtils.formatUserTagForStreamerMode(user);
const searchValues = [title, subtitle, user.username, user.id].filter(Boolean);
userCandidates.set(user.id, {
@@ -272,7 +272,9 @@ export function buildCandidateSets(i18n: I18n): CandidateSets {
for (const member of guildMembers) {
if (member.user.id === currentUserId) continue;
if (!userCandidates.has(member.user.id)) {
const title = member.nick ?? NicknameUtils.getNickname(member.user);
const title = member.nick
? NicknameUtils.formatNicknameForStreamerMode(member.nick)
: NicknameUtils.getNickname(member.user, member.guildId);
const subtitle = NicknameUtils.formatUserTagForStreamerMode(member.user);
const searchValues = [title, subtitle, member.user.username, member.user.id, member.nick].filter(
Boolean,
fluxer_app/src/features/search/state/QuickSwitcherResultGenerators.ts
+3 -1
View File
@@ -235,7 +235,9 @@ function buildUserCandidatesWithMemberSearch(
}
function createUserCandidateFromMember(member: GuildMember): UserCandidate {
const title = member.nick ?? NicknameUtils.getNickname(member.user);
const title = member.nick
? NicknameUtils.formatNicknameForStreamerMode(member.nick)
: NicknameUtils.getNickname(member.user, member.guildId);
const subtitle = NicknameUtils.formatUserTagForStreamerMode(member.user);
const searchValues = [title, subtitle, member.user.username, member.user.id, member.nick].filter(
Boolean,
fluxer_app/src/features/ui/action_menu/UserContextMenu.tsx
+1 -1
View File
@@ -197,7 +197,7 @@ export const UserContextMenu: React.FC<UserContextMenuProps> = observer(
)),
);
}, [channel, onClose, user]);
const userDisplayName = NicknameUtils.getNickname(user, channel?.guildId ?? undefined, channel?.id);
const userDisplayName = NicknameUtils.getNickname(user, channel?.guildId ?? null, channel?.id);
const handleRemoveFromGroup = useCallback(() => {
if (!channel) return;
ModalCommands.pushAfterBottomSheetClose(
fluxer_app/src/features/ui/action_menu/items/DMMenuData.tsx
+1 -1
View File
@@ -401,7 +401,7 @@ export function useDMMenuData(
<ConfirmModal
title={i18n._(CLOSE_DM_DESCRIPTOR)}
description={i18n._(ARE_YOU_SURE_YOU_WANT_TO_CLOSE_YOUR_DESCRIPTOR, {
recipientUsername: recipient ? NicknameUtils.getNickname(recipient) : '',
recipientUsername: recipient ? NicknameUtils.getNickname(recipient, null) : '',
})}
primaryText={i18n._(CLOSE_DM_DESCRIPTOR)}
primaryVariant="danger"
fluxer_app/src/features/ui/avatars/AvatarStack.tsx
+2 -2
View File
@@ -59,7 +59,7 @@ export const AvatarStack: React.FC<AvatarStackProps> = observer(
const childArray = React.Children.toArray(children).filter(Boolean);
const userChildren =
users?.map((user, index) => {
const displayName = NicknameUtils.getNickname(user, guildId ?? undefined, channelId ?? undefined);
const displayName = NicknameUtils.getNickname(user, guildId ?? null, channelId ?? undefined);
const avatarNode = renderAvatar?.(user, size, index) ?? (
<Avatar user={user} size={size} guildId={guildId ?? undefined} data-flx="ui.avatars.avatar-stack.avatar" />
);
@@ -118,7 +118,7 @@ export const AvatarStack: React.FC<AvatarStackProps> = observer(
} as React.CSSProperties;
const wrapWithContextMenu = (node: React.ReactNode, user: User, index: number) => {
if (!onUserContextMenu) return node;
const displayName = NicknameUtils.getNickname(user, guildId ?? undefined, channelId ?? undefined);
const displayName = NicknameUtils.getNickname(user, guildId ?? null, channelId ?? undefined);
return (
<div
className={styles.avatarContextMenuWrap}
fluxer_app/src/features/ui/components/Avatar.tsx
+1 -1
View File
@@ -206,7 +206,7 @@ const AvatarComponent = React.forwardRef<HTMLDivElement, AvatarProps>(
});
const safeHoverAvatarUrl = isAnimatedNeeded ? hoverAvatarUrl || undefined : undefined;
const normalizedStatusAttr = status != null ? normalizeStatus(status) : undefined;
const displayName = NicknameUtils.getNickname(user, guildId ?? undefined);
const displayName = NicknameUtils.getNickname(user, guildId ?? null);
const avatarRefs = useMemo(() => [ref, hoverRef], [ref, hoverRef]);
const mergedRef = useMergeRefs(avatarRefs);
return (
fluxer_app/src/features/user/components/popouts/UserProfilePopout.tsx
+3 -1
View File
@@ -174,7 +174,9 @@ export const UserProfilePopout: React.FC<UserProfilePopoutProps> = observer(
const handleClosePopout = useCallback(() => {
requestClose();
}, [requestClose]);
const displayName = guildMember?.nick ?? NicknameUtils.getNickname(user, guildId);
const displayName = guildMember?.nick
? NicknameUtils.formatNicknameForStreamerMode(guildMember.nick)
: NicknameUtils.getNickname(user, guildId);
const handleMessage = async () => {
try {
requestClose();
fluxer_app/src/features/user/components/profile/VoiceActivityCard.tsx
+2 -2
View File
@@ -206,7 +206,7 @@ export const VoiceActivityCard: React.FC<VoiceActivityCardProps> = observer(({ac
return i18n._(PARTICIPANTS_DESCRIPTOR);
}
const names = avatarStackUsers
.map((user) => NicknameUtils.getNickname(user, guildId ?? undefined, channelId ?? undefined))
.map((user) => NicknameUtils.getNickname(user, guildId ?? null, channelId ?? undefined))
.join(', ');
return i18n._(PARTICIPANTS_2_DESCRIPTOR, {names});
}, [avatarStackUsers, guildId, channelId, i18n.locale]);
@@ -421,7 +421,7 @@ const VoiceActivityContext: React.FC<VoiceActivityContextProps> = observer(({cha
const recipientId = channel.recipientIds.find((id) => id !== voiceState.user_id);
const recipientUser = recipientId ? Users.getUser(recipientId) : undefined;
if (recipientUser) {
const displayName = NicknameUtils.getNickname(recipientUser);
const displayName = NicknameUtils.getNickname(recipientUser, null);
return (
<button
type="button"
fluxer_app/src/features/user/utils/NicknameUtils.ts
+7 -3
View File
@@ -33,6 +33,12 @@ export function formatUserTagForStreamerMode(user: Pick<User, 'tag' | 'username'
return formatTagForStreamerMode(user.tag || `${user.username}#${user.discriminator}`);
}
export function formatNicknameForStreamerMode(nickname: string): string {
const resolved = formatNameForStreamerMode(nickname);
noteText(resolved);
return resolved;
}
export function getDisplayName(user: UserDisplayNameLike): string {
const name = formatNameForStreamerMode(
user.displayName || user.globalName || user.global_name || user.username || '',
@@ -60,7 +66,5 @@ export function getNickname(user: User, guildId?: string | null, channelId?: str
name = channel.nicks[user.id];
}
}
const resolved = formatNameForStreamerMode(name);
noteText(resolved);
return resolved;
return formatNicknameForStreamerMode(name);
}
fluxer_app/src/features/voice/components/VoiceParticipantAvatarList.tsx
+3 -3
View File
@@ -262,7 +262,7 @@ interface VoiceParticipantPopoutRowProps {
function VoiceParticipantPopoutRow({entry, guildId, channelId}: VoiceParticipantPopoutRowProps) {
const {i18n} = useLingui();
const displayName = NicknameUtils.getNickname(entry.user, guildId ?? undefined, channelId ?? undefined);
const displayName = NicknameUtils.getNickname(entry.user, guildId ?? null, channelId ?? undefined);
const participantName = displayName || i18n._(UNKNOWN_USER_DESCRIPTOR);
const {scheduleProfilePreload, cancelProfilePreload} = useUserProfileHoverPreload({
userId: entry.user.id,
@@ -405,7 +405,7 @@ export const VoiceParticipantSpeakingAvatarStack: React.FC<VoiceParticipantSpeak
event.stopPropagation();
const entry = sortedEntries[index];
if (!entry) return;
const displayName = NicknameUtils.getNickname(user, guildId ?? undefined, channelId ?? undefined);
const displayName = NicknameUtils.getNickname(user, guildId ?? null, channelId ?? undefined);
const participantName = displayName || i18n._(UNKNOWN_USER_DESCRIPTOR);
ContextMenuCommands.openFromEvent(event, ({onClose}) => (
<VoiceParticipantContextMenu
@@ -554,7 +554,7 @@ export const VoiceParticipantWrappedAvatarList: React.FC<VoiceParticipantWrapped
(event: React.MouseEvent<HTMLElement>, entry: VoiceParticipantAvatarEntry) => {
event.preventDefault();
event.stopPropagation();
const displayName = NicknameUtils.getNickname(entry.user, guildId ?? undefined, channelId ?? undefined);
const displayName = NicknameUtils.getNickname(entry.user, guildId ?? null, channelId ?? undefined);
const participantName = displayName || i18n._(UNKNOWN_USER_DESCRIPTOR);
ContextMenuCommands.openFromEvent(event, ({onClose}) => (
<VoiceParticipantContextMenu
fluxer_app/src/features/voice/components/VoiceParticipantSortUtils.ts
+1 -1
View File
@@ -44,7 +44,7 @@ function getUserDisplayName(userId: string, guildId?: string | null, channelId?:
if (!userId) return '';
const user = Users.getUser(userId);
if (!user) return '';
return NicknameUtils.getNickname(user, guildId ?? undefined, channelId ?? undefined) || '';
return NicknameUtils.getNickname(user, guildId ?? null, channelId ?? undefined) || '';
}
function buildSnapshotFallbackDisplayName(userId: string, participantKey: string): string {
fluxer_app/src/features/voice/components/pip_overlay/PiPOverlayInner.tsx
+1 -1
View File
@@ -169,7 +169,7 @@ const PiPOverlayInnerBase = observer(function PiPOverlayInnerBase({content, room
const {viewerUsers} = useStreamSpectators(isScreenShare ? streamKey : '', content.userId);
const displayName = useMemo(() => {
if (!participantUser) return '';
return NicknameUtils.getNickname(participantUser, content.guildId ?? undefined, content.channelId);
return NicknameUtils.getNickname(participantUser, content.guildId ?? null, content.channelId);
}, [participantUser, content.guildId, content.channelId]);
const disconnectLabel = i18n._(VOICE_DISCONNECT_DESCRIPTOR);
const channelName = channel?.name ?? '';
fluxer_app/src/features/voice/utils/TtsTextFormatter.ts
+1 -1
View File
@@ -85,7 +85,7 @@ function formatUserMention(userId: string, guildId: string | null, i18n: I18n):
if (!user) {
return i18n._(UNKNOWN_USER_DESCRIPTOR);
}
return NicknameUtils.getNickname(user, guildId ?? undefined);
return NicknameUtils.getNickname(user, guildId ?? null);
}
function formatRoleMention(roleId: string, guildId: string | null, i18n: I18n): string {
fluxer_app/src/features/voice/utils/VoiceTtsUtils.tsx
+2 -2
View File
@@ -438,7 +438,7 @@ function handleIncomingTtsMessage(message: Message): void {
if (!author) {
return;
}
const authorName = NicknameUtils.getNickname(author, channel.guildId ?? undefined);
const authorName = NicknameUtils.getNickname(author, channel.guildId ?? null);
if (!message.content.trim()) {
const description = describeNonTextContent(message, localI18n);
if (!description) {
@@ -457,7 +457,7 @@ function handleIncomingTtsMessage(message: Message): void {
if (ref.message) {
const replyAuthor = Users.getUser(ref.message.author.id);
if (replyAuthor) {
replyAuthorName = NicknameUtils.getNickname(replyAuthor, channel.guildId ?? undefined);
replyAuthorName = NicknameUtils.getNickname(replyAuthor, channel.guildId ?? null);
}
}
}