matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl-fe: don't display duplicated status info

Browse Source 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This commit is contained in:
nicole mikołajczyk
2026-02-07 23:17:01 +01:00
parent 6f5fe5d0db
commit aa43c2bd73
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/pl-fe/src/components/status.tsx
View File

@ -94,6 +94,7 @@ interface IStatus {
hoverable?: boolean;
variant?: 'default' | 'rounded' | 'slim';
showGroup?: boolean;
showInfo?: boolean;
fromBookmarks?: boolean;
fromHomeTimeline?: boolean;
className?: string;
@ -114,6 +115,7 @@ const Status: React.FC<IStatus> = (props) => {
hideActionBar,
variant = 'rounded',
showGroup = true,
showInfo = true,
fromBookmarks = false,
fromHomeTimeline = false,
className,
@ -253,6 +255,8 @@ const Status: React.FC<IStatus> = (props) => {
};
const statusInfo = useMemo(() => {
if (!showInfo) return null;
if (isReblog && showGroup && group) {
return (
<StatusInfo

5
packages/pl-fe/src/features/notifications/components/notification.tsx
View File

@ -390,6 +390,7 @@ const Notification: React.FC<INotification> = (props) => {
avatarSize={avatarSize}
contextType='notifications'
showGroup={false}
showInfo={false}
variant='slim'
/>
);
@ -462,7 +463,7 @@ const Notification: React.FC<INotification> = (props) => {
const targetName = notification.type === 'move' ? notification.target.acct : '';
const message: React.ReactNode = accounts.length
? buildMessage(intl, displayedType, accounts, targetName, instance.title, !!status, !!status?.reblog)
? buildMessage(intl, displayedType, accounts, targetName, instance.title, !!status, !!status?.reblog_id)
: null;
const ariaLabel = (
@ -471,7 +472,7 @@ const Notification: React.FC<INotification> = (props) => {
intl.formatMessage(messages[displayedType], {
name: accounts.length ? intl.formatList(accounts.map(account => account.acct), { type: 'conjunction' }) : '',
targetName,
isReblog: status?.reblog ? 1 : 0,
isReblog: status?.reblog_id ? 1 : 0,
}),
notification.latest_page_notification_at!,
)