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

move the rest of superblock out of core

Browse Source
This commit is contained in:
zotlabs 2016-12-11 16:27:43 -08:00
parent 9e27559bdb
commit 0f7d36cfa0
2 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/ThreadItem.php
View File

@ -44,7 +44,7 @@ class ThreadItem {
* Only add those that will be displayed * Only add those that will be displayed
*/ */
if((! visible_activity($item)) || array_key_exists('author_blocked',$item)) { if((! visible_activity($item)) || array_key_exists('blocked',$item)) {
continue; continue;
} }

60
include/conversation.php
View File

@ -473,22 +473,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if (local_channel()) if (local_channel())
load_pconfig(local_channel(),''); load_pconfig(local_channel(),'');
$arr_blocked = null;
if (local_channel())
$str_blocked = get_pconfig(local_channel(),'system','blocked');
if (! local_channel() && ($mode == 'network')) {
$sys = get_sys_channel();
$id = $sys['channel_id'];
$str_blocked = get_pconfig($id,'system','blocked');
}
if ($str_blocked) {
$arr_blocked = explode(',',$str_blocked);
for ($x = 0; $x < count($arr_blocked); $x ++)
$arr_blocked[$x] = trim($arr_blocked[$x]);
}
$profile_owner = 0; $profile_owner = 0;
$page_writeable = false; $page_writeable = false;
$live_update_div = ''; $live_update_div = '';
@ -615,17 +599,13 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
foreach($items as $item) { foreach($items as $item) {
if($arr_blocked) { $x = [ 'mode' => $mode, 'item' => $item ];
$blocked = false; call_hooks('stream_item',$x);
foreach($arr_blocked as $b) {
if(($b) && (($item['author_xchan'] == $b) || ($item['owner_xchan'] == $b))) { if($x['item']['blocked'])
$blocked = true; continue;
break;
} $item = $x['item'];
}
if($blocked)
continue;
}
$threadsid++; $threadsid++;
@ -787,28 +767,14 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
// Check for any blocked authors // Check for any blocked authors
if($arr_blocked) {
$blocked = false;
foreach($arr_blocked as $b) {
if(($b) && (($item['author_xchan'] == $b) || $item['owner_xchan'] == $b)) {
$blocked = true;
break;
}
}
if($blocked)
continue;
}
// Check all the kids too $x = [ 'mode' => $mode, 'item' => $item ];
call_hooks('stream_item',$x);
if($arr_blocked && $item['children']) { if($x['item']['blocked'])
for($d = 0; $d < count($item['children']); $d ++) { continue;
foreach($arr_blocked as $b) {
if(($b) && (($item['children'][$d]['author_xchan'] == $b) || ($item['children'][$d]['owner_xchan'] == $b))) $item = $x['item'];
$item['children'][$d]['author_blocked'] = true;
}
}
}
builtin_activity_puller($item, $conv_responses); builtin_activity_puller($item, $conv_responses);