Log the command, not the module

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

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 8cb08f65df3788a93cf2d528d3837ff360c4dbed..cde81394d3c0f0acce4354f3c46accd3b26c52ea 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -197,7 +197,6 @@ class Feed
                        $author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
 
                        $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
-                       $author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
 
                        if (empty($author["author-name"])) {
                                $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
@@ -207,6 +206,25 @@ class Feed
                                $author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
                        }
 
+                       $author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
+
+                       if (empty($author["author-avatar"])) {
+                               $avatar = XML::getFirstAttributes($xpath, "/rss/channel/itunes:image");
+                               if (is_object($avatar)) {
+                                       foreach ($avatar as $attribute) {
+                                               if ($attribute->name == "href") {
+                                                       $author["author-avatar"] = $attribute->textContent;
+                                               }
+                                       }
+                               }
+                       }
+
+                       $author["author-about"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, '/rss/channel/description/text()'), $basepath);
+
+                       if (empty($author["author-about"])) {
+                               $author["author-about"] = XML::getFirstNodeValue($xpath, '/rss/channel/itunes:summary/text()');
+                       }
+
                        $author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
 
                        $author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
@@ -284,20 +302,23 @@ class Feed
                                $item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
                        }
 
+                       // Add the base path if missing
+                       $item["plink"] = Network::addBasePath($item["plink"], $basepath);
+
                        $item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
-                       if (empty($item["uri"])) {
-                               $item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
+                       $guid = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
+                       if (!empty($guid)) {
+                               $item["uri"] = $guid;
+
+                               // Don't use the GUID value directly but instead use it as a basis for the GUID
+                               $item["guid"] = Item::guidFromUri($guid, parse_url($guid, PHP_URL_HOST) ?? parse_url($item["plink"], PHP_URL_HOST));
                        }
 
                        if (empty($item["uri"])) {
                                $item["uri"] = $item["plink"];
                        }
 
-                       // Add the base path if missing
-                       $item["uri"] = Network::addBasePath($item["uri"], $basepath);
-                       $item["plink"] = Network::addBasePath($item["plink"], $basepath);
-
                        $orig_plink = $item["plink"];
 
                        try {
@@ -311,10 +332,15 @@ class Feed
                        if (empty($item["title"])) {
                                $item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
                        }
+
                        if (empty($item["title"])) {
                                $item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
                        }
 
+                       if (empty($item["title"])) {
+                               $item["title"] = XML::getFirstNodeValue($xpath, 'itunes:title/text()', $entry);
+                       }
+
                        $item["title"] = html_entity_decode($item["title"], ENT_QUOTES, 'UTF-8');
 
                        $published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
@@ -457,6 +483,7 @@ class Feed
                        }
 
                        if ($dryRun) {
+                               $item['attachments'] = $attachments;
                                $items[] = $item;
                                break;
                        } elseif (!Item::isValid($item)) {
@@ -898,6 +925,11 @@ class Feed
 
                $cachekey = "feed:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
 
+               // Display events in the users's timezone
+               if (strlen($owner['timezone'])) {
+                       DI::app()->setTimeZone($owner['timezone']);
+               }
+
                $previous_created = $last_update;
 
                // Don't cache when the last item was posted less then 15 minutes ago (Cache duration)