Merge pull request #5438 from MrPetovan/task/5410-remove-dbm-class

[friendica.git] / src / Model / Conversation.php

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 4b1adc250fe36a860a003605d2457948ff4c80ff..98db86188f89c5872b578324f5d3d351a5d2108f 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -4,8 +4,8 @@
  */
 namespace Friendica\Model;
 
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 require_once "include/dba.php";
 
@@ -27,7 +27,7 @@ class Conversation
         */
        public static function insert($arr) {
                if (in_array(defaults($arr, 'network', NETWORK_PHANTOM), [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && !empty($arr['uri'])) {
-                       $conversation = ['item-uri' => $arr['uri'], 'received' => DBM::date()];
+                       $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'];
@@ -53,8 +53,8 @@ class Conversation
                        }
 
                        $fields = ['item-uri', 'reply-to-uri', 'conversation-uri', 'conversation-href', 'protocol', 'source'];
-                       $old_conv = dba::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
-                       if (DBM::is_result($old_conv)) {
+                       $old_conv = DBA::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
+                       if (DBA::isResult($old_conv)) {
                                // Don't update when only the source has changed.
                                // Only do this when there had been no source before.
                                if ($old_conv['source'] != '') {
@@ -65,11 +65,11 @@ class Conversation
                                        unset($conversation['protocol']);
                                        unset($conversation['source']);
                                }
-                               if (!dba::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
+                               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);
                                }
                        } else {
-                               if (!dba::insert('conversation', $conversation, true)) {
+                               if (!DBA::insert('conversation', $conversation, true)) {
                                        logger('Conversation: insert for '.$conversation['item-uri'].' (protocol '.$conversation['protocol'].') failed', LOGGER_DEBUG);
                                }
                        }