diff options
| author | git-marijus <mario@mariovavti.com> | 2017-07-28 23:01:39 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-07-28 23:01:39 +0200 |
| commit | 9717d4502f460e56d76eb52c244124e2b995677c (patch) | |
| tree | cbdf877872300ace860731e11829ed2090d558ad /Zotlabs/Module | |
| parent | f9b342c87d4129c457244861b3b841cb9dfe139b (diff) | |
| download | volse-hubzilla-9717d4502f460e56d76eb52c244124e2b995677c.tar.gz volse-hubzilla-9717d4502f460e56d76eb52c244124e2b995677c.tar.bz2 volse-hubzilla-9717d4502f460e56d76eb52c244124e2b995677c.zip | |
do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do not mark those read in /network
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Network.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 45623c7b0..a1b70fea0 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -534,12 +534,13 @@ class Network extends \Zotlabs\Web\Controller { if($parents_str) { $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " AND obj_type != " . dbesc(ACTIVITY_OBJ_FILE) . "" $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; } } else { if($parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " ) AND obj_type != " . dbesc(ACTIVITY_OBJ_FILE) . ""; } } } diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index ac8c466f8..ddb3a8c12 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -400,9 +400,11 @@ class Ping extends \Zotlabs\Web\Controller { $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal - and author_xchan != '%s'", + AND author_xchan != '%s' + AND obj_type != '%s'", intval(local_channel()), - dbesc($ob_hash) + dbesc($ob_hash), + dbesc(ACTIVITY_OBJ_FILE) ); if($r) { |