diff options
| author | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-04-05 23:15:01 -0700 |
| commit | 9359fc065c72243bd85f0fc3db842976f07183cc (patch) | |
| tree | 37551feefe6fff472b9c346a7a8c3cd9080d8946 /Zotlabs/Module/Activity.php | |
| parent | 878be8fff0328ee4ab978de20e7e385244ac54ec (diff) | |
| parent | 19daadbfd7f281e27dffdc53d0e8ebeb837e1ae3 (diff) | |
| download | volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.gz volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.tar.bz2 volse-hubzilla-9359fc065c72243bd85f0fc3db842976f07183cc.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Activity.php')
| -rw-r--r-- | Zotlabs/Module/Activity.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php index 48f2663cf..2fbc35274 100644 --- a/Zotlabs/Module/Activity.php +++ b/Zotlabs/Module/Activity.php @@ -26,7 +26,12 @@ class Activity extends Controller { $portable_id = EMPTY_STR; - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; + $item_normal_extra = sprintf(" and not verb in ('%s', '%s') ", + dbesc(ACTIVITY_FOLLOW), + dbesc(ACTIVITY_UNFOLLOW) + ); + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra "; $i = null; @@ -86,7 +91,7 @@ class Activity extends Controller { } $parents_str = ids_to_querystr($i,'item_id'); - + $items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal ", dbesc($parents_str) ); @@ -197,8 +202,12 @@ class Activity extends Controller { } } - $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 - and item.item_delayed = 0 and item.item_blocked = 0 "; + $item_normal_extra = sprintf(" and not verb in ('%s', '%s') ", + dbesc(ACTIVITY_FOLLOW), + dbesc(ACTIVITY_UNFOLLOW) + ); + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra "; $sigdata = HTTPSig::verify(EMPTY_STR); if ($sigdata['portable_id'] && $sigdata['header_valid']) { |