From: Art4 <art4@wlabs.de>
Date: Wed, 5 Mar 2025 08:54:57 +0000 (+0000)
Subject: Merge branch 'develop' into phpstan-level-3
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0b162b44293c6e92dadb3a69f2f6b638cf4bd50d;p=friendica.git

Merge branch 'develop' into phpstan-level-3
---

0b162b44293c6e92dadb3a69f2f6b638cf4bd50d
diff --cc src/Object/Api/Mastodon/Relationship.php
index 2e9faf4d0b,1158aa5459..7a179dea3e
--- a/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 77b49f685d,9f68d27d14..652e6dde4d
--- a/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 array */
+ 	protected $filtered = [];
 -	/** @var Status|null */
 +	/** @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 = [];