Release 1.3.0

Update readme

See merge request tom79/fediplan!87

.env

@@ -15,7 +15,7 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=dev
+APP_ENV=prod
 APP_SECRET=7189792ca5da6b84aff72ec1c63d95ae
 ###< symfony/framework-bundle ###
 

README.md

@@ -14,44 +14,60 @@ There are 2 methods to run Fediplan
 
 #### Steps
 
-1. Clone this repo<br>
+1. Install required programs
+
+2. Clone this repo<br>
 `git clone https://framagit.org/tom79/fediplan.git fediplan`
 
-2. Build the Docker image<br>
-`docker build -t fediplan fediplan`
+3. Build the Docker image<br>
+`docker build --tag fediplan fediplan`
 
-3. Run the docker image<br>
-`docker run fediplan`
+4. Run the docker image<br>
+`docker run --detach --restart unless-stopped --name fediplan fediplan:latest`
 
-4. Find the IP<br>
+5. Find the IP<br>
+`docker inspect fediplan | grep IPAddress`
 
-    - Find 'CONTAINER ID' of fediplan's container<br>
-    `docker ps | grep fediplan`
-
-    - Find IP address of the container<br>
-    `docker inspect <CONTAINER ID> | grep IPAddress`
-
-5. Open _<ip_address>:8080_ in your web browser
+6. Fediplan should be available at _<ip_address>:8080_
 
 ### 2. Manual install
 
 #### Required programs
 - `git`
-- `php 8.3` and some extensions
+- `php 8.3` with these extensions:
+
+    For Composer
+    - `openssl`
+    - `phar`
+    - `iconv`
+    - `xml`
+    - `simplexml`
+    - `xmlwriter`
+
+    For running
+    - `ctype`
+    - `curl`
+    - `dom`
+    - `fpm`
+    - `intl`
+    - `mbstring`
+    - `simplexml`
+    - `session`
+    - `tokenizer`
+
 - `composer` ([getcomposer.org/download](https://getcomposer.org/download/))
 
 #### Steps
 
-1. Clone this repo<br>
+1. Install required programs
+
+2. Clone this repo<br>
 `git clone https://framagit.org/tom79/fediplan.git fediplan`
 
-2. Change directory to the cloned repo<br>
-`cd fediplan`
-
 3. Install vendors<br>
-`composer install -o`
+`php composer.phar install --optimize-autoloader --working-dir=fediplan`
 
-4. Point your server software to '_public_' folder
+4. Point your server software to `fediplan/public` folder
 
 ### Support My work
 [fedilab.app/page/donations](https://fedilab.app/page/donations/)

assets/app.js

@@ -0,0 +1,10 @@
+import './bootstrap.js';
+/*
+ * Welcome to your app's main JavaScript file!
+ *
+ * This file will be included onto the page via the importmap() Twig function,
+ * which should already be in your base.html.twig.
+ */
+import './styles/app.css';
+
+console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');

assets/bootstrap.js

@@ -0,0 +1,5 @@
+import { startStimulusApp } from '@symfony/stimulus-bundle';
+
+const app = startStimulusApp();
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);

assets/controllers.json

@@ -0,0 +1,15 @@
+{
+    "controllers": {
+        "@symfony/ux-turbo": {
+            "turbo-core": {
+                "enabled": true,
+                "fetch": "eager"
+            },
+            "mercure-turbo-stream": {
+                "enabled": false,
+                "fetch": "eager"
+            }
+        }
+    },
+    "entrypoints": []
+}

assets/controllers/hello_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+ * This is an example Stimulus controller!
+ *
+ * Any element with a data-controller="hello" attribute will cause
+ * this controller to be executed. The name "hello" comes from the filename:
+ * hello_controller.js -> "hello"
+ *
+ * Delete this file or adapt it for your use!
+ */
+export default class extends Controller {
+    connect() {
+        this.element.textContent = 'Hello Stimulus! Edit me in assets/controllers/hello_controller.js';
+    }
+}

assets/js/routes.json

@@ -0,0 +1 @@
+{"base_url":"","routes":{"load_more":{"tokens":[["variable","\/","[^\/]++","max_id",true],["text","\/scheduled\/messages"],["variable","\/","[^\/]++","_locale",true]],"defaults":{"max_id":null,"_locale":""},"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"delete_message":{"tokens":[["variable","\/","[^\/]++","id",true],["text","\/scheduled\/delete\/messages"],["variable","\/","fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja|pl|ru|uk","_locale",true]],"defaults":{"_locale":"en","id":null},"requirements":{"_locale":"fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja|pl|ru|uk"},"hosttokens":[],"methods":["POST"],"schemes":[]}},"prefix":"","host":"localhost","port":"","scheme":"http","locale":""}

assets/js/routes.min.json

@@ -0,0 +1 @@
+{"base_url":"","routes":{"load_more":{"tokens":[["variable","\/","[^\/]++","max_id",true],["text","\/scheduled\/messages"],["variable","\/","[^\/]++","_locale",true]],"defaults":{"max_id":null,"_locale":""},"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"delete_message":{"tokens":[["variable","\/","[^\/]++","id",true],["text","\/scheduled\/delete\/messages"],["variable","\/","fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja|pl|ru|uk","_locale",true]],"defaults":{"_locale":"en","id":null},"requirements":{"_locale":"fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja|pl|ru|uk"},"hosttokens":[],"methods":["POST"],"schemes":[]}},"prefix":"","host":"localhost","port":"","scheme":"http","locale":""}

assets/styles/app.css

@@ -0,0 +1,3 @@
+body {
+    background-color: skyblue;
+}

assets/vendor/installed.php

@@ -0,0 +1,22 @@
+<?php return array (
+  '@hotwired/stimulus' => 
+  array (
+    'version' => '3.2.2',
+    'dependencies' => 
+    array (
+    ),
+    'extraFiles' => 
+    array (
+    ),
+  ),
+  '@hotwired/turbo' => 
+  array (
+    'version' => '7.3.0',
+    'dependencies' => 
+    array (
+    ),
+    'extraFiles' => 
+    array (
+    ),
+  ),
+);

composer.json

@@ -40,8 +40,9 @@
         "symfony/validator": "7.0.*",
         "symfony/web-link": "7.0.*",
         "symfony/yaml": "7.0.*",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0"
+        "twig/extra-bundle": "^3.20",
+        "twig/intl-extra": "^3.20",
+        "twig/twig": "v3.15.0"
     },
     "config": {
         "allow-plugins": {
@@ -75,7 +76,9 @@
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "importmap:install": "symfony-cmd"
+            "assets:install --symlink public": "symfony-cmd",
+            "importmap:install": "symfony-cmd",
+            "asset-map:compile": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"

public/css/bootstrap-toggle.min.css

@@ -1,5 +1,5 @@
 /* Copyright Notice
- * bootstrap5-toggle v5.1.0
+ * bootstrap5-toggle v5.1.1
  * https://palcarazm.github.io/bootstrap5-toggle/
  * @author 2011-2014 Min Hur (https://github.com/minhur)
  * @author 2018-2019 Brent Ely (https://github.com/gitbrent)

src/Controller/FediPlanController.php

@@ -274,7 +274,8 @@ class FediPlanController extends AbstractController
     )]
     public function scheduled(): Response
     {
-        return $this->render("fediplan/scheduled.html.twig");
+        $user = $this->getUser();
+        return $this->render("fediplan/scheduled.html.twig", [  'instance' => $user->getInstance(),]);
     }
 
 
@@ -283,7 +284,7 @@ class FediPlanController extends AbstractController
         name: 'load_more',
         options: ['expose' => true]
     )]
-    public function loadMoreAction(Mastodon_api $mastodon_api, string $max_id = null): JsonResponse
+    public function loadMoreAction(Mastodon_api $mastodon_api, ?string $max_id = null , int $limit = 10): JsonResponse
     {
         /** @var $user MastodonAccount */
         $user = $this->getUser();
@@ -292,12 +293,13 @@ class FediPlanController extends AbstractController
         $type = explode(" ", $user->getToken())[0];
         $mastodon_api->set_token($token, $type);
         $params = [];
+        $params['limit'] = $limit;
         if ($max_id != null) {
             $params['max_id'] = $max_id;
         }
         $scheduled_reply = $mastodon_api->get_scheduled($params);
         $statuses = $mastodon_api->getScheduledStatuses($scheduled_reply['response'], $user);
-        $data['max_id'] = $scheduled_reply['max_id'];
+        $data['max_id'] = $statuses[count($statuses)-1]->getId();
         $data['html'] = $this->renderView('fediplan/Ajax/layout.html.twig', ['statuses' => $statuses]);
         return new JsonResponse($data);
     }
@@ -310,7 +312,7 @@ class FediPlanController extends AbstractController
         defaults: ['_locale'=>'en'],
         methods: ['POST']
     )]
-    public function deleteMessage(Mastodon_api $mastodon_api, string $id = null): JsonResponse
+    public function deleteMessage(Mastodon_api $mastodon_api, ?string $id = null): JsonResponse
     {
         $user = $this->getUser();
         $mastodon_api->set_url("https://" . $user->getInstance());

src/Security/MastodonAccount.php

@@ -330,7 +330,7 @@ class MastodonAccount implements UserInterface
 
     public function addField(CustomField $field): self
     {
-        if (in_array($field, $this->Fields) !== false) {
+        if (in_array($field, $this->Fields) === false) {
             $this->Fields[] = $field;
             $field->setMastodonAccount($this);
         }
@@ -357,7 +357,7 @@ class MastodonAccount implements UserInterface
 
     public function addEmoji(Emoji $emoji): self
     {
-        if (in_array($emoji, $this->Emojis) !== false) {
+        if (in_array($emoji, $this->Emojis) === false) {
             $this->Emojis[] = $emoji;
             $emoji->setMastodonAccount($this);
         }

templates/base.html.twig

@@ -42,18 +42,18 @@
 <footer class="footer">
     <div class="container">
        <div class="row">
-           <div class="col-4" style="text-align: center;">
+           <div class="col-md-4" style="text-align: center;">
                <img src="{{ asset('img/FediPlan.png') }}" width="80" style=" border-radius: 5%;margin-top: 10px; margin-bottom: 10px; "><br/>
                FediPlan -{{ "now"|date("Y") }}
            </div>
-           <div class="col-4" style="margin-top: 10px; text-align: center;">
+           <div class="col-md-4" style="margin-top: 10px; text-align: center;">
                {{ 'common.author'|trans }}: Thomas<br/>
                Mastodon: <a href="https://toot.fedilab.app/@apps" target="_blank">@apps</a><br/>
                Framagit: <a href="https://framagit.org/tom79/" target="_blank">@tom79</a><br/>
                Codeberg: <a href="https://codeberg.org/tom79/" target="_blank">@tom79</a><br/>
                Github: <a href="https://github.com/stom79/" target="_blank">@stom79</a><br/>
            </div>
-           <div class="col-4" style="margin-top: 10px; text-align: center;">
+           <div class="col-md-4" style="margin-top: 10px; text-align: center;">
                {{ 'common.license'|trans }}: <a href="https://www.gnu.org/licenses/gpl-3.0.fr.html" target="_blank">GPL 3</a><br/>
                <a href="https://framagit.org/tom79/fediplan" target="_blank">{{ 'common.source_code'|trans}}</a>
            </div>

templates/bundles/TwigBundle/Exception/error404.html.twig

@@ -6,7 +6,7 @@
     {% include 'nav.html.twig' %}
 
     <div class="row">
-        <div class="col-12" style="text-align: center;line-height: normal;margin-top: 100px;">  <pre>
+        <div class="col-md-12" style="text-align: center;line-height: normal;margin-top: 100px;">  <pre>
 ██╗  ██╗ ██████╗ ██╗  ██╗
 ██║  ██║██╔═████╗██║  ██║
 ███████║██║██╔██║███████║
@@ -19,7 +19,7 @@
     </div>
 
     <div class="row">
-        <div class="col-12" style="text-align: center">
+        <div class="col-md-12" style="text-align: center">
             --> <a href="{{ path('index') }}">200</a> <--
         </div>
     </div>

templates/bundles/TwigBundle/Exception/error500.html.twig

@@ -6,7 +6,7 @@
     {% include 'nav.html.twig' %}
 
     <div class="row">
-        <div class="col-12" style="text-align: center;line-height: normal;margin-top: 100px;">  <pre>
+        <div class="col-md-12" style="text-align: center;line-height: normal;margin-top: 100px;">  <pre>
 ███████╗ ██████╗  ██████╗
 ██╔════╝██╔═████╗██╔═████╗
 ███████╗██║██╔██║██║██╔██║
@@ -18,7 +18,7 @@
     </div>
 
     <div class="row">
-        <div class="col-12" style="text-align: center">
+        <div class="col-md-12" style="text-align: center">
             --> <a href="{{ path('index') }}">200</a> <--
         </div>
     </div>

templates/fediplan/Ajax/layout.html.twig

@@ -2,7 +2,7 @@
 {% for status in statuses %}
 
     <div class="row" id="message_container_{{ status.getId()  }}" style="margin-bottom: 20px;">
-        <div class="col-8">
+        <div class="col-md-8">
             <div class="card">
                 <div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
                     <div class="img-square-wrapper">
@@ -46,7 +46,7 @@
                         {% elseif status.visibility == "direct" %}
                             <i class="fa fa-envelope"></i>
                         {% endif %}
-                    </small> - {{ status.scheduledAt | date('d/m/y H:i')   }}
+                    </small> - <span class="date-UTC"> {{ status.scheduledAt | date('Y-m-d H:m:s')   }}</span>
                     <button class="btn btn-danger btn-sm" data-record-id="{{ status.getId() }}"  style="position: absolute;right: 5px;bottom: 5px;"
 
                             {% if status.content is not null %}

templates/fediplan/about.html.twig

@@ -7,26 +7,26 @@
     <h1>{{ 'common.about'|trans }}</h1>
 
     <div class="row ">
-        <div class="col-8 alert alert-secondary" role="alert">
+        <div class="col-md-8 alert alert-secondary" role="alert">
             {{ 'page.about.scheduling'|trans  |raw}}
         </div>
     </div>
 
     <div class="row">
-        <div class="col-8 alert alert-primary" role="alert">
+        <div class="col-md-8 alert alert-primary" role="alert">
             {{ 'page.about.data'|trans |raw}}
         </div>
     </div>
 
     <div class="row">
-        <div class="col-8 alert alert-success" role="alert">
+        <div class="col-md-8 alert alert-success" role="alert">
             {{ 'page.about.issues'|trans |raw}}
         </div>
     </div>
 
 
     <div class="row">
-        <div class="col-8 alert alert-info" role="alert">
+        <div class="col-md-8 alert alert-info" role="alert">
             You can help to translate the project into your language with <b>Crowdin</b> at <a title="Crowdin" target="_blank" href="https://crowdin.com/project/fediplan"><img src="https://badges.crowdin.net/fediplan/localized.svg"></a>
         </div>
     </div>

templates/fediplan/index.html.twig

@@ -12,7 +12,7 @@
     {{ form_errors(form) }}
     {% if flow.getCurrentStepNumber() == 1 %}
         <div class="row">
-            <div class=" col-4">
+            <div class="col-md-4">
                 <div class="form-group has-feedback">
                     {{ form_label(form.host) }}
                     <div class="input-group mb-3">
@@ -31,7 +31,7 @@
         </div>
     {% elseif flow.getCurrentStepNumber() == 2 %}
         <div class="row">
-            <div class="col-6">
+            <div class="col-md-6">
                 <div class="alert alert-warning">
                     {{ 'messages.login_authorization'|trans }}
                 </div>
@@ -39,7 +39,7 @@
             </div>
         </div>
         <div class="row">
-            <div class=" col-md-4">
+            <div class="col-md-4">
                 <div class="form-group has-feedback">
                     {{ form_label(form.code) }}
                     <div class="input-group mb-3">
@@ -62,7 +62,7 @@
     {% endif %}
     {{ form_widget(form) }}
     <div class="row">
-        <div class="col-2">
+        <div class="col-md-2">
             <input type="submit" class="btn btn-primary btn-block btn-flat"  value="{{ 'common.next'|trans }}"/>
         </div>
     </div>
@@ -71,7 +71,7 @@
     <blockquote class="blockquote text-center" style="margin-top: 50px;">
         <p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
         <p>{{ 'page.index.data'|trans |raw}}</p>
-        <footer class="blockquote-footer">FediPlan 1.2.1</footer>
+        <footer class="blockquote-footer">FediPlan 1.3.0</footer>
     </blockquote>
 
     {{ form_end(form) }}

templates/fediplan/schedule.html.twig

@@ -5,7 +5,7 @@
 {% block content %}
     {% set instanceConfiguration = app.session.get("instance").getConfiguration() %}
     {% include 'nav.html.twig' %}
-    <h3>Schedule for <i><img class="" width="30" src="{{ app.user.avatar }}"  alt="{{ app.user.avatar }}"/> {{ convertAccountEmoji(app.user, app.user.displayName) | raw }} (@{{ app.user.acct}}@{{ instance }})</i></h3>
+    <h3>{{ 'common.schedule'|trans }} <span class="border rounded border-light" style="padding-bottom: 5px;padding-left: 5px;padding-right: 5px; margin-right: 5px;"><img width="30" src="{{ app.user.avatar }}"  alt="{{ app.user.avatar }}"/> {{ convertAccountEmoji(app.user, app.user.displayName) | raw }} </span><small><span class="badge text-bg-light">@{{ app.user.acct}}@{{ instance }}</span></small></h3>
 
     {% for type, messages in app.session.flashbag.all() %}
         {% for message in messages %}
@@ -28,7 +28,7 @@
 
     {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
     <div class="row" style="margin-top: 30px;">
-        <div class="col-12">
+        <div class="col-md-12">
             <div class="form-group has-feedback">
                 {{ form_label(form.content_warning) }}
                 {{ form_widget(form.content_warning, {'attr': {'class': 'form-control', 'data-emojiable':'true'}}) }}
@@ -54,13 +54,13 @@
             </div>
 
             <div class="row">
-                <div class="col-4 col-4" style="margin-top: 20px;">
+                <div class="col-md-4" style="margin-top: 20px;">
                     <div class="form-inline has-feedback">
                         <label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" >0</span>
                         &nbsp;/{{ instanceConfiguration.statuses.maxCharacters }}
                     </div>
                 </div>
-                <div class=" col-md-4 col-4" style="margin-top: 20px;">
+                <div class=" col-md-4" style="margin-top: 20px;">
                     <div class="form-inline has-feedback">
                         {{ form_label(form.visibility) }}&nbsp;&nbsp;
                         {{ form_widget(form.visibility, {'attr': {'class': 'form-control'}}) }}
@@ -73,7 +73,7 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class=" col-md-4 col-4" style="margin-top: 20px;">
+                <div class=" col-md-4" style="margin-top: 20px;">
                     <div class="form-inline has-feedback">
                         {{ form_label(form.sensitive) }}&nbsp;&nbsp;
                         {{ form_widget(form.sensitive, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
@@ -88,7 +88,7 @@
                 </div>
             </div>
             <div class="row" style="margin-top: 20px;">
-                <div class=" col-md-5 col-6">
+                <div class=" col-md-5">
                     <div class="form-group has-feedback">
                         {{ form_label(form.scheduled_at) }}
                         {{ form_widget(form.scheduled_at, {'attr': {'class': 'form-control'}}) }}
@@ -101,7 +101,7 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class=" col-md-5 col-4">
+                <div class=" col-md-5">
                     <div class="form-group has-feedback">
                         {{ form_label(form.timeZone) }}
                         {{ form_widget(form.timeZone, {'attr': {'class': 'form-control'}}) }}
@@ -114,7 +114,7 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class="col-2 col-2">
+                <div class="col-md-2">
                     <label for="count">{{ 'common.poll'|trans }}</label>&nbsp;&nbsp;
                     <span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" >  <i class="fa fa-tasks fa-fw"></i></span>
 
@@ -122,51 +122,51 @@
             </div>
 
             <div id="poll_container" class="d-none">
-            <ul class="options"
-                data-prototype="{{ form_widget(form.poll_options.vars.prototype)|e('html_attr') }}">
-                {% for option in form.poll_options %}
-                    {{ form_widget(option) }}
-                    {% if not option.vars.errors is empty %}
-                        <span class="badge badge-danger">
-                            {% for errorItem in option.vars.errors %}
-                                {{ errorItem.message }}
-                            {% endfor %}
-                        </span>
-                    {% endif %}
-                {%  endfor %}
-            </ul>
-            <div class="row">
-                <div class=" col-md-12">
-                    <div class="row">
-                        <div class=" col-md-4">
-                            {{ form_label(form.poll_multiple) }}
-                            {{ form_widget(form.poll_multiple, {'attr': {'class': 'form-control','data-toggle':'toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
-                            {% if not form.poll_multiple.vars.errors is empty %}
-                                <span class="badge badge-danger">
-                                        {% for errorItem in form.poll_multiple.vars.errors %}
-                                            {{ errorItem.message }}
-                                        {% endfor %}
-                                    </span>
-                            {% endif %}
-                        </div>
-                        <div class=" col-md-4">
-                            <div class="form-inline has-feedback">
-                            {{ form_label(form.poll_expires_at) }}&nbsp;&nbsp;&nbsp;
-                            {{ form_widget(form.poll_expires_at, {'attr': {'class': 'form-control'}}) }}
-                            {% if not form.poll_expires_at.vars.errors is empty %}
-                                <span class="badge badge-danger">
-                                                {% for errorItem in form.poll_expires_at.vars.errors %}
-                                                    {{ errorItem.message }}
-                                                {% endfor %}
-                                            </span>
-                            {% endif %}
+                <ul class="options"
+                    data-prototype="{{ form_widget(form.poll_options.vars.prototype)|e('html_attr') }}">
+                    {% for option in form.poll_options %}
+                        {{ form_widget(option) }}
+                        {% if not option.vars.errors is empty %}
+                            <span class="badge badge-danger">
+                                {% for errorItem in option.vars.errors %}
+                                    {{ errorItem.message }}
+                                {% endfor %}
+                            </span>
+                        {% endif %}
+                    {%  endfor %}
+                </ul>
+                <div class="row">
+                    <div class=" col-md-12">
+                        <div class="row">
+                            <div class=" col-md-4">
+                                {{ form_label(form.poll_multiple) }}
+                                {{ form_widget(form.poll_multiple, {'attr': {'class': 'form-control ','data-toggle':'skip-toggle', 'data-onlabel': 'common.yes'|trans , 'data-offlabel':'common.no'|trans}}) }}
+                                {% if not form.poll_multiple.vars.errors is empty %}
+                                    <span class="badge badge-danger">
+                                            {% for errorItem in form.poll_multiple.vars.errors %}
+                                                {{ errorItem.message }}
+                                            {% endfor %}
+                                        </span>
+                                {% endif %}
+                            </div>
+                            <div class=" col-md-4">
+                                <div class="form-inline has-feedback">
+                                {{ form_label(form.poll_expires_at) }}&nbsp;&nbsp;&nbsp;
+                                {{ form_widget(form.poll_expires_at, {'attr': {'class': 'form-control'}}) }}
+                                {% if not form.poll_expires_at.vars.errors is empty %}
+                                    <span class="badge badge-danger">
+                                                    {% for errorItem in form.poll_expires_at.vars.errors %}
+                                                        {{ errorItem.message }}
+                                                    {% endfor %}
+                                                </span>
+                                {% endif %}
+                                </div>
                             </div>
-                        </div>
 
+                        </div>
                     </div>
                 </div>
             </div>
-            </div>
         </div>
 
 
@@ -396,6 +396,7 @@
     <script src="{{ asset('js/moment.js') }}"></script>
     <script src="{{ asset('js/emojionearea.js') }}"></script>
     <script type="text/javascript">
+
         $(function() {
             'use strict';
 
@@ -418,14 +419,14 @@
                     var message = "{{ 'common.delete'|trans }}";
                     var content;
                     content = ' <div class="row" id="media_container_'+data.id+'">\n' +
-                    '                <div class="col-4">\n' +
+                    '                <div class="col-md-4">\n' +
                     '                    <img src="'+data.preview_url+'" style="width:100%;max-width:200px;" id="media_preview_'+data.id+'"/>\n' +
                     '                </div>\n' +
                     '                <div class="col-6">\n' +
                     '                    <textarea name="media_description_'+data.id+'" class="form-control"></textarea>\n' +
                     '                </div>\n' +
                     '                <input type="hidden" name="media_id_'+data.id+'" value="'+data.id+'"/>\n' +
-                    '                <div class="col-2">\n' +
+                    '                <div class="col-md-2">\n' +
                     '                        <button type="button" class="btn btn-danger delete_media" data-id="'+data.id+'">\n' +
                     '                          <i class="glyphicon glyphicon-trash"></i>\n' +
                     '                          <span>'+message+'</span>\n' +
@@ -479,6 +480,8 @@
                 if($('#poll_container').hasClass("d-none") ){
                     $('#poll_container').removeClass("d-none");
                     $('#compose_attach_poll').val(1);
+                    document.querySelector('#compose_poll_multiple').bootstrapToggle('destroy');
+                    document.querySelector('#compose_poll_multiple').bootstrapToggle();
                 }else{
                     $('#poll_container').addClass("d-none");
                     $('#compose_attach_poll').val(0);
@@ -543,14 +546,16 @@
                 searchPosition: "bottom",
                 search: false
             });
-            var timezone;
-
+            let userTimezone;
             if(!!sessionStorage.getItem('timeZone')) {
-                timezone = sessionStorage.getItem('timeZone');
+                userTimezone = sessionStorage.getItem('timeZone');
             } else {
-                timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+                userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
             }
-            $('#compose_timeZone').val(timezone);
+
+
+            $("#compose_scheduled_at").val(new Date(new Date().toString().split('GMT')[0]+' UTC').toISOString().split('.')[0]);
+            $('#compose_timeZone').val(userTimezone);
             $('#compose_timeZone').on('change', function () {
                 sessionStorage.setItem("timeZone", this.value);
             });

templates/fediplan/scheduled.html.twig

@@ -4,12 +4,12 @@
 
 {% block content %}
     {% include 'nav.html.twig' %}
-    <h1>{{ 'common.scheduled'|trans }}</h1>
+    {% set instanceConfiguration = app.session.get("instance").getConfiguration() %}
+    <h3>{{ 'common.scheduled'|trans }}  <span class="border rounded border-light" style="padding-bottom: 5px;padding-left: 5px;padding-right: 5px; margin-right: 5px;"><img width="30" src="{{ app.user.avatar }}"  alt="{{ app.user.avatar }}"/> {{ convertAccountEmoji(app.user, app.user.displayName) | raw }} </span><small><span class="badge text-bg-light">@{{ app.user.acct}}@{{ instance }}</span></small></h3>
 
 
-
-    <div class="row container">
-        <div class="col-12" id="content"></div>
+    <div class="row container"style="margin-top: 30px;">
+        <div class="col-md-12" id="content"></div>
     </div>
     <div class="row container hide" id="loader" style="text-align: center;margin-top: 50px;"><div class="lds-ring"><div></div><div></div><div></div><div></div></div></div>
     <div class="row hide" id="no_content" style="margin-top: 50px;">
@@ -32,7 +32,7 @@
                     <p>{{ 'common.proceed_confirm'|trans }}</p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'common.cancel'|trans }}</button>
+                    <button type="button" class="btn btn-secondary btn-cancel" data-bs-dismiss="modal">{{ 'common.cancel'|trans }}</button>
                     <button type="button" class="btn btn-danger btn-ok">{{ 'common.delete'|trans }}</button>
                 </div>
             </div>
@@ -45,11 +45,26 @@
     <script src="{{ asset('bundles/fosjsrouting/js/router.min.js') }}"></script>
     <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>
     <script type="text/javascript">
+        let userTimezone;
+        let lang;
+        if(!!sessionStorage.getItem('timeZone')) {
+            userTimezone = sessionStorage.getItem('timeZone');
+        } else {
+            userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        }
+        if (navigator.languages !== undefined) {
+            lang = navigator.languages[0].slice(0,2);
+        } else {
+            lang = navigator.language.slice(0,2);
+        }
+        function convertTZ(date) {
+            return new Intl.DateTimeFormat(lang, { dateStyle: "full" , timeStyle: "long",  timeZone: userTimezone}).format(new Date(date + " UTC")).toLocaleString();
+        }
+
         $(document).ready(function() {
             window.max_id = "";
             $(window).scroll(function() {
-
-                if(($(window).scrollTop() == $(document).height() - $(window).height() )&& max_id != null) {
+                if(($(window).scrollTop() === $(document).height() - $(window).height() )&& max_id != null) {
                    loadMore();
                 }
             });
@@ -63,8 +78,13 @@
                 $.get( Routing.generate('load_more', { 'max_id': window.max_id }  ))
                     .done(function(data) {
                         $("#content").append(data.html);
+                        $(".date-UTC").each(function (index){
+                            $( this ).removeClass("date-UTC").addClass("date-converted");
+                            const dateStr = $(this).text();
+                            $(this).text(convertTZ(dateStr));
+                        });
                         $('#loader').addClass("d-none");
-                        if( typeof data.html != "undefined" && data.html != "") {
+                        if( typeof data.html != "undefined" && data.html !== "") {
                            // $("#no_content").addClass("d-none");
                         }else{
                             $("#no_content").removeClass("d-none");

templates/nav.html.twig

@@ -33,10 +33,6 @@
                             <li class="nav-item {% if app.request.attributes.get('_route') == 'scheduled' %} active {% endif %}">
                                 <a class="nav-link" href="{{ path('scheduled') }}">{{ 'common.scheduled'|trans }}</a>
                             </li>
-
-                            <li class="nav-item">
-                                <a class="nav-link" href="{{ path('logout') }}" tabindex="-1" >{{ 'common.logout'|trans }}</a>
-                            </li>
                         {% endif %}
                         <li class="nav-item {% if app.request.attributes.get('_route') == 'about' %} active {% endif %}">
                             <a class="nav-link" href="{{ path('about') }}" tabindex="-1" >{{ 'common.about'|trans }}</a>
@@ -71,6 +67,11 @@
                                 <li><a class="dropdown-item"  href="{{ path(route, {'_locale':'uk' }) }}">Украïна</a></li>
                             </ul>
                         </li>
+                        {% if is_granted('ROLE_USER') %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ path('logout') }}" tabindex="-1" >{{ 'common.logout'|trans }}</a>
+                        </li>
+                        {% endif %}
                     </ul>
                 </div>
             </div>