Merge branch 'develop' into phpstan-level-3

diff --cc src/Module/Api/Mastodon/Search.php
Simple merge

diff --cc src/Object/Api/Mastodon/Relationship.php
index 2e9faf4d0b04e82da4bc8cc70cbd5ec9f6ba8a38,1158aa545925037ea48fbb24910656f9d08035b1..7a179dea3e19bbdd0c1137252a9156c15a7e00c8
--- 1/src/Object/Api/Mastodon/Relationship.php
--- 2/src/Object/Api/Mastodon/Relationship.php
+++ b/src/Object/Api/Mastodon/Relationship.php
@@@ -86,7 -90,10 +90,8 @@@ class Relationship extends BaseDataTran
                        $this->muting      = (bool)($contactRecord['readonly'] ?? false) || $muted;
                        $this->notifying   = (bool)$contactRecord['notify_new_posts'] ?? false;
                        $this->blocking    = (bool)($contactRecord['blocked'] ?? false) || $blocked;
+                       $this->blocked_by  = $isBlocked;
                        $this->note        = $contactRecord['info'];
                }
 -
 -              return $this;
        }
  }

diff --cc src/Object/Api/Mastodon/Status.php
index 77b49f685d3ff2ab48a8fd0b022087b84862f092,9f68d27d14a567c5d1c6107af9f990137fd3faae..652e6dde4d78b6bdbbde5b5b6a382cca50f5e010
--- 1/src/Object/Api/Mastodon/Status.php
--- 2/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@@ -64,19 -64,21 +64,21 @@@ class Status extends BaseDataTransferOb
        protected $pinned = false;
        /** @var string */
        protected $content;
 -      /** @var Status|null */
+       /** @var array */
+       protected $filtered = [];
 +      /** @var Status[]|null */
        protected $reblog = null;
 -      /** @var Status|null - Akkoma extension, see issue https://github.com/friendica/friendica/issues/12603 */
 +      /** @var Status[]|null - Akkoma extension, see issue https://github.com/friendica/friendica/issues/12603 */
        protected $quote = null;
 -      /** @var Application */
 +      /** @var array */
        protected $application = null;
 -      /** @var Account */
 +      /** @var array */
        protected $account;
 -      /** @var Attachment */
 +      /** @var Attachment[] */
        protected $media_attachments = [];
 -      /** @var Mention */
 +      /** @var Mention[] */
        protected $mentions = [];
 -      /** @var Tag */
 +      /** @var Tag[] */
        protected $tags = [];
        /** @var Emoji[] */
        protected $emojis = [];