Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/pleromabe-follow-notifs' into 'develop'

Browse source 
Add regex for follows from pleromabe

See merge request !109
This commit is contained in:
Shpuld Shpuldson 2017-08-25 03:19:01 -04:00
commit 87b18da811
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modules/statuses.js
View file

@ -121,6 +121,7 @@ export const statusType = (status) => {
return 'deletion' return 'deletion'
} }
// TODO change to status.activity_type === 'follow' when gs supports it
if (status.text.match(/started following/)) { if (status.text.match(/started following/)) {
return 'follow' return 'follow'
} }
@ -275,7 +276,8 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
}, },
'follow': (status) => { 'follow': (status) => {
let re = new RegExp(`started following ${user.name} \\(${user.statusnet_profile_url}\\)`) 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 }) addNotification({ type: 'follow', status: status, action: status })
} }
}, },