Fix emoji + set timezone automatically

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.*",

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",

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 "<pre>",print_r($data),"</pre>";
+            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 */

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_warning', TextType::class, ['required' => false]);
-        $builder->add('content', TextareaType::class);
+        $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 "]]);
+
     }
 
 

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;
-    }
 
 
 }

src/Twig/AppExtension.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by fediplan.
+ * User: tom79
+ * Date: 09/08/19
+ * Time: 17:37
+ */
+
+namespace App\Twig;
+
+use App\SocialEntity\MastodonAccount;
+use App\SocialEntity\Status;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+class AppExtension extends AbstractExtension
+{
+    public function getFunctions()
+    {
+
+        return [
+            new TwigFunction('convertAccountEmoji', [$this, 'accountEmoji']),
+            new TwigFunction('convertStatusEmoji', [$this, 'statusEmoji']),
+        ];
+    }
+
+    public function accountEmoji($account, $content)
+    {
+       if( $account instanceof MastodonAccount){
+            foreach( $account->getEmojis() as $emoji){
+                $content = preg_replace("(:" . $emoji->getShortcode() .":)", "<img src='". $emoji->getUrl() . "' alt='".$emoji->getShortcode()."'  title='".$emoji->getShortcode()."' width='20'/>", $content);
+            }
+        }
+       return $content;
+    }
+
+    public function statusEmoji($status, $content)
+    {
+        if( $status instanceof Status){
+            foreach( $status->getEmojis() as $emoji){
+                $content = preg_replace("(:" . $emoji->getShortcode() . ":)", "<img src='". $emoji->getUrl() . "' alt='".$emoji->getShortcode()."' title='".$emoji->getShortcode()."' width='20'/>", $content);
+            }
+        }
+        return $content;
+    }
+}

templates/fediplan/schedule.html.twig

@@ -5,9 +5,26 @@
 {% block content %}
     {% include 'nav.html.twig' %}
     <h1>Schedule</h1>
-
-    {{ form_row(form._token) }}
     <div class="row">
+        <div class="col-6 mt-3">
+            <div class="card">
+                <div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
+                    <div class="img-square-wrapper">
+                        <img class="" width="100" src="{{ app.user.avatar }}" >
+                    </div>
+                    <div class="card-body">
+                        <h4 class="card-title">{{ convertAccountEmoji(app.user, app.user.displayName) | raw }}</h4>
+                        <p class="card-text">@{{ app.user.acct }}</p>
+                    </div>
+                </div>
+                <div class="card-footer">
+                    <small class="text-muted">{{ app.user.note }}</small>
+                </div>
+            </div>
+        </div>
+    </div>
+    {{ form_start(form) }}
+    <div class="row" style="margin-top: 30px;">
         <div class="col-md-12">
             <div class="row">
                 <div class=" col-md-6">
@@ -96,13 +113,28 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class=" col-md-7"></div>
+                <div class=" col-md-4">
+                    <div class="form-group has-feedback">
+                        {{ form_label(form.timeZone) }}
+                        {{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }}
+                        {% if not form.timeZone.vars.errors is empty %}
+                            <span class="label label-danger">
+                                            {% for errorItem in form.timeZone.vars.errors %}
+                                                {{ errorItem.message }}
+                                            {% endfor %}
+                                        </span>
+                        {% endif %}
+                    </div>
+                </div>
+                <div class=" col-md-3"></div>
             </div>
         </div>
 
 
         <div class="container" style="margin-bottom: 30px;" id="media_container"></div>
-
+    </div>
+    {{ form_end(form) }}
+    <div class="row" style="margin-top: 20px;">
         <div class="container">
             <!-- The file upload form used as target for the file upload widget -->
             <form
@@ -339,7 +371,7 @@
                     '                <div class="col-md-6">\n' +
                     '                    <textarea name="media_description_'+data.id+'" class="form-control"></textarea>\n' +
                     '                </div>\n' +
-                    '                <input type="hidden" name="media_id_'+data.id+'"/>\n' +
+                    '                <input type="hidden" name="media_id_'+data.id+'" value="'+data.id+'"/>\n' +
                     '                <div class="col-md-2">\n' +
                     '                        <button class="btn btn-danger" class="delete_media" data-id="'+data.id+'">\n' +
                     '                          <i class="glyphicon glyphicon-trash"></i>\n' +
@@ -394,5 +426,7 @@
                 .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
             $("#count").text(inputText.length);
         });
+        var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        $('#compose_timeZone').val(timezone);
     </script>
 {% endblock %}