Merge pull request #11893 from annando/issue-11890

Issue 11890: Don't use empty contexts
friendica · Sep 6, 2022 · f062216 · f062216
2 parents 934a3a6 + 2a4c6d4
commit f062216
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
@@ -1869,8 +1869,10 @@ private static function processObject(array $object)
 		$object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment', '@value');
 		$object_data['diaspora:like'] = JsonLD::fetchElement($object, 'diaspora:like', '@value');
 		$object_data['actor'] = $object_data['author'] = $actor;
-		$object_data['context'] = JsonLD::fetchElement($object, 'as:context', '@id');
-		$object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation', '@id');
+		$element = JsonLD::fetchElement($object, 'as:context', '@id');
+		$object_data['context'] = $element != './' ? $element : null;
+		$element = JsonLD::fetchElement($object, 'ostatus:conversation', '@id');
+		$object_data['conversation'] = $element != './' ? $element : null;
 		$object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
 		$object_data['name'] = JsonLD::fetchElement($object, 'as:name', '@value');
 		$object_data['summary'] = JsonLD::fetchElement($object, 'as:summary', '@value');

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
@@ -1610,7 +1610,10 @@ public static function createNote(array $item): array
 		$data['url'] = $link ?? $item['plink'];
 		$data['attributedTo'] = $item['author-link'];
 		$data['sensitive'] = self::isSensitive($item['uri-id']);
-		$data['conversation'] = $data['context'] = ($item['conversation'] ?? '');
+
+		if (!empty($item['conversation']) && ($item['conversation'] != './')) {
+			$data['conversation'] = $data['context'] = $item['conversation'];
+		}
 
 		if (!empty($item['title'])) {
 			$data['name'] = BBCode::toPlaintext($item['title'], false);