Send notifications for each new post of a contact, option for creating a summary...

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 36ac57f17d5d938213723e03ba576d4ccf08d27b..31f40aa6f8ca20767b47f90e94194719e091a8f5 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -377,6 +377,18 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $page_writeable = false;
        $live_update_div = '';
 
+       $arr_blocked = null;
+
+       if(local_user()) {
+               $str_blocked = get_pconfig(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 ' : '');
 
        if($mode === 'network') {
@@ -475,7 +487,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
        $alike = array();
        $dlike = array();
 
-
        // array with html for each thread (parent+comments)
        $threads = array();
        $threadsid = -1;
@@ -493,6 +504,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        $tpl = 'search_item.tpl';
 
                        foreach($items as $item) {
+                               if($arr_blocked) {
+                                       $blocked = false;
+                                       foreach($arr_blocked as $b) {
+                                               if($b && link_compare($item['author-link'],$b)) {
+                                                       $blocked = true;
+                                                       break;
+                                               }
+                                       }
+                                       if($blocked)
+                                               continue;
+                               }
+
+
                                $threadsid++;
 
                                $comment     = '';
@@ -672,7 +696,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $threads[$threadsid]['items'] = array($arr['output']);
 
                        }
-
                }
                else
                {
@@ -691,6 +714,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        $threads = array();
                        foreach($items as $item) {
 
+                               if($arr_blocked) {
+                                       $blocked = false;
+                                       foreach($arr_blocked as $b) {
+
+                                               if($b && link_compare($item['author-link'],$b)) {
+                                                       $blocked = true;
+                                                       break;
+                                               }
+                                       }
+                                       if($blocked)
+                                               continue;
+                               }
+
+
+
                                // Can we put this after the visibility check?
                                like_puller($a,$item,$alike,'like');
                                like_puller($a,$item,$dlike,'dislike');
@@ -714,6 +752,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        }
 
                        $threads = $conv->get_template_data($alike, $dlike);
+
                        if(!$threads) {
                                logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
                                $threads = array();