diff options
Diffstat (limited to 'src/view/com/notifications')
-rw-r--r-- | src/view/com/notifications/NotificationFeed.tsx | 4 | ||||
-rw-r--r-- | src/view/com/notifications/NotificationFeedItem.tsx | 54 |
2 files changed, 55 insertions, 3 deletions
diff --git a/src/view/com/notifications/NotificationFeed.tsx b/src/view/com/notifications/NotificationFeed.tsx index 73cebf868..1f87b3186 100644 --- a/src/view/com/notifications/NotificationFeed.tsx +++ b/src/view/com/notifications/NotificationFeed.tsx @@ -1,7 +1,7 @@ import React from 'react' import { ActivityIndicator, - ListRenderItemInfo, + type ListRenderItemInfo, StyleSheet, View, } from 'react-native' @@ -16,7 +16,7 @@ import {useModerationOpts} from '#/state/preferences/moderation-opts' import {useNotificationFeedQuery} from '#/state/queries/notifications/feed' import {EmptyState} from '#/view/com/util/EmptyState' import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' -import {List, ListRef} from '#/view/com/util/List' +import {List, type ListRef} from '#/view/com/util/List' import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn' import {NotificationFeedItem} from './NotificationFeedItem' diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx index a30aba7d8..1f99a3c34 100644 --- a/src/view/com/notifications/NotificationFeedItem.tsx +++ b/src/view/com/notifications/NotificationFeedItem.tsx @@ -446,6 +446,55 @@ let NotificationFeedItem = ({ </Trans> ) icon = <VerifiedCheck size="xl" fill={t.palette.contrast_500} /> + } else if (item.type === 'like-via-repost') { + a11yLabel = hasMultipleAuthors + ? _( + msg`${firstAuthorName} and ${plural(additionalAuthorsCount, { + one: `${formattedAuthorsCount} other`, + other: `${formattedAuthorsCount} others`, + })} liked your repost`, + ) + : _(msg`${firstAuthorName} liked your repost`) + notificationContent = hasMultipleAuthors ? ( + <Trans> + {firstAuthorLink} and{' '} + <Text style={[a.text_md, a.font_bold, a.leading_snug]}> + <Plural + value={additionalAuthorsCount} + one={`${formattedAuthorsCount} other`} + other={`${formattedAuthorsCount} others`} + /> + </Text>{' '} + liked your repost + </Trans> + ) : ( + <Trans>{firstAuthorLink} liked your repost</Trans> + ) + } else if (item.type === 'repost-via-repost') { + a11yLabel = hasMultipleAuthors + ? _( + msg`${firstAuthorName} and ${plural(additionalAuthorsCount, { + one: `${formattedAuthorsCount} other`, + other: `${formattedAuthorsCount} others`, + })} reposted your repost`, + ) + : _(msg`${firstAuthorName} reposted your repost`) + notificationContent = hasMultipleAuthors ? ( + <Trans> + {firstAuthorLink} and{' '} + <Text style={[a.text_md, a.font_bold, a.leading_snug]}> + <Plural + value={additionalAuthorsCount} + one={`${formattedAuthorsCount} other`} + other={`${formattedAuthorsCount} others`} + /> + </Text>{' '} + reposted your repost + </Trans> + ) : ( + <Trans>{firstAuthorLink} reposted your repost</Trans> + ) + icon = <RepostIcon size="xl" style={{color: t.palette.positive_600}} /> } else { return null } @@ -553,7 +602,10 @@ let NotificationFeedItem = ({ </TimeElapsed> </Text> </ExpandListPressable> - {item.type === 'post-like' || item.type === 'repost' ? ( + {item.type === 'post-like' || + item.type === 'repost' || + item.type === 'like-via-repost' || + item.type === 'repost-via-repost' ? ( <View style={[a.pt_2xs]}> <AdditionalPostText post={item.subject} /> </View> |