From 84743c9890f1adf2f3871e8a6cbedc10e39741ba Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 30 Apr 2020 12:36:35 +0200 Subject: [PATCH] Prepare polls --- src/Services/Mastodon_api.php | 37 +++++ src/SocialEntity/Attachment.php | 2 +- src/SocialEntity/Card.php | 2 - src/SocialEntity/Client.php | 3 +- src/SocialEntity/Compose.php | 53 +++++--- src/SocialEntity/CustomField.php | 33 ++--- src/SocialEntity/Emoji.php | 2 - src/SocialEntity/MastodonAccount.php | 57 ++++---- src/SocialEntity/Notification.php | 12 +- src/SocialEntity/Poll.php | 193 +++++++++++++++++++++++++++ src/SocialEntity/PollOption.php | 47 +++++++ src/SocialEntity/Status.php | 40 ++++-- src/SocialEntity/Tag.php | 3 +- 13 files changed, 395 insertions(+), 89 deletions(-) create mode 100644 src/SocialEntity/Poll.php create mode 100644 src/SocialEntity/PollOption.php diff --git a/src/Services/Mastodon_api.php b/src/Services/Mastodon_api.php index 5e4692f..1a7cdf0 100644 --- a/src/Services/Mastodon_api.php +++ b/src/Services/Mastodon_api.php @@ -17,6 +17,8 @@ use App\SocialEntity\Emoji; use App\SocialEntity\MastodonAccount; use App\SocialEntity\Mention; use App\SocialEntity\Notification; +use App\SocialEntity\Poll; +use App\SocialEntity\PollOption; use App\SocialEntity\Status; use App\SocialEntity\Tag; use App\Services\Curl as Curl; @@ -1475,6 +1477,41 @@ class Mastodon_api { $application->setWebsite($statusParams['application']['website']); $status->setApplication($application); } + + if( isset($statusParams['poll'])) { + $poll = new Poll(); + $poll->setId($statusParams['poll']['id']); + $options = []; + if ($poll->getOptions() && count($poll->getOptions()) > 0) { + foreach ($poll->getOptions() as $_o) { + $option = new PollOption(); + $option->setTitle($_o['title']); + $option->setVotesCount($_o['votes_count']); + } + } + $poll->setOptions($options); + $poll->setExpiresAt($this->stringToDate($statusParams['poll']['expired_at'])); + $poll->setExpired($statusParams['poll']['expired']); + $poll->setVotesCount($statusParams['poll']['votes_count']); + if( isset($statusParams['poll']['emojis']) && count($statusParams['poll']['emojis']) > 0){ + $emojis = []; + foreach ($statusParams['poll']['emojis'] as $_e){ + $emoji = new Emoji(); + $emoji->setUrl($_e['url']); + $emoji->setShortcode($_e['shortcode']); + $emoji->setStaticUrl($_e['static_url']); + $emoji->setVisibleInPicker($_e['visible_in_picker']); + $emojis[] = $emoji; + } + $poll->setEmojis($emojis); + } + $poll->setVoted($statusParams['poll']['voted']); + $poll->setMultiple($statusParams['poll']['multiple']); + $poll->setOwnVotes($statusParams['poll']['own_votes']); + $status->setPoll($poll); + } + + $status->setLanguage($statusParams['language']); $status->setPinned(isset($statusParams['pinned'])?true:false); if( $statusParams['reblog'] ) diff --git a/src/SocialEntity/Attachment.php b/src/SocialEntity/Attachment.php index 826ed66..09135a7 100644 --- a/src/SocialEntity/Attachment.php +++ b/src/SocialEntity/Attachment.php @@ -17,7 +17,7 @@ class Attachment private $preview_url; /** @var string */ private $text_url; - /** @var string */ + /** @var string */ private $meta; /** @var string */ private $description; diff --git a/src/SocialEntity/Card.php b/src/SocialEntity/Card.php index 522636c..0918835 100644 --- a/src/SocialEntity/Card.php +++ b/src/SocialEntity/Card.php @@ -3,7 +3,6 @@ namespace App\SocialEntity; - class Card { /** @var string */ @@ -224,5 +223,4 @@ class Card } - } diff --git a/src/SocialEntity/Client.php b/src/SocialEntity/Client.php index 752ede1..37c3c1b 100644 --- a/src/SocialEntity/Client.php +++ b/src/SocialEntity/Client.php @@ -3,7 +3,6 @@ namespace App\SocialEntity; - class Client { @@ -84,5 +83,5 @@ class Client return $this; } - + } diff --git a/src/SocialEntity/Compose.php b/src/SocialEntity/Compose.php index ce4c7e1..d2d5a6a 100644 --- a/src/SocialEntity/Compose.php +++ b/src/SocialEntity/Compose.php @@ -2,8 +2,9 @@ namespace App\SocialEntity; +use DateTime; +use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; class Compose @@ -29,6 +30,14 @@ class Compose private $timeZone; + /** @var Poll */ + private $poll; + + public function __construct() + { + $this->attachments = new ArrayCollection(); + } + /** * @return mixed */ @@ -45,19 +54,13 @@ class Compose $this->timeZone = $timeZone; } - - - public function getTotalMedia(){ - } - - - public function getSent(){ - return ($this->sent_at != null); - } - - public function __construct() + public function getTotalMedia() { - $this->attachments = new ArrayCollection(); + } + + public function getSent() + { + return ($this->sent_at != null); } public function getId(): ?int @@ -102,7 +105,6 @@ class Compose } - /** * @return boolean */ @@ -120,24 +122,24 @@ class Compose } - public function getCreatedAt(): ?\DateTimeInterface + public function getCreatedAt(): ?DateTimeInterface { return $this->created_at; } - public function setCreatedAt(\DateTimeInterface $created_at): self + public function setCreatedAt(DateTimeInterface $created_at): self { $this->created_at = $created_at; return $this; } - public function getScheduledAt(): ?\DateTime + public function getScheduledAt(): ?DateTime { return $this->scheduled_at; } - public function setScheduledAt(?\DateTime $scheduled_at): self + public function setScheduledAt(?DateTime $scheduled_at): self { $this->scheduled_at = $scheduled_at; @@ -156,6 +158,21 @@ class Compose return $this; } + /** + * @return Poll + */ + public function getPoll(): Poll + { + return $this->poll; + } + + /** + * @param Poll $poll + */ + public function setPoll(Poll $poll): void + { + $this->poll = $poll; + } } diff --git a/src/SocialEntity/CustomField.php b/src/SocialEntity/CustomField.php index abdad6f..e8de25f 100644 --- a/src/SocialEntity/CustomField.php +++ b/src/SocialEntity/CustomField.php @@ -3,6 +3,7 @@ namespace App\SocialEntity; +use DateTimeInterface; class CustomField { @@ -27,18 +28,6 @@ class CustomField return $this->id; } - public function getName(): ?string - { - return $this->name; - } - - public function setName(?string $name): self - { - $this->name = $name; - - return $this; - } - public function getValue(): ?string { return $this->value; @@ -51,12 +40,12 @@ class CustomField return $this; } - public function getVerifiedAt(): ?\DateTimeInterface + public function getVerifiedAt(): ?DateTimeInterface { return $this->verified_at; } - public function setVerifiedAt(?\DateTimeInterface $verified_at): self + public function setVerifiedAt(?DateTimeInterface $verified_at): self { $this->verified_at = $verified_at; @@ -77,7 +66,19 @@ class CustomField public function __toString() { - return $this->getName()?$this->getName():""; + return $this->getName() ? $this->getName() : ""; } - + + public function getName(): ?string + { + return $this->name; + } + + public function setName(?string $name): self + { + $this->name = $name; + + return $this; + } + } diff --git a/src/SocialEntity/Emoji.php b/src/SocialEntity/Emoji.php index ff24cbe..1ad59d0 100644 --- a/src/SocialEntity/Emoji.php +++ b/src/SocialEntity/Emoji.php @@ -3,7 +3,6 @@ namespace App\SocialEntity; - class Emoji { private $id; @@ -19,7 +18,6 @@ class Emoji private $mastodonAccount; - public function __construct() { } diff --git a/src/SocialEntity/MastodonAccount.php b/src/SocialEntity/MastodonAccount.php index fadb64f..ea4f702 100644 --- a/src/SocialEntity/MastodonAccount.php +++ b/src/SocialEntity/MastodonAccount.php @@ -3,6 +3,7 @@ namespace App\SocialEntity; +use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; @@ -96,18 +97,6 @@ class MastodonAccount return $this; } - public function getAcct(): ?string - { - return $this->acct; - } - - public function setAcct(string $acct): self - { - $this->acct = $acct; - - return $this; - } - public function getDisplayName(): ?string { return $this->display_name; @@ -132,12 +121,12 @@ class MastodonAccount return $this; } - public function getCreatedAt(): ?\DateTimeInterface + public function getCreatedAt(): ?DateTimeInterface { return $this->created_at; } - public function setCreatedAt(\DateTimeInterface $created_at): self + public function setCreatedAt(DateTimeInterface $created_at): self { $this->created_at = $created_at; @@ -276,18 +265,6 @@ class MastodonAccount return $this; } - public function getInstance(): ?string - { - return $this->instance; - } - - public function setInstance(string $instance): self - { - $this->instance = $instance; - - return $this; - } - public function getClient(): ?Client { return $this->client; @@ -318,13 +295,34 @@ class MastodonAccount return $this; } - - public function __toString() { - return $this->getAcct()."@".$this->getInstance(); + return $this->getAcct() . "@" . $this->getInstance(); } + public function getAcct(): ?string + { + return $this->acct; + } + + public function setAcct(string $acct): self + { + $this->acct = $acct; + + return $this; + } + + public function getInstance(): ?string + { + return $this->instance; + } + + public function setInstance(string $instance): self + { + $this->instance = $instance; + + return $this; + } /** * @return Collection|CustomField[] @@ -422,5 +420,4 @@ class MastodonAccount } - } diff --git a/src/SocialEntity/Notification.php b/src/SocialEntity/Notification.php index 4734535..4ec628c 100644 --- a/src/SocialEntity/Notification.php +++ b/src/SocialEntity/Notification.php @@ -3,13 +3,15 @@ namespace App\SocialEntity; +use DateTime; + class Notification { /** @var string */ private $id; /** @var string */ private $type; - /** @var \DateTime */ + /** @var DateTime */ private $created_at; /** @var MastodonAccount */ private $account; @@ -50,17 +52,17 @@ class Notification } /** - * @return \DateTime + * @return DateTime */ - public function getCreatedAt(): \DateTime + public function getCreatedAt(): DateTime { return $this->created_at; } /** - * @param \DateTime $created_at + * @param DateTime $created_at */ - public function setCreatedAt(\DateTime $created_at): void + public function setCreatedAt(DateTime $created_at): void { $this->created_at = $created_at; } diff --git a/src/SocialEntity/Poll.php b/src/SocialEntity/Poll.php new file mode 100644 index 0000000..a4b6bcd --- /dev/null +++ b/src/SocialEntity/Poll.php @@ -0,0 +1,193 @@ +id; + } + + /** + * @param string $id + */ + public function setId(string $id): void + { + $this->id = $id; + } + + /** + * @return DateTime + */ + public function getExpiresAt(): DateTime + { + return $this->expires_at; + } + + /** + * @param DateTime $expires_at + */ + public function setExpiresAt(DateTime $expires_at): void + { + $this->expires_at = $expires_at; + } + + /** + * @return bool + */ + public function isExpired(): bool + { + return $this->expired; + } + + /** + * @param bool $expired + */ + public function setExpired(bool $expired): void + { + $this->expired = $expired; + } + + /** + * @return bool + */ + public function isMultiple(): bool + { + return $this->multiple; + } + + /** + * @param bool $multiple + */ + public function setMultiple(bool $multiple): void + { + $this->multiple = $multiple; + } + + /** + * @return int + */ + public function getVotesCount(): int + { + return $this->votes_count; + } + + /** + * @param int $votes_count + */ + public function setVotesCount(int $votes_count): void + { + $this->votes_count = $votes_count; + } + + /** + * @return int + */ + public function getVotersCount(): int + { + return $this->voters_count; + } + + /** + * @param int $voters_count + */ + public function setVotersCount(int $voters_count): void + { + $this->voters_count = $voters_count; + } + + /** + * @return bool + */ + public function isVoted(): bool + { + return $this->voted; + } + + /** + * @param bool $voted + */ + public function setVoted(bool $voted): void + { + $this->voted = $voted; + } + + /** + * @return int[] + */ + public function getOwnVotes(): array + { + return $this->own_votes; + } + + /** + * @param int[] $own_votes + */ + public function setOwnVotes(array $own_votes): void + { + $this->own_votes = $own_votes; + } + + /** + * @return PollOption[] + */ + public function getOptions(): array + { + return $this->options; + } + + /** + * @param PollOption[] $options + */ + public function setOptions(array $options): void + { + $this->options = $options; + } + + /** + * @return Emoji[] + */ + public function getEmojis(): array + { + return $this->emojis; + } + + /** + * @param Emoji[] $emojis + */ + public function setEmojis(array $emojis): void + { + $this->emojis = $emojis; + } + + +} \ No newline at end of file diff --git a/src/SocialEntity/PollOption.php b/src/SocialEntity/PollOption.php new file mode 100644 index 0000000..db71315 --- /dev/null +++ b/src/SocialEntity/PollOption.php @@ -0,0 +1,47 @@ +title; + } + + /** + * @param string $title + */ + public function setTitle(string $title): void + { + $this->title = $title; + } + + /** + * @return int + */ + public function getVotesCount(): int + { + return $this->votes_count; + } + + /** + * @param int $votes_count + */ + public function setVotesCount(int $votes_count): void + { + $this->votes_count = $votes_count; + } + + +} \ No newline at end of file diff --git a/src/SocialEntity/Status.php b/src/SocialEntity/Status.php index f087d20..b99501f 100644 --- a/src/SocialEntity/Status.php +++ b/src/SocialEntity/Status.php @@ -3,6 +3,7 @@ namespace App\SocialEntity; +use DateTime; class Status { @@ -20,9 +21,9 @@ class Status private $in_reply_to_account_id; /** @var string */ private $content; - /** @var \DateTime */ + /** @var DateTime */ private $created_at; - /** @var \DateTime */ + /** @var DateTime */ private $scheduled_at; /** @var Emoji[] */ private $emojis = []; @@ -60,6 +61,8 @@ class Status private $pinned; /** @var Status */ private $reblog; + /** @var Poll */ + private $poll; /** * @return string @@ -136,7 +139,7 @@ class Status /** * @param string $in_reply_to_id */ - public function setInReplyToId(?string $in_reply_to_id ): void + public function setInReplyToId(?string $in_reply_to_id): void { $this->in_reply_to_id = $in_reply_to_id; } @@ -174,34 +177,34 @@ class Status } /** - * @return \DateTime|null + * @return DateTime|null */ - public function getCreatedAt(): ?\DateTime + public function getCreatedAt(): ?DateTime { return $this->created_at; } /** - * @param \DateTime $created_at + * @param DateTime $created_at */ - public function setCreatedAt(?\DateTime $created_at): void + public function setCreatedAt(?DateTime $created_at): void { $this->created_at = $created_at; } /** - * @return \DateTime|null + * @return DateTime|null */ - public function getScheduledAt(): ?\DateTime + public function getScheduledAt(): ?DateTime { return $this->scheduled_at; } /** - * @param \DateTime $scheduled_at + * @param DateTime $scheduled_at */ - public function setScheduledAt(\DateTime $scheduled_at): void + public function setScheduledAt(DateTime $scheduled_at): void { $this->scheduled_at = $scheduled_at; } @@ -494,6 +497,21 @@ class Status $this->reblog = $reblog; } + /** + * @return Poll + */ + public function getPoll(): Poll + { + return $this->poll; + } + + /** + * @param Poll $poll + */ + public function setPoll(Poll $poll): void + { + $this->poll = $poll; + } } diff --git a/src/SocialEntity/Tag.php b/src/SocialEntity/Tag.php index 2e560d6..6656168 100644 --- a/src/SocialEntity/Tag.php +++ b/src/SocialEntity/Tag.php @@ -3,7 +3,6 @@ namespace App\SocialEntity; - class Tag { @@ -11,7 +10,7 @@ class Tag private $name; /** @var string */ private $url; - /** @var array */ + /** @var array */ private $history = []; /** @var Status */ private $status;