diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx index d09890bf7..e8ef15398 100644 --- a/packages/pl-fe/src/components/status.tsx +++ b/packages/pl-fe/src/components/status.tsx @@ -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 = (props) => { hideActionBar, variant = 'rounded', showGroup = true, + showInfo = true, fromBookmarks = false, fromHomeTimeline = false, className, @@ -253,6 +255,8 @@ const Status: React.FC = (props) => { }; const statusInfo = useMemo(() => { + if (!showInfo) return null; + if (isReblog && showGroup && group) { return ( = (props) => { avatarSize={avatarSize} contextType='notifications' showGroup={false} + showInfo={false} variant='slim' /> ); @@ -462,7 +463,7 @@ const Notification: React.FC = (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 = (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!, )