pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-18 05:25:40 +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/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 (