Fix phpcbf style errors in part of code I didn't change

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 55c27a51986cd08456591ed8188e60e4eec8dc8c..feb7ae6be60c3d990254abc1bf3a961df0f32e95 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -408,7 +408,7 @@ class Item
                if ($notify) {
                        // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
                        // We add the hash of our own host because our host is the original creator of the post.
-                       $prefix_host = DI::baseUrl()->getHostname();
+                       $prefix_host = DI::baseUrl()->getHost();
                } else {
                        $prefix_host = '';
 
@@ -1211,7 +1211,8 @@ class Item
                        Post\Thread::insert($item['uri-id'], $item);
                }
 
-               if (!in_array($item['verb'], self::ACTIVITIES)) {
+               // The content of activities normally doesn't matter - except for likes from Misskey
+               if (!in_array($item['verb'], self::ACTIVITIES) || in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE]) && !empty($item['body']) && ($item['body'] != $item['verb'])) {
                        Post\Content::insert($item['uri-id'], $item);
                }
 
@@ -1714,7 +1715,7 @@ class Item
                        if (!empty($item['event-id'])) {
                                $event_post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]);
                                if (!empty($event_post['event-id'])) {
-                                       $event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish', 'adjust'], ['id' => $item['event-id']]);
+                                       $event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish'], ['id' => $item['event-id']]);
                                        if (!empty($event)) {
                                                // We aren't using "Event::store" here, since we don't want to trigger any further action
                                                $ret = DBA::update('event', $event, ['id' => $event_post['event-id']]);
@@ -2047,7 +2048,7 @@ class Item
                        $guid = System::createUUID();
                }
 
-               return DI::baseUrl()->get() . '/objects/' . $guid;
+               return DI::baseUrl() . '/objects/' . $guid;
        }
 
        /**
@@ -2287,7 +2288,7 @@ class Item
                }
 
                // Prevent to forward already forwarded posts
-               if ($datarray['app'] == DI::baseUrl()->getHostname()) {
+               if ($datarray['app'] == DI::baseUrl()->getHost()) {
                        Logger::info('Already forwarded (second test)');
                        return false;
                }