Preview for Videos and images / Video resolution selection

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7cb9db1a136d2d4834bc8ad8ef24ea63011f75cf..5eee17e52db40debd1a6482fe7907803dd7d8f65 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,6 +34,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\FContact;
+use Friendica\Model\GServer;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
@@ -2194,6 +2195,12 @@ class DFRN
 
                $item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
 
+               if (!empty($item["title"])) {
+                       $item["post-type"] = Item::PT_ARTICLE;
+               } else {
+                       $item["post-type"] = Item::PT_NOTE;
+               }
+
                $item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
 
                $item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
@@ -2425,8 +2432,8 @@ class DFRN
 
                if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
                        // Will be overwritten for sharing accounts in Item::insert
-                       if (empty($item['post-type']) && ($entrytype == DFRN::REPLY)) {
-                               $item['post-type'] = Item::PT_COMMENT;
+                       if (empty($item['post-reason']) && ($entrytype == DFRN::REPLY)) {
+                               $item['post-reason'] = Item::PR_COMMENT;
                        }
 
                        $posted_id = Item::insert($item);
@@ -2587,7 +2594,7 @@ class DFRN
                $header["direction"] = $direction;
 
                if ($direction === Conversation::RELAY) {
-                       $header['post-type'] = Item::PT_RELAY;
+                       $header['post-reason'] = Item::PR_RELAY;
                }
 
                // Update the contact table if the data has changed
@@ -2604,6 +2611,14 @@ class DFRN
 
                Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
 
+               if (!empty($importer['gsid'])) {
+                       if ($protocol == Conversation::PARCEL_DIASPORA_DFRN) {
+                               GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
+                       } elseif ($protocol == Conversation::PARCEL_LEGACY_DFRN) {
+                               GServer::setProtocol($importer['gsid'], Post\DeliveryData::LEGACY_DFRN);
+                       }
+               }
+
                // is it a public forum? Private forums aren't exposed with this method
                $forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));