Issue 13922: "voted" must not be null (#13923)

friendica · Feb 20, 2024 · d95c9d2 · d95c9d2
1 parent bb7d25d
commit d95c9d2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/Factory/Api/Mastodon/Poll.php b/src/Factory/Api/Mastodon/Poll.php
@@ -67,10 +67,12 @@ public function createFromId(int $id, int $uid = 0): \Friendica\Object\Api\Masto
 
 		if (empty($uid)) {
 			$ownvotes = null;
+			$voted    = null;
 		} else {
 			$ownvotes = [];
+			$voted    = false;
 		}
 
-		return new \Friendica\Object\Api\Mastodon\Poll($question, $options, $expired, $votes, $ownvotes);
+		return new \Friendica\Object\Api\Mastodon\Poll($question, $options, $expired, $votes, $ownvotes, $voted);
 	}
 }
diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
@@ -32,7 +32,6 @@
 use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
-use Friendica\Model\Tag as TagModel;
 use Friendica\Model\Verb;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Api\Mastodon\Status\FriendicaDeliveryData;
@@ -60,8 +59,6 @@ class Status extends BaseFactory
 	private $mstdnAttachmentFactory;
 	/** @var Emoji */
 	private $mstdnEmojiFactory;
-	/** @var Error */
-	private $mstdnErrorFactory;
 	/** @var Poll */
 	private $mstdnPollFactory;
 	/** @var ContentItem */
@@ -78,7 +75,6 @@ public function __construct(
 		Card $mstdnCardFactory,
 		Attachment $mstdnAttachmentFactory,
 		Emoji $mstdnEmojiFactory,
-		Error $mstdnErrorFactory,
 		Poll $mstdnPollFactory,
 		ContentItem $contentItem,
 		ACLFormatter $aclFormatter
@@ -91,7 +87,6 @@ public function __construct(
 		$this->mstdnCardFactory       = $mstdnCardFactory;
 		$this->mstdnAttachmentFactory = $mstdnAttachmentFactory;
 		$this->mstdnEmojiFactory      = $mstdnEmojiFactory;
-		$this->mstdnErrorFactory      = $mstdnErrorFactory;
 		$this->mstdnPollFactory       = $mstdnPollFactory;
 		$this->contentItem            = $contentItem;
 		$this->aclFormatter           = $aclFormatter;

diff --git a/src/Module/Api/Mastodon/Polls.php b/src/Module/Api/Mastodon/Polls.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;

diff --git a/src/Object/Api/Mastodon/Poll.php b/src/Object/Api/Mastodon/Poll.php
@@ -61,17 +61,31 @@ class Poll extends BaseDataTransferObject
 	 * @param int   $votes    Number of total votes
 	 * @param array $ownvotes Own vote
 	 */
-	public function __construct(array $question, array $options, bool $expired, int $votes, array $ownvotes = null)
+	public function __construct(array $question, array $options, bool $expired, int $votes, array $ownvotes = null, bool $voted = null)
 	{
 		$this->id           = (string)$question['id'];
 		$this->expires_at   = !empty($question['end-time']) ? DateTimeFormat::utc($question['end-time'], DateTimeFormat::JSON) : null;
 		$this->expired      = $expired;
 		$this->multiple     = (bool)$question['multiple'];
 		$this->votes_count  = $votes;
 		$this->voters_count = $this->multiple ? $question['voters'] : null;
-		$this->voted        = null;
+		$this->voted        = $voted;
 		$this->own_votes    = $ownvotes;
 		$this->options      = $options;
 		$this->emojis       = [];
 	}
+
+	public function toArray(): array
+	{
+		$status = parent::toArray();
+
+		if (is_null($status['voted'])) {
+			unset($status['voted']);
+		}
+
+		if (is_null($status['own_votes'])) {
+			unset($status['own_votes']);
+		}
+		return $status;
+	}
 }