Merge branch 'develop' into mastodon-status-post-with-title

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

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 3dac91e8494025c7fbd7408116fcc6f0a948827b..f7bc282c1e810ecd6fbe0fd48ab082ebb83daa93 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.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
  *
@@ -376,11 +376,11 @@ class Feed
                        }
 
                        if ($published != '') {
-                               $item['created'] = $published;
+                               $item['created'] = trim($published);
                        }
 
                        if ($updated != '') {
-                               $item['edited'] = $updated;
+                               $item['edited'] = trim($updated);
                        }
 
                        if (!$dryRun) {
@@ -624,12 +624,14 @@ class Feed
                        Logger::info('Stored feed', ['item' => $item]);
 
                        $notify = Item::isRemoteSelf($contact, $item);
+                       $item['wall'] = (bool)$notify;
 
-                       // Distributed items should have a well formatted URI.
-                       // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
+                       // Distributed items should have a well-formatted URI.
+                       // Additionally, we have to avoid conflicts with identical URI between imported feeds and these items.
                        if ($notify) {
                                $item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
-                               $item['uri'] = Item::newURI($item['guid']);
+                               $item['uri']  = Item::newURI($item['guid']);
+                               unset($item['plink']);
                                unset($item['thr-parent']);
                                unset($item['parent-uri']);
 
@@ -943,7 +945,7 @@ class Feed
                if ((time() - strtotime($owner['last-item'])) < 15*60) {
                        $result = DI::cache()->get($cachekey);
                        if (!$nocache && !is_null($result)) {
-                               Logger::info('Cached feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+                               Logger::info('Cached feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner['nickname'], 'filter' => $filter, 'created' => $previous_created]);
                                return $result['feed'];
                        }
                }
@@ -997,7 +999,7 @@ class Feed
                $msg = ['feed' => $feeddata, 'last_update' => $last_update];
                DI::cache()->set($cachekey, $msg, Duration::QUARTER_HOUR);
 
-               Logger::info('Feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner_nick, 'filter' => $filter, 'created' => $previous_created]);
+               Logger::info('Feed duration', ['seconds' => number_format(microtime(true) - $stamp, 3), 'nick' => $owner['nickname'], 'filter' => $filter, 'created' => $previous_created]);
 
                return $feeddata;
        }
@@ -1121,7 +1123,7 @@ class Feed
                XML::addElement($doc, $entry, 'id', $item['uri']);
                XML::addElement($doc, $entry, 'title', html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 
-               $body = OStatus::formatPicturePost($item['body'], $item['uri-id']);
+               $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
 
                $body = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);