X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=b8e55e5b961a349e10b4dee8b1a3412eb9d13f2e;hb=09a44b30399f5923664814af69153b3b7604758b;hp=0692a7341234f66f81530474270af6e4a64f85e8;hpb=8ca53993a591d45757279ba7ce743c19830df88a;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 0692a73412..b8e55e5b96 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -5,25 +5,30 @@
 
 namespace Friendica\Model;
 
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once "include/dba.php";
-
 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;
+
+	public static function getByItemUri($item_uri)
+	{
+		return DBA::selectFirst('conversation', [], ['item-uri' => $item_uri]);
+	}
 
 	/**
 	 * @brief Store the conversation data
@@ -34,7 +39,7 @@ class Conversation
 	public static function insert(array $arr)
 	{
 		if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
-				[Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
+			[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'])) {
@@ -70,18 +75,19 @@ 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']);
 				}
 				if (!DBA::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
-					logger('Conversation: update for ' . $conversation['item-uri'] . ' from ' . $old_conv['protocol'] . ' to ' . $conversation['protocol'] . ' failed',
-						LOGGER_DEBUG);
+					Logger::log('Conversation: update for ' . $conversation['item-uri'] . ' from ' . $old_conv['protocol'] . ' to ' . $conversation['protocol'] . ' failed',
+						Logger::DEBUG);
 				}
 			} else {
 				if (!DBA::insert('conversation', $conversation, true)) {
-					logger('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
-						LOGGER_DEBUG);
+					Logger::log('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
+						Logger::DEBUG);
 				}
 			}
 		}