X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=be1eaf2295582a7e1bb1e0777cd7410a63e56f83;hb=1efca1b75db472b743c15f5a3307895af30fd1e7;hp=cb32c0f20eafa6043d714a88b913bdb07154497c;hpb=ea45a78218a4f615c9a3e35eebaa4a34e10562e9;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index cb32c0f20e..be1eaf2295 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -5,6 +5,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
@@ -16,13 +17,14 @@ class Conversation
 	 * These constants represent the parcel format used to transport a conversation independently of the message protocol.
 	 * It currently is stored in the "protocol" field for legacy reasons.
 	 */
-	const PARCEL_UNKNOWN            = 0;
+	const PARCEL_ACTIVITYPUB        = 0;
 	const PARCEL_DFRN               = 1;
 	const PARCEL_DIASPORA           = 2;
 	const PARCEL_SALMON             = 3;
 	const PARCEL_FEED               = 4; // Deprecated
 	const PARCEL_SPLIT_CONVERSATION = 6;
 	const PARCEL_TWITTER            = 67;
+	const PARCEL_UNKNOWN            = 255;
 
 	/**
 	 * @brief Store the conversation data
@@ -32,13 +34,14 @@ class Conversation
 	 */
 	public static function insert(array $arr)
 	{
-		if (in_array(defaults($arr, 'network', NETWORK_PHANTOM),
-				[NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_TWITTER]) && !empty($arr['uri'])) {
+		if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
+			[Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
 			$conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
 
 			if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
 				$conversation['reply-to-uri'] = $arr['parent-uri'];
 			}
+
 			if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
 				$conversation['reply-to-uri'] = $arr['thr-parent'];
 			}
@@ -68,7 +71,8 @@ class Conversation
 					unset($old_conv['source']);
 				}
 				// Update structure data all the time but the source only when its from a better protocol.
-				if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+				if (empty($conversation['source']) || (!empty($old_conv['source']) &&
+					($old_conv['protocol'] < defaults($conversation, 'protocol', PARCEL_UNKNOWN)))) {
 					unset($conversation['protocol']);
 					unset($conversation['source']);
 				}