From d0b303d44ec428cb0227c67b7308016fd7145efb Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:20:03 -0700
Subject: [PATCH 01/22] fix(posts): analytics for home.feed.post.reply, good
 starting point

---
 components/status/StatusActions.vue       | 8 +++++++-
 components/status/StatusCard.vue          | 3 ++-
 components/timeline/TimelineHome.vue      | 2 +-
 components/timeline/TimelinePaginator.vue | 5 +++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index eb75e70751..2838b27726 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
+import { engagement } from '~~/telemetry/generated/ui'
+import { engagementDetails } from '~~/telemetry/engagementDetails'
 
 const props = defineProps<{
   status: mastodon.v1.Status
+  thing?: string
   details?: boolean
   command?: boolean
 }>()
 
 const focusEditor = inject<typeof noop>('focus-editor', noop)
 
-const { details, command } = $(props)
+const { details, command, thing } = $(props)
 
 const userSettings = useUserSettings()
 const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
@@ -24,6 +27,9 @@ const {
 } = $(useStatusActions(props))
 
 function reply() {
+  const analyticsId = `${thing}.post.reply`
+  engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
+
   if (!checkLogin())
     return
   if (details)
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index ab8da4964e..de34ae0c26 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -9,6 +9,7 @@ const props = withDefaults(
     hover?: boolean
     inNotification?: boolean
     isPreview?: boolean
+    thing: string
 
     // If we know the prev and next status in the timeline, we can simplify the card
     older?: mastodon.v1.Status
@@ -183,7 +184,7 @@ const forceShow = ref(false)
             :in-notification="inNotification"
             mb2 :class="{ 'mt-2 mb1': isDM }"
           />
-          <StatusActions v-if="actions !== false" v-show="!getPreferences(userSettings, 'zenMode')" :status="status" />
+          <StatusActions v-if="actions !== false" v-show="!getPreferences(userSettings, 'zenMode')" :status="status" :thing="thing" />
         </div>
       </template>
     </div>
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index 05cff3225f..479123e794 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -18,6 +18,6 @@ function onPublish(status) {
 <template>
   <div>
     <PublishWidget draft-key="home" border="b base" @published="onPublish" />
-    <TimelinePaginator ref="homePaginator" v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" />
+    <TimelinePaginator ref="homePaginator" v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" thing="home.feed" />
   </div>
 </template>
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index d528b117d0..c628a6406b 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -13,6 +13,7 @@ const { paginator, stream, account, buffer = 10, endMessage = true } = definePro
   preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
   buffer?: number
   endMessage?: boolean | string
+  thing: string
 }>()
 
 const commonPaginator = ref(null)
@@ -43,11 +44,11 @@ const showOriginSite = $computed(() =>
     <template #default="{ item, older, newer, active }">
       <template v-if="virtualScroller">
         <DynamicScrollerItem :item="item" :active="active" tag="article">
-          <StatusCard :status="item" :context="context" :older="older" :newer="newer" />
+          <StatusCard :status="item" :context="context" :older="older" :newer="newer" :thing="thing" />
         </DynamicScrollerItem>
       </template>
       <template v-else>
-        <StatusCard :status="item" :context="context" :older="older" :newer="newer" />
+        <StatusCard :status="item" :context="context" :older="older" :newer="newer" :thing="thing" />
       </template>
     </template>
     <template v-if="context === 'account' " #done="{ items }">

From 7aecd40f8869aa014b51808ead9d96f4628d8601 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:31:17 -0700
Subject: [PATCH 02/22] fix(posts): setup for standalone posts

---
 components/status/StatusActions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 2838b27726..5a53ea6a87 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -27,7 +27,7 @@ const {
 } = $(useStatusActions(props))
 
 function reply() {
-  const analyticsId = `${thing}.post.reply`
+  const analyticsId = thing ? `${thing}.post.reply` : 'post.reply'
   engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
 
   if (!checkLogin())

From 034c76aad34fa0f5df2844579462be3d6076fb47 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:32:37 -0700
Subject: [PATCH 03/22] fix(posts): reblog

---
 components/status/StatusActions.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 5a53ea6a87..8fc74ad390 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -37,6 +37,13 @@ function reply() {
   else
     navigateToStatus({ status, focusReply: true })
 }
+
+function reblog() {
+  const analyticsId = thing ? `${thing}.post.reblog` : 'post.reblog'
+  engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
+
+  toggleReblog()
+}
 </script>
 
 <template>
@@ -69,7 +76,7 @@ function reply() {
         :active="!!status.reblogged"
         :disabled="isLoading.reblogged || !canReblog"
         :command="command"
-        @click="toggleReblog()"
+        @click="reblog"
       >
         <template v-if="status.reblogsCount && !getPreferences(userSettings, 'hideBoostCount')" #text>
           <CommonLocalizedNumber

From 171056d38324876162ec28f8ad7b79e6e3befc35 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:35:58 -0700
Subject: [PATCH 04/22] fix(posts): recordEngagement function

---
 components/status/StatusActions.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 8fc74ad390..2d49d8ef97 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -26,9 +26,13 @@ const {
   toggleReblog,
 } = $(useStatusActions(props))
 
-function reply() {
-  const analyticsId = thing ? `${thing}.post.reply` : 'post.reply'
+function recordEngagement(engagementAction: String) {
+  const analyticsId = thing ? `${thing}.post.${engagementAction}` : `post.${engagementAction}`
   engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
+}
+
+function reply() {
+  recordEngagement('reply')
 
   if (!checkLogin())
     return
@@ -39,9 +43,7 @@ function reply() {
 }
 
 function reblog() {
-  const analyticsId = thing ? `${thing}.post.reblog` : 'post.reblog'
-  engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
-
+  recordEngagement('reblog')
   toggleReblog()
 }
 </script>

From 4ab3c490d5e06f22c45cc1ea7270dd657a3197d6 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:37:51 -0700
Subject: [PATCH 05/22] fix(posts): favorite

---
 components/status/StatusActions.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 2d49d8ef97..c946a8a215 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -46,6 +46,11 @@ function reblog() {
   recordEngagement('reblog')
   toggleReblog()
 }
+
+function favourite() {
+  recordEngagement('favorite')
+  toggleFavourite()
+}
 </script>
 
 <template>
@@ -101,7 +106,7 @@ function reblog() {
         :active="!!status.favourited"
         :disabled="isLoading.favourited"
         :command="command"
-        @click="toggleFavourite()"
+        @click="favourite"
       >
         <template v-if="status.favouritesCount && !getPreferences(userSettings, 'hideFavoriteCount')" #text>
           <CommonLocalizedNumber

From 32bb7b291401dc69c76f1238ade8ebbdab921d7d Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:38:46 -0700
Subject: [PATCH 06/22] fix(posts): favorite

---
 components/status/StatusActions.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index c946a8a215..6b626196d5 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -51,6 +51,11 @@ function favourite() {
   recordEngagement('favorite')
   toggleFavourite()
 }
+
+function bookmark() {
+  recordEngagement('bookmark')
+  toggleBookmark()
+}
 </script>
 
 <template>
@@ -128,7 +133,7 @@ function favourite() {
         :active="!!status.bookmarked"
         :disabled="isLoading.bookmarked"
         :command="command"
-        @click="toggleBookmark()"
+        @click="bookmark"
       />
     </div>
   </div>

From 3472e200575337ba14658310259ceb65084ab87f Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:39:57 -0700
Subject: [PATCH 07/22] fix(posts): mastodon_status_id

---
 components/status/StatusActions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 6b626196d5..3a60e2f923 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -28,7 +28,7 @@ const {
 
 function recordEngagement(engagementAction: String) {
   const analyticsId = thing ? `${thing}.post.${engagementAction}` : `post.${engagementAction}`
-  engagement.record({ ui_identifier: analyticsId, ...engagementDetails[analyticsId] })
+  engagement.record({ ui_identifier: analyticsId, mastodon_status_id: status.id, ...engagementDetails[analyticsId] })
 }
 
 function reply() {

From b44088e7bdd79190ffc0bff9f46fb576ebbeed93 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:47:02 -0700
Subject: [PATCH 08/22] fix(posts): engagement types for the 8 events so far,
 set up postEvents map

---
 telemetry/engagementDetails.ts    |  2 ++
 telemetry/engagementPostEvents.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 telemetry/engagementPostEvents.js

diff --git a/telemetry/engagementDetails.ts b/telemetry/engagementDetails.ts
index bafb1c5626..aaf765126c 100644
--- a/telemetry/engagementDetails.ts
+++ b/telemetry/engagementDetails.ts
@@ -1,4 +1,5 @@
 import { profileEvents } from './engagementProfileEvents'
+import { postEvents } from './engagementPostEvents'
 
 interface EngagementDetails {
   [propName: string]: {
@@ -36,4 +37,5 @@ export const engagementDetails: EngagementDetails = {
     engagement_type: 'general',
   },
   ...profileEvents,
+  ...postEvents,
 }
diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
new file mode 100644
index 0000000000..6b61559d8a
--- /dev/null
+++ b/telemetry/engagementPostEvents.js
@@ -0,0 +1,28 @@
+export const postEvents = {
+  // Standalone post
+  'post.reply': {
+    engagement_type: 'reply',
+  },
+  'post.reblog': {
+    engagement_type: 'boost',
+  },
+  'post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  // Home feed
+  'home.feed.post.reply': {
+    engagement_type: 'reply',
+  },
+  'home.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'home.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'home.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+}

From 82d4989e0e3b608906a2016e7c8597837048057a Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:55:17 -0700
Subject: [PATCH 09/22] fix(posts): report

---
 components/status/StatusActionsMore.vue | 14 ++++++++++++--
 components/status/StatusCard.vue        |  2 +-
 telemetry/engagementPostEvents.js       |  6 ++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 1afa369f09..6a8faef885 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -1,18 +1,21 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 import { toggleBlockAccount, toggleMuteAccount, useRelationship } from '~~/composables/masto/relationship'
+import { engagement } from '~~/telemetry/generated/ui'
+import { engagementDetails } from '~~/telemetry/engagementDetails'
 
 const props = defineProps<{
   status: mastodon.v1.Status
   details?: boolean
   command?: boolean
+  thing: string
 }>()
 
 const emit = defineEmits<{
   (event: 'afterEdit'): void
 }>()
 
-const { details, command } = $(props)
+const { details, command, thing } = $(props)
 
 const {
   status,
@@ -120,6 +123,13 @@ async function editStatus() {
 function showFavoritedAndBoostedBy() {
   openFavoridedBoostedByDialog(status.id)
 }
+
+function report() {
+  const analyticsId = thing ? `${thing}.post.report` : 'post.report'
+  engagement.record({ ui_identifier: analyticsId, mastodon_status_id: status.id, ...engagementDetails[analyticsId] })
+
+  openReportDialog(status.account, status)
+}
 </script>
 
 <template>
@@ -317,7 +327,7 @@ function showFavoritedAndBoostedBy() {
               :text="$t('menu.report_account', [`@${status.account.acct}`])"
               icon="i-ri:flag-2-line"
               :command="command"
-              @click="openReportDialog(status.account, status)"
+              @click="report"
             />
           </template>
         </template>
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index de34ae0c26..40bcd59d22 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -172,7 +172,7 @@ const forceShow = ref(false)
                 </div>
               </div>
             </div>
-            <StatusActionsMore v-if="actions !== false" :status="status" me--2 />
+            <StatusActionsMore v-if="actions !== false" :status="status" me--2 :thing="thing" />
           </div>
 
           <!-- Content -->
diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
index 6b61559d8a..86c2231cd7 100644
--- a/telemetry/engagementPostEvents.js
+++ b/telemetry/engagementPostEvents.js
@@ -12,6 +12,9 @@ export const postEvents = {
   'post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'post.report': {
+    engagement_type: 'general',
+  },
   // Home feed
   'home.feed.post.reply': {
     engagement_type: 'reply',
@@ -25,4 +28,7 @@ export const postEvents = {
   'home.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'home.feed.post.report': {
+    engagement_type: 'general',
+  },
 }

From df64fbb03127bd3d7c148f6c7f1bb0b421625750 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 16:58:10 -0700
Subject: [PATCH 10/22] fix(posts): favorites feed

---
 components/timeline/TimelineFavourites.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/timeline/TimelineFavourites.vue b/components/timeline/TimelineFavourites.vue
index 346b8c8bdc..1dd20046d9 100644
--- a/components/timeline/TimelineFavourites.vue
+++ b/components/timeline/TimelineFavourites.vue
@@ -3,5 +3,5 @@ const paginator = useMastoClient().v1.favourites.list()
 </script>
 
 <template>
-  <TimelinePaginator end-message="common.no_favourites" :paginator="paginator" />
+  <TimelinePaginator end-message="common.no_favourites" :paginator="paginator" thing="favorites.feed" />
 </template>

From cc3710139845ec953ab430e5cd1f1dae4a0dcaba Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 17:00:26 -0700
Subject: [PATCH 11/22] fix(posts): bookmarks feed

---
 components/timeline/TimelineBookmarks.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/timeline/TimelineBookmarks.vue b/components/timeline/TimelineBookmarks.vue
index cdab6a354b..846c6dd6b7 100644
--- a/components/timeline/TimelineBookmarks.vue
+++ b/components/timeline/TimelineBookmarks.vue
@@ -3,5 +3,5 @@ const paginator = useMastoClient().v1.bookmarks.list()
 </script>
 
 <template>
-  <TimelinePaginator end-message="common.no_bookmarks" :paginator="paginator" />
+  <TimelinePaginator end-message="common.no_bookmarks" :paginator="paginator" thing="bookmarks.feed" />
 </template>

From 86c6a989bf7b229aba31ee5bfc3fef15d6c9eead Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 17:03:04 -0700
Subject: [PATCH 12/22] fix(posts): local and federated feeds

---
 components/timeline/TimelinePublic.vue      | 2 +-
 components/timeline/TimelinePublicLocal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index ec4fac8508..f5fdfc5f8d 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -10,6 +10,6 @@ function reorderAndFilter(items: mastodon.v1.Status[]) {
 
 <template>
   <div>
-    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="public" />
+    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="public" thing="federated.feed" />
   </div>
 </template>
diff --git a/components/timeline/TimelinePublicLocal.vue b/components/timeline/TimelinePublicLocal.vue
index 50d1e15088..289be14195 100644
--- a/components/timeline/TimelinePublicLocal.vue
+++ b/components/timeline/TimelinePublicLocal.vue
@@ -5,6 +5,6 @@ const stream = useStreaming(client => client.v1.stream.streamCommunityTimeline()
 
 <template>
   <div>
-    <TimelinePaginator v-bind="{ paginator, stream }" context="public" />
+    <TimelinePaginator v-bind="{ paginator, stream }" context="public" thing="local.feed" />
   </div>
 </template>

From e8a6aa1948a51d2da07e22489ed982f2546f62d5 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Mon, 30 Oct 2023 17:05:25 -0700
Subject: [PATCH 13/22] fix(posts): whoops, missed engagement_type on bookmarks
 feed, favorites feed, local feed, and federated feed

---
 telemetry/engagementPostEvents.js | 64 +++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
index 86c2231cd7..42d24c8469 100644
--- a/telemetry/engagementPostEvents.js
+++ b/telemetry/engagementPostEvents.js
@@ -31,4 +31,68 @@ export const postEvents = {
   'home.feed.post.report': {
     engagement_type: 'general',
   },
+  // Favorites feed
+  'favorites.feed.post.reply': {
+    engagement_type: 'reply',
+  },
+  'favorites.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'favorites.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'favorites.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  'favorites.feed.post.report': {
+    engagement_type: 'general',
+  },
+  // Bookmarks feed
+  'bookmarks.feed.post.reply': {
+    engagement_type: 'reply',
+  },
+  'bookmarks.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'bookmarks.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'bookmarks.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  'bookmarks.feed.post.report': {
+    engagement_type: 'general',
+  },
+  // Local feed
+  'local.feed.post.reply': {
+    engagement_type: 'reply',
+  },
+  'local.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'local.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'local.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  'local.feed.post.report': {
+    engagement_type: 'general',
+  },
+  // Federated feed
+  'federated.feed.post.reply': {
+    engagement_type: 'reply',
+  },
+  'federated.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'federated.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'federated.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  'federated.feed.post.report': {
+    engagement_type: 'general',
+  },
 }

From 8538808b363ea73a7a48cdb24cfd96c4fb1c7241 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 31 Oct 2023 09:25:17 -0700
Subject: [PATCH 14/22] fix(posts): rename 'thing' to something actually
 appropriate

---
 components/status/StatusActions.vue         | 6 +++---
 components/status/StatusActionsMore.vue     | 6 +++---
 components/status/StatusCard.vue            | 6 +++---
 components/timeline/TimelineBookmarks.vue   | 2 +-
 components/timeline/TimelineFavourites.vue  | 2 +-
 components/timeline/TimelineHome.vue        | 2 +-
 components/timeline/TimelinePaginator.vue   | 6 +++---
 components/timeline/TimelinePublic.vue      | 2 +-
 components/timeline/TimelinePublicLocal.vue | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 3a60e2f923..33562c1a8e 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -5,14 +5,14 @@ import { engagementDetails } from '~~/telemetry/engagementDetails'
 
 const props = defineProps<{
   status: mastodon.v1.Status
-  thing?: string
+  feedName?: string
   details?: boolean
   command?: boolean
 }>()
 
 const focusEditor = inject<typeof noop>('focus-editor', noop)
 
-const { details, command, thing } = $(props)
+const { details, command, feedName } = $(props)
 
 const userSettings = useUserSettings()
 const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
@@ -27,7 +27,7 @@ const {
 } = $(useStatusActions(props))
 
 function recordEngagement(engagementAction: String) {
-  const analyticsId = thing ? `${thing}.post.${engagementAction}` : `post.${engagementAction}`
+  const analyticsId = feedName ? `${feedName}.post.${engagementAction}` : `post.${engagementAction}`
   engagement.record({ ui_identifier: analyticsId, mastodon_status_id: status.id, ...engagementDetails[analyticsId] })
 }
 
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 6a8faef885..e05ac14ce1 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -8,14 +8,14 @@ const props = defineProps<{
   status: mastodon.v1.Status
   details?: boolean
   command?: boolean
-  thing: string
+  feedName: string
 }>()
 
 const emit = defineEmits<{
   (event: 'afterEdit'): void
 }>()
 
-const { details, command, thing } = $(props)
+const { details, command, feedName } = $(props)
 
 const {
   status,
@@ -125,7 +125,7 @@ function showFavoritedAndBoostedBy() {
 }
 
 function report() {
-  const analyticsId = thing ? `${thing}.post.report` : 'post.report'
+  const analyticsId = feedName ? `${feedName}.post.report` : 'post.report'
   engagement.record({ ui_identifier: analyticsId, mastodon_status_id: status.id, ...engagementDetails[analyticsId] })
 
   openReportDialog(status.account, status)
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 40bcd59d22..22096305ef 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -9,7 +9,7 @@ const props = withDefaults(
     hover?: boolean
     inNotification?: boolean
     isPreview?: boolean
-    thing: string
+    feedName: string
 
     // If we know the prev and next status in the timeline, we can simplify the card
     older?: mastodon.v1.Status
@@ -172,7 +172,7 @@ const forceShow = ref(false)
                 </div>
               </div>
             </div>
-            <StatusActionsMore v-if="actions !== false" :status="status" me--2 :thing="thing" />
+            <StatusActionsMore v-if="actions !== false" :status="status" me--2 :feed-name="feedName" />
           </div>
 
           <!-- Content -->
@@ -184,7 +184,7 @@ const forceShow = ref(false)
             :in-notification="inNotification"
             mb2 :class="{ 'mt-2 mb1': isDM }"
           />
-          <StatusActions v-if="actions !== false" v-show="!getPreferences(userSettings, 'zenMode')" :status="status" :thing="thing" />
+          <StatusActions v-if="actions !== false" v-show="!getPreferences(userSettings, 'zenMode')" :status="status" :feed-name="feedName" />
         </div>
       </template>
     </div>
diff --git a/components/timeline/TimelineBookmarks.vue b/components/timeline/TimelineBookmarks.vue
index 846c6dd6b7..63adb1b740 100644
--- a/components/timeline/TimelineBookmarks.vue
+++ b/components/timeline/TimelineBookmarks.vue
@@ -3,5 +3,5 @@ const paginator = useMastoClient().v1.bookmarks.list()
 </script>
 
 <template>
-  <TimelinePaginator end-message="common.no_bookmarks" :paginator="paginator" thing="bookmarks.feed" />
+  <TimelinePaginator end-message="common.no_bookmarks" :paginator="paginator" feed-name="bookmarks.feed" />
 </template>
diff --git a/components/timeline/TimelineFavourites.vue b/components/timeline/TimelineFavourites.vue
index 1dd20046d9..bfe084720c 100644
--- a/components/timeline/TimelineFavourites.vue
+++ b/components/timeline/TimelineFavourites.vue
@@ -3,5 +3,5 @@ const paginator = useMastoClient().v1.favourites.list()
 </script>
 
 <template>
-  <TimelinePaginator end-message="common.no_favourites" :paginator="paginator" thing="favorites.feed" />
+  <TimelinePaginator end-message="common.no_favourites" :paginator="paginator" feed-name="favorites.feed" />
 </template>
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index 479123e794..80bcf30ef1 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -18,6 +18,6 @@ function onPublish(status) {
 <template>
   <div>
     <PublishWidget draft-key="home" border="b base" @published="onPublish" />
-    <TimelinePaginator ref="homePaginator" v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" thing="home.feed" />
+    <TimelinePaginator ref="homePaginator" v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" feed-name="home.feed" />
   </div>
 </template>
diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index c628a6406b..fa227acbf7 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -13,7 +13,7 @@ const { paginator, stream, account, buffer = 10, endMessage = true } = definePro
   preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
   buffer?: number
   endMessage?: boolean | string
-  thing: string
+  feedName: string
 }>()
 
 const commonPaginator = ref(null)
@@ -44,11 +44,11 @@ const showOriginSite = $computed(() =>
     <template #default="{ item, older, newer, active }">
       <template v-if="virtualScroller">
         <DynamicScrollerItem :item="item" :active="active" tag="article">
-          <StatusCard :status="item" :context="context" :older="older" :newer="newer" :thing="thing" />
+          <StatusCard :status="item" :context="context" :older="older" :newer="newer" :feed-name="feedName" />
         </DynamicScrollerItem>
       </template>
       <template v-else>
-        <StatusCard :status="item" :context="context" :older="older" :newer="newer" :thing="thing" />
+        <StatusCard :status="item" :context="context" :older="older" :newer="newer" :feed-name="feedName" />
       </template>
     </template>
     <template v-if="context === 'account' " #done="{ items }">
diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index f5fdfc5f8d..426d8d3f0a 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -10,6 +10,6 @@ function reorderAndFilter(items: mastodon.v1.Status[]) {
 
 <template>
   <div>
-    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="public" thing="federated.feed" />
+    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="public" feed-name="federated.feed" />
   </div>
 </template>
diff --git a/components/timeline/TimelinePublicLocal.vue b/components/timeline/TimelinePublicLocal.vue
index 289be14195..43f844f41b 100644
--- a/components/timeline/TimelinePublicLocal.vue
+++ b/components/timeline/TimelinePublicLocal.vue
@@ -5,6 +5,6 @@ const stream = useStreaming(client => client.v1.stream.streamCommunityTimeline()
 
 <template>
   <div>
-    <TimelinePaginator v-bind="{ paginator, stream }" context="public" thing="local.feed" />
+    <TimelinePaginator v-bind="{ paginator, stream }" context="public" feed-name="local.feed" />
   </div>
 </template>

From 333b6fdc6901ff0efcd777690912a2e6a235db16 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 31 Oct 2023 10:24:48 -0700
Subject: [PATCH 15/22] fix(posts): make feedName optional in StatusActionsMore

---
 components/status/StatusActionsMore.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index e05ac14ce1..2ddb04585a 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
   status: mastodon.v1.Status
   details?: boolean
   command?: boolean
-  feedName: string
+  feedName?: string
 }>()
 
 const emit = defineEmits<{

From a77f93359565bd54c762e7aecd0fea48c2d1c679 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Thu, 2 Nov 2023 09:08:36 -0700
Subject: [PATCH 16/22] fix(posts): update reply ui_identifier to avoid
 conflicting to actual reply event

---
 telemetry/engagementPostEvents.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
index 42d24c8469..11a9c4bfcd 100644
--- a/telemetry/engagementPostEvents.js
+++ b/telemetry/engagementPostEvents.js
@@ -1,6 +1,6 @@
 export const postEvents = {
   // Standalone post
-  'post.reply': {
+  'post.open-reply': {
     engagement_type: 'reply',
   },
   'post.reblog': {
@@ -16,7 +16,7 @@ export const postEvents = {
     engagement_type: 'general',
   },
   // Home feed
-  'home.feed.post.reply': {
+  'home.feed.post.open-reply': {
     engagement_type: 'reply',
   },
   'home.feed.post.reblog': {
@@ -32,7 +32,7 @@ export const postEvents = {
     engagement_type: 'general',
   },
   // Favorites feed
-  'favorites.feed.post.reply': {
+  'favorites.feed.post.open-reply': {
     engagement_type: 'reply',
   },
   'favorites.feed.post.reblog': {
@@ -48,7 +48,7 @@ export const postEvents = {
     engagement_type: 'general',
   },
   // Bookmarks feed
-  'bookmarks.feed.post.reply': {
+  'bookmarks.feed.post.open-reply': {
     engagement_type: 'reply',
   },
   'bookmarks.feed.post.reblog': {
@@ -64,7 +64,7 @@ export const postEvents = {
     engagement_type: 'general',
   },
   // Local feed
-  'local.feed.post.reply': {
+  'local.feed.post.open-reply': {
     engagement_type: 'reply',
   },
   'local.feed.post.reblog': {
@@ -80,7 +80,7 @@ export const postEvents = {
     engagement_type: 'general',
   },
   // Federated feed
-  'federated.feed.post.reply': {
+  'federated.feed.post.open-reply': {
     engagement_type: 'reply',
   },
   'federated.feed.post.reblog': {

From e0b5ea7588cd6eaaecf7428f6b21942cb1aeb3a6 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 08:58:44 -0800
Subject: [PATCH 17/22] fix(posts): make feedName for StatusCards option

---
 components/status/StatusCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 22096305ef..6e68f7e089 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -9,7 +9,7 @@ const props = withDefaults(
     hover?: boolean
     inNotification?: boolean
     isPreview?: boolean
-    feedName: string
+    feedName?: string
 
     // If we know the prev and next status in the timeline, we can simplify the card
     older?: mastodon.v1.Status

From 4f190f3c9333573d295cca8808c98610f85a57e2 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 10:20:17 -0800
Subject: [PATCH 18/22] fix(posts): feedname for account feed, make prop in
 TimelinePaginator optional

---
 components/timeline/TimelinePaginator.vue   | 2 +-
 pages/[[server]]/@[account]/index/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/timeline/TimelinePaginator.vue b/components/timeline/TimelinePaginator.vue
index fa227acbf7..358d0cbd93 100644
--- a/components/timeline/TimelinePaginator.vue
+++ b/components/timeline/TimelinePaginator.vue
@@ -13,7 +13,7 @@ const { paginator, stream, account, buffer = 10, endMessage = true } = definePro
   preprocess?: (items: mastodon.v1.Status[]) => mastodon.v1.Status[]
   buffer?: number
   endMessage?: boolean | string
-  feedName: string
+  feedName?: string
 }>()
 
 const commonPaginator = ref(null)
diff --git a/pages/[[server]]/@[account]/index/index.vue b/pages/[[server]]/@[account]/index/index.vue
index b909ca2de8..866365c104 100644
--- a/pages/[[server]]/@[account]/index/index.vue
+++ b/pages/[[server]]/@[account]/index/index.vue
@@ -26,6 +26,6 @@ if (account) {
 <template>
   <div>
     <AccountTabs />
-    <TimelinePaginator :paginator="paginator" :preprocess="reorderAndFilter" context="account" :account="account" />
+    <TimelinePaginator :paginator="paginator" :preprocess="reorderAndFilter" context="account" :account="account" feed-name="account.feed" />
   </div>
 </template>

From 39e36477ccd410b82d60514120e2da2fa86cb166 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 10:22:56 -0800
Subject: [PATCH 19/22] fix(posts): change post reply 'reply' to 'open-reply'

---
 components/status/StatusActions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 33562c1a8e..babeb7a783 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -32,7 +32,7 @@ function recordEngagement(engagementAction: String) {
 }
 
 function reply() {
-  recordEngagement('reply')
+  recordEngagement('open-reply')
 
   if (!checkLogin())
     return

From 503c6ba1a93928ebccb81ad14aef950a168465f9 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 10:26:05 -0800
Subject: [PATCH 20/22] fix(posts): account feed events engagement_type's

---
 telemetry/engagementPostEvents.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
index 11a9c4bfcd..deb95d62e9 100644
--- a/telemetry/engagementPostEvents.js
+++ b/telemetry/engagementPostEvents.js
@@ -15,6 +15,22 @@ export const postEvents = {
   'post.report': {
     engagement_type: 'general',
   },
+  // Account feed
+  'account.feed.post.open-reply': {
+    engagement_type: 'reply',
+  },
+  'account.feed.post.reblog': {
+    engagement_type: 'boost',
+  },
+  'account.feed.post.favorite': {
+    engagement_type: 'favorite',
+  },
+  'account.feed.post.bookmark': {
+    engagement_type: 'bookmark',
+  },
+  'account.feed.post.report': {
+    engagement_type: 'general',
+  },
   // Home feed
   'home.feed.post.open-reply': {
     engagement_type: 'reply',

From 1b4954982a9405827c4a27601f486ccc462d6922 Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 12:01:55 -0800
Subject: [PATCH 21/22] fix(posts): do separate events for undo actions

---
 components/status/StatusActions.vue |  8 +--
 telemetry/engagementPostEvents.js   | 91 ++++++++++++++++++++++++-----
 2 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index babeb7a783..53de19f6f3 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -26,7 +26,7 @@ const {
   toggleReblog,
 } = $(useStatusActions(props))
 
-function recordEngagement(engagementAction: String) {
+function recordEngagement(engagementAction: string) {
   const analyticsId = feedName ? `${feedName}.post.${engagementAction}` : `post.${engagementAction}`
   engagement.record({ ui_identifier: analyticsId, mastodon_status_id: status.id, ...engagementDetails[analyticsId] })
 }
@@ -43,18 +43,18 @@ function reply() {
 }
 
 function reblog() {
-  recordEngagement('reblog')
   toggleReblog()
+  recordEngagement(status.reblogged ? 'reblog' : 'unreblog')
 }
 
 function favourite() {
-  recordEngagement('favorite')
   toggleFavourite()
+  recordEngagement(status.favourited ? 'favourite' : 'unfavourite')
 }
 
 function bookmark() {
-  recordEngagement('bookmark')
   toggleBookmark()
+  recordEngagement(status.bookmarked ? 'bookmark' : 'unbookmark')
 }
 </script>
 
diff --git a/telemetry/engagementPostEvents.js b/telemetry/engagementPostEvents.js
index b5dc285095..b40d7f1273 100644
--- a/telemetry/engagementPostEvents.js
+++ b/telemetry/engagementPostEvents.js
@@ -6,12 +6,21 @@ export const postEvents = {
   'post.reblog': {
     engagement_type: 'boost',
   },
-  'post.favorite': {
-    engagement_type: 'favorite',
+  'post.unreblog': {
+    engagement_type: 'general',
+  },
+  'post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'post.unfavourite': {
+    engagement_type: 'general',
   },
   'post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'post.unbookmark': {
+    engagement_type: 'general',
+  },
   'post.report': {
     engagement_type: 'general',
   },
@@ -22,12 +31,21 @@ export const postEvents = {
   'account.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'account.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'account.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'account.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'account.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'account.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'account.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'account.feed.post.report': {
     engagement_type: 'general',
   },
@@ -38,12 +56,21 @@ export const postEvents = {
   'home.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'home.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'home.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'home.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'home.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'home.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'home.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'home.feed.post.report': {
     engagement_type: 'general',
   },
@@ -54,12 +81,21 @@ export const postEvents = {
   'favorites.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'favorites.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'favorites.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'favorites.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'favorites.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'favorites.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'favorites.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'favorites.feed.post.report': {
     engagement_type: 'general',
   },
@@ -70,12 +106,21 @@ export const postEvents = {
   'bookmarks.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'bookmarks.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'bookmarks.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'bookmarks.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'bookmarks.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'bookmarks.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'bookmarks.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'bookmarks.feed.post.report': {
     engagement_type: 'general',
   },
@@ -86,12 +131,21 @@ export const postEvents = {
   'local.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'local.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'local.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'local.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'local.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'local.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'local.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'local.feed.post.report': {
     engagement_type: 'general',
   },
@@ -102,12 +156,21 @@ export const postEvents = {
   'federated.feed.post.reblog': {
     engagement_type: 'boost',
   },
-  'federated.feed.post.favorite': {
-    engagement_type: 'favorite',
+  'federated.feed.post.unreblog': {
+    engagement_type: 'general',
+  },
+  'federated.feed.post.favourite': {
+    engagement_type: 'favourite',
+  },
+  'federated.feed.post.unfavourite': {
+    engagement_type: 'general',
   },
   'federated.feed.post.bookmark': {
     engagement_type: 'bookmark',
   },
+  'federated.feed.post.unbookmark': {
+    engagement_type: 'general',
+  },
   'federated.feed.post.report': {
     engagement_type: 'general',
   },

From f5e732d04d2705efffcfd5f61673eed340978a1a Mon Sep 17 00:00:00 2001
From: Joseph Perez <joperez@dons.usfca.edu>
Date: Tue, 7 Nov 2023 12:02:53 -0800
Subject: [PATCH 22/22] fix(posts): bad merge

---
 telemetry/engagementDetails.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/telemetry/engagementDetails.ts b/telemetry/engagementDetails.ts
index 3830fd4798..6851022f38 100644
--- a/telemetry/engagementDetails.ts
+++ b/telemetry/engagementDetails.ts
@@ -1,6 +1,5 @@
 import { postEvents } from './engagementPostEvents'
 import { profileEvents } from './engagementProfileEvents'
-import { postEvents } from './engagementPostEvents'
 
 interface EngagementDetails {
   [propName: string]: {
@@ -39,5 +38,4 @@ export const engagementDetails: EngagementDetails = {
   },
   ...postEvents,
   ...profileEvents,
-  ...postEvents,
 }