harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do not mark those read in /network

Browse Source
This commit is contained in:
git-marijus 2017-07-28 23:01:39 +02:00
parent f9b342c87d
commit 9717d4502f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Network.php
View File

@ -534,12 +534,13 @@ class Network extends \Zotlabs\Web\Controller {
if($parents_str) { if($parents_str) {
$update_unseen = " AND ( id IN ( " . dbesc($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) . "' ))) "; $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
} }
} }
else { else {
if($parents_str) { 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) . "";
} }
} }
} }

6
Zotlabs/Module/Ping.php
View File

@ -400,9 +400,11 @@ class Ping extends \Zotlabs\Web\Controller {
$r = q("SELECT id, item_wall FROM item $r = q("SELECT id, item_wall FROM item
WHERE item_unseen = 1 and uid = %d WHERE item_unseen = 1 and uid = %d
$item_normal $item_normal
and author_xchan != '%s'", AND author_xchan != '%s'
AND obj_type != '%s'",
intval(local_channel()), intval(local_channel()),
dbesc($ob_hash) dbesc($ob_hash),
dbesc(ACTIVITY_OBJ_FILE)
); );
if($r) { if($r) {