move forgotten rotator from template

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 52ae12f9c3f5a708f73d3370469e580c025e41cd..1bb7bf3ff14dd2938339ed92c3f0d3bfb8e5aed2 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -774,6 +774,7 @@ class DFRN
                }
 
                $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+               $body = Post\Media::addHTMLAttachmentToBody($item['uri-id'], $body);
 
                if ($item['private'] == Item::PRIVATE) {
                        $body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid);
@@ -1014,6 +1015,10 @@ class DFRN
                $xml = $postResult->getBody();
 
                $curl_stat = $postResult->getReturnCode();
+               if (!empty($contact['gsid']) && ($postResult->isTimeout() || empty($curl_stat))) {
+                       GServer::setFailureById($contact['gsid']);
+               }
+
                if (empty($curl_stat) || empty($xml)) {
                        Logger::notice('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
                        return -9; // timed out
@@ -1035,6 +1040,10 @@ class DFRN
                        return -23;
                }
 
+               if (!empty($contact['gsid'])) {
+                       GServer::setReachableById($contact['gsid'], Protocol::DFRN);
+               }
+
                if (!empty($res->message)) {
                        Logger::info('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message);
                }
@@ -2071,6 +2080,7 @@ class DFRN
                        // This is my contact on another system, but it's really me.
                        // Turn this into a wall post.
                        $notify = Item::isRemoteSelf($importer, $item);
+                       $item['wall'] = (bool)$notify;
 
                        $posted_id = Item::insert($item, $notify);