-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('notification.reblogged_post') }}
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ $t('notification.favourited_post') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index ca52faf1..83a7f80e 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -75,9 +75,7 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
}
return
}
-
- const { status } = group[0]
- if (status && group.length > 1 && (group[0].type === 'reblog' || group[0].type === 'favourite')) {
+ else if (group.length && group[0].status && (group[0].type === 'reblog' || group[0].type === 'favourite')) {
// All notifications in these group are reblogs or favourites of the same status
const likes: GroupedAccountLike[] = []
for (const notification of group) {
@@ -96,7 +94,7 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
results.push({
id: `grouped-${id++}`,
type: 'grouped-reblogs-and-favourites',
- status,
+ status: group[0].status,
likes,
})
return
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 1dc0a380..424ef6be 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -7,7 +7,7 @@ const props = withDefaults(
actions?: boolean
context?: mastodon.v2.FilterContext
hover?: boolean
- faded?: boolean
+ inNotification?: boolean
isPreview?: boolean
// If we know the prev and next status in the timeline, we can simplify the card
@@ -77,19 +77,7 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
-
+
@@ -101,7 +89,7 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
m="is-5" p="t-1 is-5"
:status="status"
:is-self-reply="isSelfReply"
- :class="faded ? 'text-secondary-light' : ''"
+ :class="inNotification ? 'text-secondary-light' : ''"
/>
@@ -134,7 +122,7 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
-
+
@@ -179,9 +167,16 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
-
+
-
+
diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index 7dc937c6..d6efd353 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -6,6 +6,7 @@ const { status, context } = defineProps<{
newer?: mastodon.v1.Status
context?: mastodon.v2.FilterContext | 'details'
isPreview?: boolean
+ inNotification?: boolean
}>()
const isDM = $computed(() => status.visibility === 'direct')
diff --git a/components/status/StatusLink.vue b/components/status/StatusLink.vue
new file mode 100644
index 00000000..613042e5
--- /dev/null
+++ b/components/status/StatusLink.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+