Release 1.3.0

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": {
@@ -76,7 +77,8 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd",
             "assets:install --symlink public": "symfony-cmd",
-            "importmap:install": "symfony-cmd"
+            "importmap:install": "symfony-cmd",
+            "asset-map:compile": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"

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/fediplan/Ajax/layout.html.twig

@@ -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/index.html.twig

@@ -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.4</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 %}
@@ -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';
 
@@ -545,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,11 +4,11 @@
 
 {% 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="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>
@@ -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>