commit: 87b18da8116bcaf8bb2f154847fb9f0fed58789a
parent: 205024ba9dec4b3baf3ae20636fb6c8eb680d11d
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date: Fri, 25 Aug 2017 03:19:01 -0400
Merge branch 'fix/pleromabe-follow-notifs' into 'develop'
Add regex for follows from pleromabe
See merge request !109
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -121,6 +121,7 @@ export const statusType = (status) => {
return 'deletion'
}
+ // TODO change to status.activity_type === 'follow' when gs supports it
if (status.text.match(/started following/)) {
return 'follow'
}
@@ -275,7 +276,8 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
},
'follow': (status) => {
let re = new RegExp(`started following ${user.name} \\(${user.statusnet_profile_url}\\)`)
- if (status.text.match(re)) {
+ let repleroma = new RegExp(`started following ${user.screen_name}$`)
+ if (status.text.match(re) || status.text.match(repleroma)) {
addNotification({ type: 'follow', status: status, action: status })
}
},