Merge pull request #9242 from nupplaphil/bug/9142-message-id

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

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index c77e1610d007c325de571edd1b7c771840e414a3..6e6ea03fb2ba5bed4495145d155dc8af794a759f 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1735,6 +1735,9 @@ class Diaspora
                $datarray["owner-link"] = $contact["url"];
                $datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
 
+               // Will be overwritten for sharing accounts in Item::insert
+               $datarray['post-type'] = ($datarray["uid"] == 0) ? Item::PT_GLOBAL : Item::PT_COMMENT;
+
                $datarray["guid"] = $guid;
                $datarray["uri"] = self::getUriFromGuid($author, $guid);
                $datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
@@ -2862,6 +2865,10 @@ class Diaspora
                $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
                $datarray["source"] = $xml;
 
+               if ($datarray["uid"] == 0) {
+                       $datarray["post-type"] = Item::PT_GLOBAL;
+               }
+
                $datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
 
                self::storeMentions($datarray['uri-id'], $text);