From f1351d4f88e05bc80a5746ed0d224b52d7c816f0 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sat, 10 Aug 2019 09:41:59 +0200 Subject: [PATCH] Fix emoji + set timezone automatically --- composer.json | 1 + composer.lock | 2 +- src/Controller/FediPlanController.php | 26 +++++- src/Form/ComposeType.php | 13 ++- src/SocialEntity/Compose.php | 128 ++++---------------------- src/Twig/AppExtension.php | 46 +++++++++ templates/fediplan/schedule.html.twig | 44 ++++++++- 7 files changed, 137 insertions(+), 123 deletions(-) create mode 100644 src/Twig/AppExtension.php diff --git a/composer.json b/composer.json index a8dac2e..4c74ff3 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,7 @@ "sensio/framework-extra-bundle": "^5.4", "symfony/asset": "4.3.*", "symfony/console": "4.3.*", + "symfony/debug": "4.3.*", "symfony/dotenv": "4.3.*", "symfony/flex": "^1.3.1", "symfony/framework-bundle": "4.3.*", diff --git a/composer.lock b/composer.lock index 1c101c3..76afe72 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "355582a0152daf86080ca55f877325ac", + "content-hash": "26bef0bc0c89d795031fc70f28fdc8bd", "packages": [ { "name": "craue/formflow-bundle", diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php index 491ee9d..9a9c5eb 100644 --- a/src/Controller/FediPlanController.php +++ b/src/Controller/FediPlanController.php @@ -119,12 +119,34 @@ class FediPlanController extends AbstractController /** * @Route("/schedule", name="schedule") */ - public function schedule() + public function schedule(Request $request) { $compose = new Compose(); $form = $this->createForm(ComposeType::class, $compose); - if ($form->isSubmitted() && $form->isValid($form)) { + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + $data = $form->getData(); + /** @var $data Compose */ + echo "
",print_r($data),"
"; + foreach ($_POST as $key => $value){ + if( $key != "compose"){ + if (strpos($key, 'media_id_') !== false){ + $mediaId = $value; + $description = $_POST['media_description_'.$mediaId]; + if( $description != null && trim($description) != ""){ + //TODO: update description + } + } + } + } + $cw = $data->getContentWarning(); + $content = $data->getContent(); + $visibility = $data->getVisibility(); + $scheduled_at = $data->getScheduledAt(); + $sensitive = $data->getSensitive(); + $timezone = $data->getTimeZone(); + } $user = $this->getUser(); /** @var $user MastodonAccount */ diff --git a/src/Form/ComposeType.php b/src/Form/ComposeType.php index 3f059b2..a1611df 100644 --- a/src/Form/ComposeType.php +++ b/src/Form/ComposeType.php @@ -14,7 +14,10 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\FileType; +use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\Extension\Core\Type\TimezoneType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -34,8 +37,8 @@ class ComposeType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add('content_warning'); - $builder->add('content', TextareaType::class); + $builder->add('content_warning', TextType::class, ['required' => false]); + $builder->add('content', TextareaType::class, ['required' => false]); $builder->add('visibility', ChoiceType::class, [ 'choices' => [ @@ -45,10 +48,14 @@ class ComposeType extends AbstractType { 'status.visibility.direct' => 'direct', ] ]); - $builder->add('sensitive', CheckboxType::class); + $builder->add('timeZone', TimezoneType::class); + $builder->add('sensitive', CheckboxType::class, ['required' => false]); $builder->add('scheduled_at', \Symfony\Component\Form\Extension\Core\Type\DateTimeType::class,[ 'widget' => 'single_text', + "data" => new \DateTime() ]); + $builder->add('Send', SubmitType::class, ['attr' => ['class' => "btn btn-primary "]]); + } diff --git a/src/SocialEntity/Compose.php b/src/SocialEntity/Compose.php index a9bfe3a..56e3ed8 100644 --- a/src/SocialEntity/Compose.php +++ b/src/SocialEntity/Compose.php @@ -17,29 +17,37 @@ class Compose private $visibility; - private $attachments; - private $created_at; private $scheduled_at; - private $scheduled; - private $sent_at; private $sensitive; - private $social_account; - private $in_reply_to_id; - private $isSensitive; + private $timeZone; + /** + * @return mixed + */ + public function getTimeZone() + { + return $this->timeZone; + } + + /** + * @param mixed $timeZone + */ + public function setTimeZone($timeZone): void + { + $this->timeZone = $timeZone; + } public function getTotalMedia(){ - return count($this->getAttachments()); } @@ -111,31 +119,6 @@ class Compose $this->sensitive = $sensitive; } - /** - * @return Collection|Media[] - */ - public function getAttachments(): Collection - { - return $this->attachments; - } - - public function addAttachment(Media $attachment): self - { - if (!$this->attachments->contains($attachment)) { - $this->attachments[] = $attachment; - } - - return $this; - } - - public function removeAttachment(Media $attachment): self - { - if ($this->attachments->contains($attachment)) { - $this->attachments->removeElement($attachment); - } - - return $this; - } public function getCreatedAt(): ?\DateTimeInterface { @@ -160,74 +143,6 @@ class Compose return $this; } - - - public function getScheduled(): ?bool - { - return $this->scheduled; - } - - public function setScheduled(bool $scheduled): self - { - $this->scheduled = $scheduled; - - return $this; - } - - public function getSentAt(): ?\DateTimeInterface - { - return $this->sent_at; - } - - public function setSentAt(?\DateTimeInterface $sent_at): self - { - $this->sent_at = $sent_at; - - return $this; - } - - /** - * @return Collection|MastodonAccount[] - */ - public function getAccount(): Collection - { - return $this->social_account; - } - - public function addAccount(MastodonAccount $social_account): self - { - if (!$this->social_account->contains($social_account)) { - $this->social_account[] = $social_account; - $social_account->setMessage($this); - } - - return $this; - } - - public function removeAccount(MastodonAccount $social_account): self - { - if ($this->social_account->contains($social_account)) { - $this->social_account->removeElement($social_account); - // set the owning side to null (unless already changed) - if ($social_account->getMessage() === $this) { - $social_account->setMessage(null); - } - } - - return $this; - } - - public function getSocialAccount(): ?MastodonAccount - { - return $this->social_account; - } - - public function setSocialAccount(?MastodonAccount $social_account): self - { - $this->social_account = $social_account; - - return $this; - } public function getInReplyToId(): ?string { @@ -241,17 +156,6 @@ class Compose return $this; } - public function getIsSensitive(): ?bool - { - return $this->isSensitive; - } - - public function setIsSensitive(?bool $isSensitive): self - { - $this->isSensitive = $isSensitive; - - return $this; - } } diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php new file mode 100644 index 0000000..415c82f --- /dev/null +++ b/src/Twig/AppExtension.php @@ -0,0 +1,46 @@ +getEmojis() as $emoji){ + $content = preg_replace("(:" . $emoji->getShortcode() .":)", "".$emoji->getShortcode()."", $content); + } + } + return $content; + } + + public function statusEmoji($status, $content) + { + if( $status instanceof Status){ + foreach( $status->getEmojis() as $emoji){ + $content = preg_replace("(:" . $emoji->getShortcode() . ":)", "".$emoji->getShortcode()."", $content); + } + } + return $content; + } +} \ No newline at end of file diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig index 737418d..4d6310b 100644 --- a/templates/fediplan/schedule.html.twig +++ b/templates/fediplan/schedule.html.twig @@ -5,9 +5,26 @@ {% block content %} {% include 'nav.html.twig' %}

Schedule

- - {{ form_row(form._token) }}
+
+
+
+
+ +
+
+

{{ convertAccountEmoji(app.user, app.user.displayName) | raw }}

+

@{{ app.user.acct }}

+
+
+
+ {{ app.user.note }} +
+
+
+
+ {{ form_start(form) }} +
@@ -96,13 +113,28 @@ {% endif %}
-
+
+
+ {{ form_label(form.timeZone) }} + {{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }} + {% if not form.timeZone.vars.errors is empty %} + + {% for errorItem in form.timeZone.vars.errors %} + {{ errorItem.message }} + {% endfor %} + + {% endif %} +
+
+
- + + {{ form_end(form) }} +
\n' + ' \n' + '
\n' + - ' \n' + + ' \n' + '
\n' + '