X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FPost.php;h=2ef53d075ce1c467770539a3a145a569ced16803;hb=83b00ef3081618dca2a17537289f55a485f70b00;hp=2890c87ecda72f379ef702c7638cdc0eb5bc7bc5;hpb=4aa28de89ec9dd0e27b37dbde9b8758c5bb6c4b4;p=friendica.git

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 2890c87ecd..2ef53d075c 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -14,6 +14,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Session;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -70,13 +71,8 @@ class Post extends BaseObject
 		$this->setTemplate('wall');
 		$this->toplevel = $this->getId() == $this->getDataValue('parent');
 
-		if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
-			foreach ($_SESSION['remote'] as $visitor) {
-				if ($visitor['cid'] == $this->getDataValue('contact-id')) {
-					$this->visiting = true;
-					break;
-				}
-			}
+		if (!empty(Session::getUserIDForVisitorContactID($this->getDataValue('contact-id')))) {
+			$this->visiting = true;
 		}
 
 		$this->writable = $this->getDataValue('writable') || $this->getDataValue('self');
@@ -223,7 +219,7 @@ class Post extends BaseObject
 		$author = ['uid' => 0, 'id' => $item['author-id'],
 			'network' => $item['author-network'], 'url' => $item['author-link']];
 
-		if (local_user() || remote_user()) {
+		if (Session::isAuthenticated()) {
 			$profile_link = Contact::magicLinkByContact($author);
 		} else {
 			$profile_link = $item['author-link'];
@@ -238,7 +234,7 @@ class Post extends BaseObject
 		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
 		// process action responses - e.g. like/dislike/attend/agree/whatever
-		$response_verbs = ['like', 'dislike'];
+		$response_verbs = ['like', 'dislike', 'announce'];
 
 		$isevent = false;
 		$attend = [];
@@ -400,7 +396,7 @@ class Post extends BaseObject
 			'location'        => $location_e,
 			'indent'          => $indent,
 			'shiny'           => $shiny,
-			'owner_self'      => $item['author-link'] == defaults($_SESSION, 'my_url', null),
+			'owner_self'      => $item['author-link'] == Session::get('my_url'),
 			'owner_url'       => $this->getOwnerUrl(),
 			'owner_photo'     => $a->removeBaseURL(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
 			'owner_name'      => $owner_name_e,
@@ -425,13 +421,14 @@ class Post extends BaseObject
 			'edited'          => $edited,
 			'network'         => $item["network"],
 			'network_name'    => ContactSelector::networkToName($item['network'], $item['author-link']),
+			'network_icon'    => ContactSelector::networkToIcon($item['network'], $item['author-link']),
 			'received'        => $item['received'],
 			'commented'       => $item['commented'],
 			'created_date'    => $item['created'],
 			'return'          => ($a->cmd) ? bin2hex($a->cmd) : '',
 			'delivery'        => [
 				'queue_count'       => $item['delivery_queue_count'],
-				'queue_done'        => $item['delivery_queue_done'],
+				'queue_done'        => $item['delivery_queue_done'] + $item['delivery_queue_failed'], /// @todo Possibly display it separately in the future
 				'notifier_pending'  => L10n::t('Notifier task is pending'),
 				'delivery_pending'  => L10n::t('Delivery to remote servers is pending'),
 				'delivery_underway' => L10n::t('Delivery to remote servers is underway'),