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] 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',
   },