X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FConversation.php;h=e441e8ba4b3b7cae3e9fcf317c5887cb3e09dfcc;hb=ece09f4919f9692921c40d5811e17b3388634c20;hp=fbe88106a84c13be18724e42f8255d171108687d;hpb=0ad904c18515f67ec7c052a1bc9621ba2ff2d76e;p=friendica.git

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index fbe88106a8..e441e8ba4b 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,14 +25,11 @@ use Friendica\App;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\BaseModule;
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Feature;
-use Friendica\Content\Item;
 use Friendica\Core\ACL;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -69,11 +66,11 @@ class Conversation
 	private $item;
 	/** @var App\Arguments */
 	private $args;
-	/** @var IPConfig */
+	/** @var IManagePersonalConfigValues */
 	private $pConfig;
 	/** @var BaseURL */
 	private $baseURL;
-	/** @var IConfig */
+	/** @var IManageConfigValues */
 	private $config;
 	/** @var App */
 	private $app;
@@ -82,7 +79,7 @@ class Conversation
 	/** @var App\Mode */
 	private $mode;
 
-	public function __construct(LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IConfig $config, IPConfig $pConfig, App\Page $page, App\Mode $mode, App $app)
+	public function __construct(LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app)
 	{
 		$this->activity = $activity;
 		$this->item     = $item;
@@ -98,27 +95,301 @@ class Conversation
 		$this->app      = $app;
 	}
 
-	private function getBlocklist()
+	/**
+	 * Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.)
+	 *
+	 * Increments the count of each matching activity and adds a link to the author as needed.
+	 *
+	 * @param array  $activity
+	 * @param array &$conv_responses (already created with builtin activity structure)
+	 * @return void
+	 * @throws ImagickException
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function builtinActivityPuller(array $activity, array &$conv_responses)
 	{
-		if (!local_user()) {
-			return [];
-		}
+		foreach ($conv_responses as $mode => $v) {
+			$sparkle = '';
 
-		$str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get(local_user(), 'system', 'blocked'));
-		if (empty($str_blocked)) {
-			return [];
+			switch ($mode) {
+				case 'like':
+					$verb = Activity::LIKE;
+					break;
+				case 'dislike':
+					$verb = Activity::DISLIKE;
+					break;
+				case 'attendyes':
+					$verb = Activity::ATTEND;
+					break;
+				case 'attendno':
+					$verb = Activity::ATTENDNO;
+					break;
+				case 'attendmaybe':
+					$verb = Activity::ATTENDMAYBE;
+					break;
+				case 'announce':
+					$verb = Activity::ANNOUNCE;
+					break;
+				default:
+					return;
+			}
+
+			if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != GRAVITY_PARENT)) {
+				$author = [
+					'uid'     => 0,
+					'id'      => $activity['author-id'],
+					'network' => $activity['author-network'],
+					'url'     => $activity['author-link']
+				];
+				$url = Contact::magicLinkByContact($author);
+				if (strpos($url, 'redir/') === 0) {
+					$sparkle = ' class="sparkle" ';
+				}
+
+				$link = '<a href="' . $url . '"' . $sparkle . '>' . htmlentities($activity['author-name']) . '</a>';
+
+				if (empty($activity['thr-parent-id'])) {
+					$activity['thr-parent-id'] = $activity['parent-uri-id'];
+				}
+
+				// Skip when the causer of the parent is the same than the author of the announce
+				if (($verb == Activity::ANNOUNCE) && Post::exists(['uri-id' => $activity['thr-parent-id'],
+					'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
+					continue;
+				}
+
+				if (!isset($conv_responses[$mode][$activity['thr-parent-id']])) {
+					$conv_responses[$mode][$activity['thr-parent-id']] = [
+						'links' => [],
+						'self'  => 0,
+					];
+				} elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent-id']]['links'])) {
+					// only list each unique author once
+					continue;
+				}
+
+				if (public_contact() == $activity['author-id']) {
+					$conv_responses[$mode][$activity['thr-parent-id']]['self'] = 1;
+				}
+
+				$conv_responses[$mode][$activity['thr-parent-id']]['links'][] = $link;
+
+				// there can only be one activity verb per item so if we found anything, we can stop looking
+				return;
+			}
 		}
+	}
 
-		$blocklist = [];
+	/**
+	 * Format the activity text for an item/photo/video
+	 *
+	 * @param array  $links = array of pre-linked names of actors
+	 * @param string $verb  = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
+	 * @param int    $id    = item id
+	 * @return string formatted text
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function formatActivity(array $links, $verb, $id)
+	{
+		$this->profiler->startRecording('rendering');
+		$o        = '';
+		$expanded = '';
+		$phrase   = '';
 
-		foreach (explode(',', $str_blocked) as $entry) {
-			$cid = Contact::getIdForURL(trim($entry), 0, false);
-			if (!empty($cid)) {
-				$blocklist[] = $cid;
+		$total = count($links);
+		if ($total == 1) {
+			$likers = $links[0];
+
+			// Phrase if there is only one liker. In other cases it will be uses for the expanded
+			// list which show all likers
+			switch ($verb) {
+				case 'like':
+					$phrase = $this->l10n->t('%s likes this.', $likers);
+					break;
+				case 'dislike':
+					$phrase = $this->l10n->t('%s doesn\'t like this.', $likers);
+					break;
+				case 'attendyes':
+					$phrase = $this->l10n->t('%s attends.', $likers);
+					break;
+				case 'attendno':
+					$phrase = $this->l10n->t('%s doesn\'t attend.', $likers);
+					break;
+				case 'attendmaybe':
+					$phrase = $this->l10n->t('%s attends maybe.', $likers);
+					break;
+				case 'announce':
+					$phrase = $this->l10n->t('%s reshared this.', $likers);
+					break;
+			}
+		} elseif ($total > 1) {
+			if ($total < $this->config->get('system', 'max_likers')) {
+				$likers = implode(', ', array_slice($links, 0, -1));
+				$likers .= ' ' . $this->l10n->t('and') . ' ' . $links[count($links) - 1];
+			} else {
+				$likers = implode(', ', array_slice($links, 0, $this->config->get('system', 'max_likers') - 1));
+				$likers .= ' ' . $this->l10n->t('and %d other people', $total - $this->config->get('system', 'max_likers'));
+			}
+
+			$spanatts = "class=\"fakelink\" onclick=\"openClose('{$verb}list-$id');\"";
+
+			$explikers = '';
+			switch ($verb) {
+				case 'like':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> like this', $spanatts, $total);
+					$explikers = $this->l10n->t('%s like this.', $likers);
+					break;
+				case 'dislike':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> don\'t like this', $spanatts, $total);
+					$explikers = $this->l10n->t('%s don\'t like this.', $likers);
+					break;
+				case 'attendyes':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> attend', $spanatts, $total);
+					$explikers = $this->l10n->t('%s attend.', $likers);
+					break;
+				case 'attendno':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> don\'t attend', $spanatts, $total);
+					$explikers = $this->l10n->t('%s don\'t attend.', $likers);
+					break;
+				case 'attendmaybe':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> attend maybe', $spanatts, $total);
+					$explikers = $this->l10n->t('%s attend maybe.', $likers);
+					break;
+				case 'announce':
+					$phrase    = $this->l10n->t('<span  %1$s>%2$d people</span> reshared this', $spanatts, $total);
+					$explikers = $this->l10n->t('%s reshared this.', $likers);
+					break;
 			}
+
+			$expanded .= "\t" . '<p class="wall-item-' . $verb . '-expanded" id="' . $verb . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
 		}
 
-		return $blocklist;
+		$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
+			'$phrase' => $phrase,
+			'$type'   => $verb,
+			'$id'     => $id
+		]);
+		$o .= $expanded;
+
+		$this->profiler->stopRecording();
+		return $o;
+	}
+
+	public function statusEditor(array $x = [], $notes_cid = 0, $popup = false)
+	{
+		$user = User::getById($this->app->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
+		if (empty($user['uid'])) {
+			return '';
+		}
+
+		$this->profiler->startRecording('rendering');
+		$o = '';
+
+		$x['allow_location']   = $x['allow_location']   ?? $user['allow_location'];
+		$x['default_location'] = $x['default_location'] ?? $user['default-location'];
+		$x['nickname']         = $x['nickname']         ?? $user['nickname'];
+		$x['lockstate']        = $x['lockstate']        ?? ACL::getLockstateForUserId($user['uid']) ? 'lock' : 'unlock';
+		$x['acl']              = $x['acl']              ?? ACL::getFullSelectorHTML($this->page, $user['uid'], true);
+		$x['bang']             = $x['bang']             ?? '';
+		$x['visitor']          = $x['visitor']          ?? 'block';
+		$x['is_owner']         = $x['is_owner']         ?? true;
+		$x['profile_uid']      = $x['profile_uid']      ?? local_user();
+
+
+		$geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
+
+		$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+		$this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+			'$newpost'   => 'true',
+			'$baseurl'   => $this->baseURL->get(true),
+			'$geotag'    => $geotag,
+			'$nickname'  => $x['nickname'],
+			'$ispublic'  => $this->l10n->t('Visible to <strong>everybody</strong>'),
+			'$linkurl'   => $this->l10n->t('Please enter a image/video/audio/webpage URL:'),
+			'$term'      => $this->l10n->t('Tag term:'),
+			'$fileas'    => $this->l10n->t('Save to Folder:'),
+			'$whereareu' => $this->l10n->t('Where are you right now?'),
+			'$delitems'  => $this->l10n->t("Delete item\x28s\x29?"),
+			'$is_mobile' => $this->mode->isMobile(),
+		]);
+
+		$jotplugins = '';
+		Hook::callAll('jot_tool', $jotplugins);
+
+		$tpl = Renderer::getMarkupTemplate("jot.tpl");
+
+		$o .= Renderer::replaceMacros($tpl, [
+			'$new_post'            => $this->l10n->t('New Post'),
+			'$return_path'         => $this->args->getQueryString(),
+			'$action'              => 'item',
+			'$share'               => ($x['button'] ?? '') ?: $this->l10n->t('Share'),
+			'$loading'             => $this->l10n->t('Loading...'),
+			'$upload'              => $this->l10n->t('Upload photo'),
+			'$shortupload'         => $this->l10n->t('upload photo'),
+			'$attach'              => $this->l10n->t('Attach file'),
+			'$shortattach'         => $this->l10n->t('attach file'),
+			'$edbold'              => $this->l10n->t('Bold'),
+			'$editalic'            => $this->l10n->t('Italic'),
+			'$eduline'             => $this->l10n->t('Underline'),
+			'$edquote'             => $this->l10n->t('Quote'),
+			'$edcode'              => $this->l10n->t('Code'),
+			'$edimg'               => $this->l10n->t('Image'),
+			'$edurl'               => $this->l10n->t('Link'),
+			'$edattach'            => $this->l10n->t('Link or Media'),
+			'$edvideo'             => $this->l10n->t('Video'),
+			'$setloc'              => $this->l10n->t('Set your location'),
+			'$shortsetloc'         => $this->l10n->t('set location'),
+			'$noloc'               => $this->l10n->t('Clear browser location'),
+			'$shortnoloc'          => $this->l10n->t('clear location'),
+			'$title'               => $x['title'] ?? '',
+			'$placeholdertitle'    => $this->l10n->t('Set title'),
+			'$category'            => $x['category'] ?? '',
+			'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? $this->l10n->t("Categories \x28comma-separated list\x29") : '',
+			'$scheduled_at'        => Temporal::getDateTimeField(
+				new \DateTime(),
+				new \DateTime('now + 6 months'),
+				null,
+				$this->l10n->t('Scheduled at'),
+				'scheduled_at'
+			),
+			'$wait'         => $this->l10n->t('Please wait'),
+			'$permset'      => $this->l10n->t('Permission settings'),
+			'$shortpermset' => $this->l10n->t('Permissions'),
+			'$wall'         => $notes_cid ? 0 : 1,
+			'$posttype'     => $notes_cid ? ItemModel::PT_PERSONAL_NOTE : ItemModel::PT_ARTICLE,
+			'$content'      => $x['content'] ?? '',
+			'$post_id'      => $x['post_id'] ?? '',
+			'$baseurl'      => $this->baseURL->get(true),
+			'$defloc'       => $x['default_location'],
+			'$visitor'      => $x['visitor'],
+			'$pvisit'       => $notes_cid ? 'none' : $x['visitor'],
+			'$public'       => $this->l10n->t('Public post'),
+			'$lockstate'    => $x['lockstate'],
+			'$bang'         => $x['bang'],
+			'$profile_uid'  => $x['profile_uid'],
+			'$preview'      => $this->l10n->t('Preview'),
+			'$jotplugins'   => $jotplugins,
+			'$notes_cid'    => $notes_cid,
+			'$cancel'       => $this->l10n->t('Cancel'),
+			'$rand_num'     => Crypto::randomDigits(12),
+
+			// ACL permissions box
+			'$acl' => $x['acl'],
+
+			//jot nav tab (used in some themes)
+			'$message' => $this->l10n->t('Message'),
+			'$browser' => $this->l10n->t('Browser'),
+
+			'$compose_link_title' => $this->l10n->t('Open Compose page'),
+		]);
+
+
+		if ($popup == true) {
+			$o = '<div id="jot-popup" style="display: none;">' . $o . '</div>';
+		}
+
+		$this->profiler->stopRecording();
+		return $o;
 	}
 
 	/**
@@ -262,10 +533,10 @@ class Conversation
 		}
 
 		// array with html for each thread (parent+comments)
-		$threads = [];
+		$threads   = [];
 		$threadsid = -1;
 
-		$page_template = Renderer::getMarkupTemplate("conversation.tpl");
+		$page_template     = Renderer::getMarkupTemplate("conversation.tpl");
 		$formSecurityToken = BaseModule::getFormSecurityToken('contact_action');
 
 		if (!empty($items)) {
@@ -319,8 +590,7 @@ class Conversation
 
 					$tags = Tag::populateFromItem($item);
 
-					$author = ['uid' => 0, 'id' => $item['author-id'],
-						'network' => $item['author-network'], 'url' => $item['author-link']];
+					$author       = ['uid' => 0, 'id' => $item['author-id'], 'network' => $item['author-network'], 'url' => $item['author-link']];
 					$profile_link = Contact::magicLinkByContact($author);
 
 					$sparkle = '';
@@ -342,8 +612,8 @@ class Conversation
 					$drop = [
 						'dropping' => $dropping,
 						'pagedrop' => $page_dropping,
-						'select' => $this->l10n->t('Select'),
-						'delete' => $this->l10n->t('Delete'),
+						'select'   => $this->l10n->t('Select'),
+						'delete'   => $this->l10n->t('Delete'),
 					];
 
 					$likebuttons = [
@@ -359,7 +629,7 @@ class Conversation
 
 					$body_html = ItemModel::prepareBody($item, true, $preview);
 
-					list($categories, $folders) = $this->item->determineCategoriesTerms($item, local_user());
+					[$categories, $folders] = $this->item->determineCategoriesTerms($item, local_user());
 
 					if (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
 						$title = ucfirst($item['content-warning']);
@@ -368,65 +638,65 @@ class Conversation
 					}
 
 					$tmp_item = [
-						'template' => $tpl,
-						'id' => ($preview ? 'P0' : $item['id']),
-						'guid' => ($preview ? 'Q0' : $item['guid']),
-						'commented' => $item['commented'],
-						'received' => $item['received'],
-						'created_date' => $item['created'],
-						'uriid' => $item['uri-id'],
-						'network' => $item['network'],
-						'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
-						'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
-						'linktitle' => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
-						'profile_url' => $profile_link,
+						'template'             => $tpl,
+						'id'                   => ($preview ? 'P0' : $item['id']),
+						'guid'                 => ($preview ? 'Q0' : $item['guid']),
+						'commented'            => $item['commented'],
+						'received'             => $item['received'],
+						'created_date'         => $item['created'],
+						'uriid'                => $item['uri-id'],
+						'network'              => $item['network'],
+						'network_name'         => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
+						'network_icon'         => ContactSelector::networkToIcon($item['network'], $item['author-link']),
+						'linktitle'            => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
+						'profile_url'          => $profile_link,
 						'item_photo_menu_html' => $this->item->photoMenu($item, $formSecurityToken),
-						'name' => $profile_name,
-						'sparkle' => $sparkle,
-						'lock' => false,
-						'thumb' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)),
-						'title' => $title,
-						'body_html' => $body_html,
-						'tags' => $tags['tags'],
-						'hashtags' => $tags['hashtags'],
-						'mentions' => $tags['mentions'],
-						'implicit_mentions' => $tags['implicit_mentions'],
-						'txt_cats' => $this->l10n->t('Categories:'),
-						'txt_folders' => $this->l10n->t('Filed under:'),
-						'has_cats' => ((count($categories)) ? 'true' : ''),
-						'has_folders' => ((count($folders)) ? 'true' : ''),
-						'categories' => $categories,
-						'folders' => $folders,
-						'text' => strip_tags($body_html),
-						'localtime' => DateTimeFormat::local($item['created'], 'r'),
-						'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
-						'location_html' => $location_html,
-						'indent' => '',
-						'owner_name' => '',
-						'owner_url' => '',
-						'owner_photo' => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
-						'plink' => ItemModel::getPlink($item),
-						'edpost' => false,
-						'isstarred' => 'unstarred',
-						'star' => false,
-						'drop' => $drop,
-						'vote' => $likebuttons,
-						'like_html' => '',
-						'dislike_html' => '',
-						'comment_html' => '',
-						'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> $this->l10n->t('View in context')]),
-						'previewing' => $previewing,
-						'wait' => $this->l10n->t('Please wait'),
-						'thread_level' => 1,
+						'name'                 => $profile_name,
+						'sparkle'              => $sparkle,
+						'lock'                 => false,
+						'thumb'                => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)),
+						'title'                => $title,
+						'body_html'            => $body_html,
+						'tags'                 => $tags['tags'],
+						'hashtags'             => $tags['hashtags'],
+						'mentions'             => $tags['mentions'],
+						'implicit_mentions'    => $tags['implicit_mentions'],
+						'txt_cats'             => $this->l10n->t('Categories:'),
+						'txt_folders'          => $this->l10n->t('Filed under:'),
+						'has_cats'             => ((count($categories)) ? 'true' : ''),
+						'has_folders'          => ((count($folders)) ? 'true' : ''),
+						'categories'           => $categories,
+						'folders'              => $folders,
+						'text'                 => strip_tags($body_html),
+						'localtime'            => DateTimeFormat::local($item['created'], 'r'),
+						'utc'                  => DateTimeFormat::utc($item['created'], 'c'),
+						'ago'                  => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
+						'location_html'        => $location_html,
+						'indent'               => '',
+						'owner_name'           => '',
+						'owner_url'            => '',
+						'owner_photo'          => $this->baseURL->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
+						'plink'                => ItemModel::getPlink($item),
+						'edpost'               => false,
+						'isstarred'            => 'unstarred',
+						'star'                 => false,
+						'drop'                 => $drop,
+						'vote'                 => $likebuttons,
+						'like_html'            => '',
+						'dislike_html '        => '',
+						'comment_html'         => '',
+						'conv'                 => ($preview ? '' : ['href' => 'display/' . $item['guid'], 'title' => $this->l10n->t('View in context')]),
+						'previewing'           => $previewing,
+						'wait'                 => $this->l10n->t('Please wait'),
+						'thread_level'         => 1,
 					];
 
 					$arr = ['item' => $item, 'output' => $tmp_item];
 					Hook::callAll('display_item', $arr);
 
-					$threads[$threadsid]['id'] = $item['id'];
+					$threads[$threadsid]['id']      = $item['id'];
 					$threads[$threadsid]['network'] = $item['network'];
-					$threads[$threadsid]['items'] = [$arr['output']];
-
+					$threads[$threadsid]['items']   = [$arr['output']];
 				}
 			} else {
 				// Normal View
@@ -477,29 +747,53 @@ class Conversation
 		}
 
 		$o = Renderer::replaceMacros($page_template, [
-			'$baseurl' => $this->baseURL->get($ssl_state),
+			'$baseurl'     => $this->baseURL->get($ssl_state),
 			'$return_path' => $this->args->getQueryString(),
 			'$live_update' => $live_update_div,
-			'$remove' => $this->l10n->t('remove'),
-			'$mode' => $mode,
-			'$update' => $update,
-			'$threads' => $threads,
-			'$dropping' => ($page_dropping ? $this->l10n->t('Delete Selected Items') : False),
+			'$remove'      => $this->l10n->t('remove'),
+			'$mode'        => $mode,
+			'$update'      => $update,
+			'$threads'     => $threads,
+			'$dropping'    => ($page_dropping ? $this->l10n->t('Delete Selected Items') : false),
 		]);
 
 		$this->profiler->stopRecording();
 		return $o;
 	}
 
-	/**
-	 * Adds some information (Causer, post reason, direction) to the fetched post row.
+	private function getBlocklist()
+	{
+		if (!local_user()) {
+			return [];
+		}
+
+		$str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get(local_user(), 'system', 'blocked'));
+		if (empty($str_blocked)) {
+			return [];
+		}
+
+		$blocklist = [];
+
+		foreach (explode(',', $str_blocked) as $entry) {
+			$cid = Contact::getIdForURL(trim($entry), 0, false);
+			if (!empty($cid)) {
+				$blocklist[] = $cid;
+			}
+		}
+
+		return $blocklist;
+	}
+
+	/**
+	 * Adds some information (Causer, post reason, direction) to the fetched post row.
 	 *
 	 * @param array   $row      Post row
 	 * @param array   $activity Contact data of the resharer
 	 *
 	 * @return array items with parents and comments
 	 */
-	private function addRowInformation(array $row, array $activity) {
+	private function addRowInformation(array $row, array $activity)
+	{
 		$this->profiler->startRecording('rendering');
 
 		if ($row['uid'] == 0) {
@@ -509,11 +803,13 @@ class Conversation
 		if (!empty($activity)) {
 			if (($row['gravity'] == GRAVITY_PARENT)) {
 				$row['post-reason'] = ItemModel::PR_ANNOUNCEMENT;
-				$row = array_merge($row, $activity);
+
+				$row     = array_merge($row, $activity);
 				$contact = Contact::getById($activity['causer-id'], ['url', 'name', 'thumb']);
-				$row['causer-link'] = $contact['url'];
+
+				$row['causer-link']   = $contact['url'];
 				$row['causer-avatar'] = $contact['thumb'];
-				$row['causer-name'] = $contact['name'];
+				$row['causer-name']   = $contact['name'];
 			} elseif (($row['gravity'] == GRAVITY_ACTIVITY) && ($row['verb'] == Activity::ANNOUNCE) &&
 				($row['author-id'] == $activity['causer-id'])) {
 				return $row;
@@ -541,15 +837,15 @@ class Conversation
 				break;
 			case ItemModel::PR_ANNOUNCEMENT:
 				if (!empty($row['causer-id']) && $this->pConfig->get(local_user(), 'system', 'display_resharer')) {
-					$row['owner-id'] = $row['causer-id'];
-					$row['owner-link'] = $row['causer-link'];
+					$row['owner-id']     = $row['causer-id'];
+					$row['owner-link']   = $row['causer-link'];
 					$row['owner-avatar'] = $row['causer-avatar'];
-					$row['owner-name'] = $row['causer-name'];
+					$row['owner-name']   = $row['causer-name'];
 				}
 
-				if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {
-					$causer = ['uid' => 0, 'id' => $row['causer-id'],
-						'network' => $row['causer-network'], 'url' => $row['causer-link']];
+				if (in_array($row['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) && !empty($row['causer-id'])) {
+					$causer = ['uid' => 0, 'id' => $row['causer-id'], 'network' => $row['causer-network'], 'url' => $row['causer-link']];
+
 					$row['reshared'] = $this->l10n->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkByContact($causer)) .'">' . htmlentities($row['causer-name']) . '</a>');
 				}
 				$row['direction'] = ['direction' => 3, 'title' => (empty($row['causer-id']) ? $this->l10n->t('Reshared') : $this->l10n->t('Reshared by %s <%s>', $row['causer-name'], $row['causer-link']))];
@@ -589,7 +885,8 @@ class Conversation
 	 * @return array items with parents and comments
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private function addChildren(array $parents, $block_authors, $order, $uid) {
+	private function addChildren(array $parents, $block_authors, $order, $uid)
+	{
 		$this->profiler->startRecording('rendering');
 		if (count($parents) > 1) {
 			$max_comments = $this->config->get('system', 'max_comments', 100);
@@ -604,7 +901,7 @@ class Conversation
 		$commentcounter  = [];
 		$activitycounter = [];
 
-		foreach ($parents AS $parent) {
+		foreach ($parents as $parent) {
 			if (!empty($parent['thr-parent-id']) && !empty($parent['gravity']) && ($parent['gravity'] == GRAVITY_ACTIVITY)) {
 				$uriid = $parent['thr-parent-id'];
 				if (!empty($parent['author-id'])) {
@@ -660,302 +957,6 @@ class Conversation
 		return $items;
 	}
 
-	/**
-	 * Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.)
-	 *
-	 * Increments the count of each matching activity and adds a link to the author as needed.
-	 *
-	 * @param array  $activity
-	 * @param array &$conv_responses (already created with builtin activity structure)
-	 * @return void
-	 * @throws ImagickException
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function builtinActivityPuller(array $activity, array &$conv_responses)
-	{
-		foreach ($conv_responses as $mode => $v) {
-			$sparkle = '';
-
-			switch ($mode) {
-				case 'like':
-					$verb = Activity::LIKE;
-					break;
-				case 'dislike':
-					$verb = Activity::DISLIKE;
-					break;
-				case 'attendyes':
-					$verb = Activity::ATTEND;
-					break;
-				case 'attendno':
-					$verb = Activity::ATTENDNO;
-					break;
-				case 'attendmaybe':
-					$verb = Activity::ATTENDMAYBE;
-					break;
-				case 'announce':
-					$verb = Activity::ANNOUNCE;
-					break;
-				default:
-					return;
-			}
-
-			if (!empty($activity['verb']) && $this->activity->match($activity['verb'], $verb) && ($activity['gravity'] != GRAVITY_PARENT)) {
-				$author = [
-					'uid' => 0,
-					'id' => $activity['author-id'],
-					'network' => $activity['author-network'],
-					'url' => $activity['author-link']
-				];
-				$url = Contact::magicLinkByContact($author);
-				if (strpos($url, 'redir/') === 0) {
-					$sparkle = ' class="sparkle" ';
-				}
-
-				$link = '<a href="' . $url . '"' . $sparkle . '>' . htmlentities($activity['author-name']) . '</a>';
-
-				if (empty($activity['thr-parent-id'])) {
-					$activity['thr-parent-id'] = $activity['parent-uri-id'];
-				}
-
-				// Skip when the causer of the parent is the same than the author of the announce
-				if (($verb == Activity::ANNOUNCE) && Post::exists(['uri-id' => $activity['thr-parent-id'],
-					'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) {
-					continue;
-				}
-
-				if (!isset($conv_responses[$mode][$activity['thr-parent-id']])) {
-					$conv_responses[$mode][$activity['thr-parent-id']] = [
-						'links' => [],
-						'self' => 0,
-					];
-				} elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent-id']]['links'])) {
-					// only list each unique author once
-					continue;
-				}
-
-				if (public_contact() == $activity['author-id']) {
-					$conv_responses[$mode][$activity['thr-parent-id']]['self'] = 1;
-				}
-
-				$conv_responses[$mode][$activity['thr-parent-id']]['links'][] = $link;
-
-				// there can only be one activity verb per item so if we found anything, we can stop looking
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Format the activity text for an item/photo/video
-	 *
-	 * @param array  $links = array of pre-linked names of actors
-	 * @param string $verb  = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
-	 * @param int    $id    = item id
-	 * @return string formatted text
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public function formatActivity(array $links, $verb, $id) {
-		$this->profiler->startRecording('rendering');
-		$o = '';
-		$expanded = '';
-		$phrase = '';
-
-		$total = count($links);
-		if ($total == 1) {
-			$likers = $links[0];
-
-			// Phrase if there is only one liker. In other cases it will be uses for the expanded
-			// list which show all likers
-			switch ($verb) {
-				case 'like' :
-					$phrase = $this->l10n->t('%s likes this.', $likers);
-					break;
-				case 'dislike' :
-					$phrase = $this->l10n->t('%s doesn\'t like this.', $likers);
-					break;
-				case 'attendyes' :
-					$phrase = $this->l10n->t('%s attends.', $likers);
-					break;
-				case 'attendno' :
-					$phrase = $this->l10n->t('%s doesn\'t attend.', $likers);
-					break;
-				case 'attendmaybe' :
-					$phrase = $this->l10n->t('%s attends maybe.', $likers);
-					break;
-				case 'announce' :
-					$phrase = $this->l10n->t('%s reshared this.', $likers);
-					break;
-			}
-		} elseif ($total > 1) {
-			if ($total < MAX_LIKERS) {
-				$likers = implode(', ', array_slice($links, 0, -1));
-				$likers .= ' ' . $this->l10n->t('and') . ' ' . $links[count($links)-1];
-			} else  {
-				$likers = implode(', ', array_slice($links, 0, MAX_LIKERS - 1));
-				$likers .= ' ' . $this->l10n->t('and %d other people', $total - MAX_LIKERS);
-			}
-
-			$spanatts = "class=\"fakelink\" onclick=\"openClose('{$verb}list-$id');\"";
-
-			$explikers = '';
-			switch ($verb) {
-				case 'like':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> like this', $spanatts, $total);
-					$explikers = $this->l10n->t('%s like this.', $likers);
-					break;
-				case 'dislike':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> don\'t like this', $spanatts, $total);
-					$explikers = $this->l10n->t('%s don\'t like this.', $likers);
-					break;
-				case 'attendyes':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> attend', $spanatts, $total);
-					$explikers = $this->l10n->t('%s attend.', $likers);
-					break;
-				case 'attendno':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> don\'t attend', $spanatts, $total);
-					$explikers = $this->l10n->t('%s don\'t attend.', $likers);
-					break;
-				case 'attendmaybe':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> attend maybe', $spanatts, $total);
-					$explikers = $this->l10n->t('%s attend maybe.', $likers);
-					break;
-				case 'announce':
-					$phrase = $this->l10n->t('<span  %1$s>%2$d people</span> reshared this', $spanatts, $total);
-					$explikers = $this->l10n->t('%s reshared this.', $likers);
-					break;
-			}
-
-			$expanded .= "\t" . '<p class="wall-item-' . $verb . '-expanded" id="' . $verb . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
-		}
-
-		$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
-			'$phrase' => $phrase,
-			'$type' => $verb,
-			'$id' => $id
-		]);
-		$o .= $expanded;
-
-		$this->profiler->stopRecording();
-		return $o;
-	}
-
-	public function statusEditor(array $x = [], $notes_cid = 0, $popup = false)
-	{
-		$user = User::getById($this->app->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
-		if (empty($user['uid'])) {
-			return '';
-		}
-
-		$this->profiler->startRecording('rendering');
-		$o = '';
-
-		$x['allow_location']   = $x['allow_location']   ?? $user['allow_location'];
-		$x['default_location'] = $x['default_location'] ?? $user['default-location'];
-		$x['nickname']         = $x['nickname']         ?? $user['nickname'];
-		$x['lockstate']        = $x['lockstate']        ?? ACL::getLockstateForUserId($user['uid']) ? 'lock' : 'unlock';
-		$x['acl']              = $x['acl']              ?? ACL::getFullSelectorHTML($this->page, $user['uid'], true);
-		$x['bang']             = $x['bang']             ?? '';
-		$x['visitor']          = $x['visitor']          ?? 'block';
-		$x['is_owner']         = $x['is_owner']         ?? true;
-		$x['profile_uid']      = $x['profile_uid']      ?? local_user();
-
-
-		$geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
-
-		$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
-		$this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-			'$newpost'   => 'true',
-			'$baseurl'   => $this->baseURL->get(true),
-			'$geotag'    => $geotag,
-			'$nickname'  => $x['nickname'],
-			'$ispublic'  => $this->l10n->t('Visible to <strong>everybody</strong>'),
-			'$linkurl'   => $this->l10n->t('Please enter a image/video/audio/webpage URL:'),
-			'$term'      => $this->l10n->t('Tag term:'),
-			'$fileas'    => $this->l10n->t('Save to Folder:'),
-			'$whereareu' => $this->l10n->t('Where are you right now?'),
-			'$delitems'  => $this->l10n->t("Delete item\x28s\x29?"),
-			'$is_mobile' => $this->mode->isMobile(),
-		]);
-
-		$jotplugins = '';
-		Hook::callAll('jot_tool', $jotplugins);
-
-		$tpl = Renderer::getMarkupTemplate("jot.tpl");
-
-		$o .= Renderer::replaceMacros($tpl, [
-			'$new_post' => $this->l10n->t('New Post'),
-			'$return_path'  => $this->args->getQueryString(),
-			'$action'       => 'item',
-			'$share'        => ($x['button'] ?? '') ?: $this->l10n->t('Share'),
-			'$loading'      => $this->l10n->t('Loading...'),
-			'$upload'       => $this->l10n->t('Upload photo'),
-			'$shortupload'  => $this->l10n->t('upload photo'),
-			'$attach'       => $this->l10n->t('Attach file'),
-			'$shortattach'  => $this->l10n->t('attach file'),
-			'$edbold'       => $this->l10n->t('Bold'),
-			'$editalic'     => $this->l10n->t('Italic'),
-			'$eduline'      => $this->l10n->t('Underline'),
-			'$edquote'      => $this->l10n->t('Quote'),
-			'$edcode'       => $this->l10n->t('Code'),
-			'$edimg'        => $this->l10n->t('Image'),
-			'$edurl'        => $this->l10n->t('Link'),
-			'$edattach'     => $this->l10n->t('Link or Media'),
-			'$edvideo'      => $this->l10n->t('Video'),
-			'$setloc'       => $this->l10n->t('Set your location'),
-			'$shortsetloc'  => $this->l10n->t('set location'),
-			'$noloc'        => $this->l10n->t('Clear browser location'),
-			'$shortnoloc'   => $this->l10n->t('clear location'),
-			'$title'        => $x['title'] ?? '',
-			'$placeholdertitle' => $this->l10n->t('Set title'),
-			'$category'     => $x['category'] ?? '',
-			'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? $this->l10n->t("Categories \x28comma-separated list\x29") : '',
-			'$scheduled_at' => Temporal::getDateTimeField(
-				new \DateTime(),
-				new \DateTime('now + 6 months'),
-				null,
-				$this->l10n->t('Scheduled at'),
-				'scheduled_at'
-			),
-			'$wait'         => $this->l10n->t('Please wait'),
-			'$permset'      => $this->l10n->t('Permission settings'),
-			'$shortpermset' => $this->l10n->t('Permissions'),
-			'$wall'         => $notes_cid ? 0 : 1,
-			'$posttype'     => $notes_cid ? ItemModel::PT_PERSONAL_NOTE : ItemModel::PT_ARTICLE,
-			'$content'      => $x['content'] ?? '',
-			'$post_id'      => $x['post_id'] ?? '',
-			'$baseurl'      => $this->baseURL->get(true),
-			'$defloc'       => $x['default_location'],
-			'$visitor'      => $x['visitor'],
-			'$pvisit'       => $notes_cid ? 'none' : $x['visitor'],
-			'$public'       => $this->l10n->t('Public post'),
-			'$lockstate'    => $x['lockstate'],
-			'$bang'         => $x['bang'],
-			'$profile_uid'  => $x['profile_uid'],
-			'$preview'      => $this->l10n->t('Preview'),
-			'$jotplugins'   => $jotplugins,
-			'$notes_cid'    => $notes_cid,
-			'$cancel'       => $this->l10n->t('Cancel'),
-			'$rand_num'     => Crypto::randomDigits(12),
-
-			// ACL permissions box
-			'$acl'           => $x['acl'],
-
-			//jot nav tab (used in some themes)
-			'$message' => $this->l10n->t('Message'),
-			'$browser' => $this->l10n->t('Browser'),
-
-			'$compose_link_title' => $this->l10n->t('Open Compose page'),
-		]);
-
-
-		if ($popup == true) {
-			$o = '<div id="jot-popup" style="display: none;">' . $o . '</div>';
-		}
-
-		$this->profiler->stopRecording();
-		return $o;
-	}
-
 	/**
 	 * Plucks the children of the given parent from a given item list.
 	 *
@@ -979,6 +980,7 @@ class Conversation
 
 					if ($thr_parent == $parent['uri-id']) {
 						$item['children'] = $this->getItemChildren($item_list, $item);
+
 						$children[] = $item;
 						unset($item_list[$i]);
 					}
@@ -1058,7 +1060,7 @@ class Conversation
 
 			if (isset($child['children']) && count($child['children'])) {
 				// This helps counting only the regular posts
-				$count_post_closure = function($var) {
+				$count_post_closure = function ($var) {
 					$this->profiler->stopRecording();
 					return $var['verb'] === Activity::POST;
 				};
@@ -1072,7 +1074,7 @@ class Conversation
 
 					// Searches the post item in the children
 					$j = 0;
-					while($child['children'][$j]['verb'] !== Activity::POST && $j < count($child['children'])) {
+					while ($child['children'][$j]['verb'] !== Activity::POST && $j < count($child['children'])) {
 						$j ++;
 					}
 
@@ -1143,9 +1145,8 @@ class Conversation
 		* items and add them as children of their top-level post.
 		*/
 		foreach ($parents as $i => $parent) {
-			$parents[$i]['children'] =
-				array_merge($this->getItemChildren($item_array, $parent, true),
-					$this->getItemChildren($item_array, $parent, false));
+			$parents[$i]['children'] = array_merge($this->getItemChildren($item_array, $parent, true),
+				$this->getItemChildren($item_array, $parent, false));
 		}
 
 		foreach ($parents as $i => $parent) {