From 41343b32c5f9bb640ec92b6e19e95ebe4955cd98 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 23 Apr 2015 21:45:42 -0700 Subject: block unfederated posts from zot_feed --- include/items.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 3fb1f3cfe..7f96bfb4b 100755 --- a/include/items.php +++ b/include/items.php @@ -4446,6 +4446,12 @@ function zot_feed($uid,$observer_xchan,$arr) { } if($r) { + for($x = 0; $x < count($r); $x ++) { + if(strpos($r[$x]['postopts'],'nodeliver') !== false) { + unset($r[$x]); + } + } + $parents_str = ids_to_querystr($r,'parent'); $sys_query = ((is_sys_channel($uid)) ? $sql_extra : ''); -- cgit v1.2.3 From 268307b5346674159ef8f6d3fbfadaf41a7443f0 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 24 Apr 2015 15:01:37 -0700 Subject: zotfeed issues --- include/items.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 7f96bfb4b..4e85bef37 100755 --- a/include/items.php +++ b/include/items.php @@ -4408,7 +4408,7 @@ function zot_feed($uid,$observer_xchan,$arr) { $limit = " LIMIT 100 "; if($mindate != NULL_DATE) { - $sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) "; + $sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) "; } if($message_id) { @@ -4426,7 +4426,7 @@ function zot_feed($uid,$observer_xchan,$arr) { if(is_sys_channel($uid)) { require_once('include/security.php'); - $r = q("SELECT parent, created from item + $r = q("SELECT parent, created, postopts from item WHERE uid != %d AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND (item_flags & %d) > 0 @@ -4436,7 +4436,7 @@ function zot_feed($uid,$observer_xchan,$arr) { ); } else { - $r = q("SELECT parent, created from item + $r = q("SELECT parent, created, postopts from item WHERE uid = %d AND item_restrict = 0 AND (item_flags & %d) > 0 $sql_extra GROUP BY parent ORDER BY created ASC $limit", -- cgit v1.2.3