From 60b919fd4a239b6fbe812b2d5ece51d439c6828b Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 3 Apr 2025 11:02:23 +0200
Subject: [PATCH] Fix issue #13 - Previous scheduled messages are not displayed
 when scrolling down the list

---
 .env                                   | 2 +-
 src/Controller/FediPlanController.php  | 5 +++--
 templates/fediplan/scheduled.html.twig | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index 7cef9b8..a83567a 100644
--- a/.env
+++ b/.env
@@ -15,7 +15,7 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=prod
+APP_ENV=dev
 APP_SECRET=7189792ca5da6b84aff72ec1c63d95ae
 ###< symfony/framework-bundle ###
 
diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php
index 3c31992..cba1ca4 100644
--- a/src/Controller/FediPlanController.php
+++ b/src/Controller/FediPlanController.php
@@ -283,7 +283,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 +292,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);
     }
diff --git a/templates/fediplan/scheduled.html.twig b/templates/fediplan/scheduled.html.twig
index 13a869f..563473f 100644
--- a/templates/fediplan/scheduled.html.twig
+++ b/templates/fediplan/scheduled.html.twig
@@ -48,8 +48,7 @@
         $(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();
                 }
             });
@@ -64,7 +63,7 @@
                     .done(function(data) {
                         $("#content").append(data.html);
                         $('#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");