1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 08ec514f..586e6ec9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -112,7 +112,8 @@ export const statusType = (status) => {
     return 'retweet'
   }
 
-  if (typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) {
+  if ((typeof status.uri === 'string' && status.uri.match(/(fave|objectType=Favourite)/)) ||
+      (typeof status.text === 'string' && status.text.match(/favorited/))) {
     return 'favorite'
   }
 
@@ -273,7 +274,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       }
     },
     'follow': (status) => {
-      addNotification({ type: 'follow', status: status, action: status })
+      let re = new RegExp(`started following ${user.name} \\(${user.statusnet_profile_url}\\)`)
+      if (status.text.match(re)) {
+        addNotification({ type: 'follow', status: status, action: status })
+      }
     },
     'deletion': (deletion) => {
       const uri = deletion.uri