bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pl-fe: fallback for reply subtype

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-09-18 16:55:04 +02:00
parent b31b79b0df
commit 259199d5c3
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/pl-fe/src/features/notifications/components/notification.tsx
View file

@ -12,7 +12,7 @@ import { HStack, Text, Emoji } from 'pl-fe/components/ui';
import AccountContainer from 'pl-fe/containers/account-container'; import AccountContainer from 'pl-fe/containers/account-container';
import StatusContainer from 'pl-fe/containers/status-container'; import StatusContainer from 'pl-fe/containers/status-container';
import { HotKeys } from 'pl-fe/features/ui/components/hotkeys'; import { HotKeys } from 'pl-fe/features/ui/components/hotkeys';
import { useAppDispatch, useAppSelector, useInstance } from 'pl-fe/hooks'; import { useAppDispatch, useAppSelector, useInstance, useLoggedIn } from 'pl-fe/hooks';
import { makeGetNotification } from 'pl-fe/selectors'; import { makeGetNotification } from 'pl-fe/selectors';
import { useModalsStore } from 'pl-fe/stores'; import { useModalsStore } from 'pl-fe/stores';
import { NotificationType } from 'pl-fe/utils/notification'; import { NotificationType } from 'pl-fe/utils/notification';
@ -194,6 +194,7 @@ const Notification: React.FC<INotification> = (props) => {
const getNotification = useCallback(makeGetNotification(), []); const getNotification = useCallback(makeGetNotification(), []);
const { me } = useLoggedIn();
const { openModal } = useModalsStore(); const { openModal } = useModalsStore();
const notification = useAppSelector((state) => getNotification(state, props.notification)); const notification = useAppSelector((state) => getNotification(state, props.notification));
@ -289,6 +290,8 @@ const Notification: React.FC<INotification> = (props) => {
} }
}; };
const displayedType = notification.type === 'mention' && (notification.subtype === 'reply' || status.in_reply_to_account_id === me) ? 'reply' : notification.type;
const renderIcon = (): React.ReactNode => { const renderIcon = (): React.ReactNode => {
if (type === 'emoji_reaction' && notification.emoji) { if (type === 'emoji_reaction' && notification.emoji) {
return ( return (
@ -298,10 +301,10 @@ const Notification: React.FC<INotification> = (props) => {
className='h-4 w-4 flex-none' className='h-4 w-4 flex-none'
/> />
); );
} else if (icons[type]) { } else if (icons[displayedType]) {
return ( return (
<Icon <Icon
src={icons[type === 'mention' ? notification.subtype || type : type]!} src={icons[displayedType]!}
className='flex-none text-primary-600 dark:text-primary-400' className='flex-none text-primary-600 dark:text-primary-400'
/> />
); );
@ -371,13 +374,13 @@ const Notification: React.FC<INotification> = (props) => {
const targetName = notification.type === 'move' ? notification.target.acct : ''; const targetName = notification.type === 'move' ? notification.target.acct : '';
const message: React.ReactNode = account && typeof account === 'object' const message: React.ReactNode = account && typeof account === 'object'
? buildMessage(intl, type === 'mention' ? notification.subtype || type : type, accounts, targetName, instance.title) ? buildMessage(intl, displayedType, accounts, targetName, instance.title)
: null; : null;
const ariaLabel = ( const ariaLabel = (
notificationForScreenReader( notificationForScreenReader(
intl, intl,
intl.formatMessage(messages[type], { intl.formatMessage(messages[displayedType], {
name: account && typeof account === 'object' ? account.acct : '', name: account && typeof account === 'object' ? account.acct : '',
targetName, targetName,
}), }),