clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Vogel
2024-02-20 07:09:55 +01:00
committed by GitHub
parent bb7d25dfc9
commit d95c9d28a8
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Object/Api/Mastodon/Poll.php
View File

@@ -61,7 +61,7 @@ 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;
@@ -69,9 +69,23 @@ class Poll extends BaseDataTransferObject
$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;
}
}