X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=d05f8af9fd86f734eb1a698152e0c80ea9b146cf;hb=9f96f3ef347e44851a265b1d99e5bb6cf2f4514b;hp=be1eaf2295582a7e1bb1e0777cd7410a63e56f83;hpb=834422d52f0b34fb088f79ac2704c3d514802d8e;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index be1eaf2295..d05f8af9fd 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -1,16 +1,32 @@
 <?php
 /**
- * @file src/Model/Conversation
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once "include/dba.php";
-
 class Conversation
 {
 	/*
@@ -18,23 +34,46 @@ class Conversation
 	 * It currently is stored in the "protocol" field for legacy reasons.
 	 */
 	const PARCEL_ACTIVITYPUB        = 0;
-	const PARCEL_DFRN               = 1;
+	const PARCEL_DFRN               = 1; // Deprecated
 	const PARCEL_DIASPORA           = 2;
 	const PARCEL_SALMON             = 3;
 	const PARCEL_FEED               = 4; // Deprecated
 	const PARCEL_SPLIT_CONVERSATION = 6;
+	const PARCEL_LEGACY_DFRN        = 7;
+	const PARCEL_DIASPORA_DFRN      = 8;
+	const PARCEL_LOCAL_DFRN         = 9;
+	const PARCEL_DIRECT             = 10;
 	const PARCEL_TWITTER            = 67;
 	const PARCEL_UNKNOWN            = 255;
 
 	/**
-	 * @brief Store the conversation data
+	 * Unknown message direction
+	 */
+	const UNKNOWN = 0;
+	/**
+	 * The message had been pushed to this sytem
+	 */
+	const PUSH    = 1;
+	/**
+	 * The message had been fetched by our system
+	 */
+	const PULL    = 2;
+
+	public static function getByItemUri($item_uri)
+	{
+		return DBA::selectFirst('conversation', [], ['item-uri' => $item_uri]);
+	}
+
+	/**
+	 * Store the conversation data
 	 *
 	 * @param array $arr Item array with conversation data
 	 * @return array Item array with removed conversation data
+	 * @throws \Exception
 	 */
 	public static function insert(array $arr)
 	{
-		if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
+		if (in_array(($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()];
 
@@ -58,6 +97,10 @@ class Conversation
 				$conversation['protocol'] = $arr['protocol'];
 			}
 
+			if (isset($arr['direction'])) {
+				$conversation['direction'] = $arr['direction'];
+			}
+
 			if (isset($arr['source'])) {
 				$conversation['source'] = $arr['source'];
 			}
@@ -71,26 +114,30 @@ class Conversation
 					unset($old_conv['source']);
 				}
 				// Update structure data all the time but the source only when its from a better protocol.
-				if (empty($conversation['source']) || (!empty($old_conv['source']) &&
-					($old_conv['protocol'] < defaults($conversation, 'protocol', PARCEL_UNKNOWN)))) {
+				if (
+					empty($conversation['source'])
+					|| (
+						!empty($old_conv['source'])
+						&& ($old_conv['protocol'] < (($conversation['protocol'] ?? '') ?: self::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);
+				if (!DBA::insert('conversation', $conversation, Database::INSERT_UPDATE)) {
+					Logger::log('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
+						Logger::DEBUG);
 				}
 			}
 		}
 
 		unset($arr['conversation-uri']);
 		unset($arr['conversation-href']);
-		unset($arr['protocol']);
 		unset($arr['source']);
 
 		return $arr;