From 36c65643fbcd3ed039a6d31f4bbb12e93c19191e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 12 Nov 2020 05:17:48 +0000
Subject: [PATCH] Fix fatal errors

---
 src/Protocol/ActivityPub/Transmitter.php | 10 ++++++-
 src/Protocol/Feed.php                    | 38 +++++++++++++-----------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 6ac55dc123..5fc27015ba 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -995,11 +995,19 @@ class Transmitter
 			if (!empty($author['nurl'])) {
 				$self = Contact::selectFirst(['uid'], ['nurl' => $author['nurl'], 'self' => true]);
 				if (!empty($self['uid'])) {
-					$item = Item::selectFirst([], ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
+					$forum_item = Item::selectFirst([], ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
+					if (DBA::isResult($item)) {
+						$item = $forum_item; 
+					}
 				}
 			}
 		}
 
+		if (empty($item['uri-id'])) {
+			Logger::warning('Item without uri-id', ['item' => $item]);
+			return false;
+		}
+
 		if (empty($type)) {
 			$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
 			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 89e7d75423..fee765f25b 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -552,25 +552,27 @@ class Feed
 
 				$data = PageInfo::queryUrl($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_denylist"] ?? '');
 
-				// Take the data that was provided by the feed if the query is empty
-				if (($data['type'] == 'link') && empty($data['title']) && empty($data['text'])) {
-					$data['title'] = $saved_title;
-					$item["body"] = $saved_body;
+				if (!empty($data)) {
+					// Take the data that was provided by the feed if the query is empty
+					if (($data['type'] == 'link') && empty($data['title']) && empty($data['text'])) {
+						$data['title'] = $saved_title;
+						$item["body"] = $saved_body;
+					}
+
+					$data_text = strip_tags(trim($data['text'] ?? ''));
+					$item_body = strip_tags(trim($item['body'] ?? ''));
+
+					if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
+						$data['text'] = '';
+					}
+
+					// We always strip the title since it will be added in the page information
+					$item["title"] = "";
+					$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromData($data, false);
+					$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
+					$item["object-type"] = Activity\ObjectType::BOOKMARK;
+					$attachments = [];
 				}
-
-				$data_text = strip_tags(trim($data['text'] ?? ''));
-				$item_body = strip_tags(trim($item['body'] ?? ''));
-
-				if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
-					$data['text'] = '';
-				}
-
-				// We always strip the title since it will be added in the page information
-				$item["title"] = "";
-				$item["body"] = $item["body"] . "\n" . PageInfo::getFooterFromData($data, false);
-				$taglist = $contact["fetch_further_information"] == 2 ? PageInfo::getTagsFromUrl($item["plink"], $preview, $contact["ffi_keyword_denylist"] ?? '') : [];
-				$item["object-type"] = Activity\ObjectType::BOOKMARK;
-				$attachments = [];
 			} else {
 				if (!empty($summary)) {
 					$item["body"] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item["body"];