keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5593 from annando/issue-4507

Browse source 
Issue 4507: Superblock does now work on comments as well
This commit is contained in:
Tobias Diekershoff 2018-08-10 06:54:53 +02:00 committed by GitHub
commit eb4e44f572
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
include/conversation.php
View file

@ -397,6 +397,29 @@ function visible_activity($item) {
return true; return true;
} }
function conv_get_blocklist()
{
if (!local_user()) {
return [];
}
$str_blocked = PConfig::get(local_user(), 'system', 'blocked');
if (empty($str_blocked)) {
return [];
}
$blocklist = [];
foreach (explode(',', $str_blocked) as $entry) {
$cid = Contact::getIdForURL(trim($entry), 0, true);
if (!empty($cid)) {
$blocklist[] = $cid;
}
}
return $blocklist;
}
/** /**
* "Render" a conversation or list of items for HTML display. * "Render" a conversation or list of items for HTML display.
* There are two major forms of display: * There are two major forms of display:
@ -409,25 +432,12 @@ function visible_activity($item) {
*/ */
function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) { function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
$ssl_state = ((local_user()) ? true : false); $ssl_state = (local_user() ? true : false);
$profile_owner = 0; $profile_owner = 0;
$live_update_div = ''; $live_update_div = '';
$arr_blocked = null; $blocklist = conv_get_blocklist();
if (local_user()) {
$str_blocked = PConfig::get(local_user(), '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]);
}
}
}
$previewing = (($preview) ? ' preview ' : ''); $previewing = (($preview) ? ' preview ' : '');
@ -554,19 +564,9 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
continue; continue;
} }
if ($arr_blocked) { if (in_array($item['author-id'], $blocklist)) {
$blocked = false;
foreach ($arr_blocked as $b) {
if ($b && link_compare($item['author-link'], $b)) {
$blocked = true;
break;
}
}
if ($blocked) {
continue; continue;
} }
}
$threadsid++; $threadsid++;
@ -705,18 +705,9 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
* But for now, this array respects the old style, just in case * But for now, this array respects the old style, just in case
*/ */
foreach ($items as $item) { foreach ($items as $item) {
if ($arr_blocked) { if (in_array($item['author-id'], $blocklist)) {
$blocked = false;
foreach ($arr_blocked as $b) {
if ($b && link_compare($item['author-link'], $b)) {
$blocked = true;
break;
}
}
if ($blocked) {
continue; continue;
} }
}
// Can we put this after the visibility check? // Can we put this after the visibility check?
builtin_activity_puller($item, $conv_responses); builtin_activity_puller($item, $conv_responses);
@ -1342,10 +1333,16 @@ function conv_sort(array $item_list, $order)
return $parents; return $parents;
} }
$blocklist = conv_get_blocklist();
$item_array = []; $item_array = [];
// Dedupes the item list on the uri to prevent infinite loops // Dedupes the item list on the uri to prevent infinite loops
foreach ($item_list as $item) { foreach ($item_list as $item) {
if (in_array($item['author-id'], $blocklist)) {
continue;
}
$item_array[$item['uri']] = $item; $item_array[$item['uri']] = $item;
} }