diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-11 17:44:51 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-11 17:44:51 -0700 |
| commit | 953a2fd9b2db0c0f0b1cf54c766a1e39002eaea8 (patch) | |
| tree | ae1e1d45d6c7f43db0686aec4f32bdfc33286ff2 /Zotlabs/Lib/Enotify.php | |
| parent | 2fa9645dfc4dc640d7460f069fc9536cce1e4fd2 (diff) | |
| parent | 3bd645033330c2db0952e57db1516274487c0712 (diff) | |
| download | volse-hubzilla-953a2fd9b2db0c0f0b1cf54c766a1e39002eaea8.tar.gz volse-hubzilla-953a2fd9b2db0c0f0b1cf54c766a1e39002eaea8.tar.bz2 volse-hubzilla-953a2fd9b2db0c0f0b1cf54c766a1e39002eaea8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 61c98c881..e05d391f3 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -115,6 +115,7 @@ class Enotify { $always_show_in_notices = get_pconfig($recip['channel_id'],'system','always_show_in_notices'); + $vnotify = get_pconfig($recip['channel_id'],'system','vnotify'); // e.g. "your post", "David's photo", etc. $possess_desc = t('%s <!item_type!>'); @@ -142,7 +143,7 @@ class Enotify { if(array_key_exists('item',$params) && in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { - if(! $always_show_in_notices) { + if(! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) { logger('notification: not a visible activity. Ignoring.'); pop_lang(); return; @@ -249,7 +250,7 @@ class Enotify { $itemlink = $params['link']; if (array_key_exists('item',$params) && (! activity_match($params['item']['verb'],ACTIVITY_LIKE))) { - if(! $always_show_in_notices) { + if(! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) { logger('notification: not a visible activity. Ignoring.'); pop_lang(); return; |