X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=5aba7eb81d273c613a91c12f41dd59c887d6bc30;hb=7e06127d74565b1c63ca897437ef084a0a7415e0;hp=da41c8656e9499d28fd26e8685b00dbfddac6379;hpb=ef0014a4c68e2d4052abfce20ba8db7ce7d5e335;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index da41c8656e..5aba7eb81d 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -25,6 +25,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -32,10 +33,12 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Module\ActivityPub\Objects;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
 
 function display_init(App $a)
 {
@@ -99,16 +102,23 @@ function display_init(App $a)
 	}
 
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-		Logger::info('Directly serving XML for uri-id '.$item['uri-id']);
+		Logger::debug('Directly serving XML', ['uri-id' => $item['uri-id']]);
 		displayShowFeed($item['uri-id'], $item['uid'], false);
 	}
 
 	if ($item['gravity'] != GRAVITY_PARENT) {
-		$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => $item['uid'], 'uri-id' => $item['parent-uri-id']]);
+		$parent = Post::selectFirstForUser($item_user, $fields, ['uid' => [0, $item_user], 'uri-id' => $item['parent-uri-id']], ['order' => ['uid' => true]]);
 		$item = $parent ?: $item;
 	}
 
-	DI::page()['aside'] = Widget\VCard::getHTML(display_fetchauthor($item));
+	$author = display_fetchauthor($item);
+
+	if (\Friendica\Util\Network::isLocalLink($author['url'])) {
+		\Friendica\Model\Profile::load(DI::app(), $author['nick'], false);
+	} else {
+		DI::page()['aside'] = Widget\VCard::getHTML($author);
+	}
+	$a->setProfileOwner($item['uid']);
 }
 
 function display_fetchauthor($item)
@@ -150,6 +160,20 @@ function display_content(App $a, $update = false, $update_uid = 0)
 			}
 			$parent_uri_id = $item['parent-uri-id'];
 		}
+		if (empty($_REQUEST['force'])) {
+			$browser_update = intval(DI::pConfig()->get($update_uid, 'system', 'update_interval'));
+			if (!empty($browser_update)) {
+				$update_date = date(DateTimeFormat::MYSQL, time() - ($browser_update / 500));
+				if (!Post::exists(["`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?", $parent_uri_id, 0, $update_uid, $update_date])) {
+					Logger::debug('No updated content', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
+					return '';
+				} else {
+					Logger::debug('Updated content found', ['uri-id' => $uri_id, 'uid' => $update_uid, 'updated' => $update_date]);
+				}
+			}	
+		} else {
+			Logger::debug('Forced content update', ['uri-id' => $uri_id, 'uid' => $update_uid]);
+		}
 	} else {
 		$uri_id = ((DI::args()->getArgc() > 2) ? DI::args()->getArgv()[2] : 0);
 		$parent_uri_id = $uri_id;
@@ -278,7 +302,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	// Preparing the meta header
 	$description = trim(BBCode::toPlaintext($item['body']));
-	$title = trim(BBCode::toPlaintext($item['title']));
+	$title = trim(BBCode::toPlaintext($item['title'] ?? ''));
 	$author_name = $item['author-name'];
 
 	$image = DI::baseUrl()->remove($item['author-avatar']);
@@ -342,7 +366,6 @@ function displayShowFeed(int $uri_id, int $uid, bool $conversation)
 	if ($xml == '') {
 		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('The feed for this item is unavailable.'));
 	}
-	header("Content-type: application/atom+xml");
-	echo $xml;
-	exit();
+
+	System::httpExit($xml, Response::TYPE_ATOM);
 }