wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 05:31:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue #13 - Previous scheduled messages are not displayed when scrolling down the list

Browse source
This commit is contained in:
Thomas 2025-04-03 11:02:23 +02:00
parent f0881c2d51
commit 60b919fd4a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env
View file

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

5
src/Controller/FediPlanController.php
View file

@ -283,7 +283,7 @@ class FediPlanController extends AbstractController
name: 'load_more', name: 'load_more',
options: ['expose' => true] 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 */ /** @var $user MastodonAccount */
$user = $this->getUser(); $user = $this->getUser();
@ -292,12 +292,13 @@ class FediPlanController extends AbstractController
$type = explode(" ", $user->getToken())[0]; $type = explode(" ", $user->getToken())[0];
$mastodon_api->set_token($token, $type); $mastodon_api->set_token($token, $type);
$params = []; $params = [];
$params['limit'] = $limit;
if ($max_id != null) { if ($max_id != null) {
$params['max_id'] = $max_id; $params['max_id'] = $max_id;
} }
$scheduled_reply = $mastodon_api->get_scheduled($params); $scheduled_reply = $mastodon_api->get_scheduled($params);
$statuses = $mastodon_api->getScheduledStatuses($scheduled_reply['response'], $user); $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]); $data['html'] = $this->renderView('fediplan/Ajax/layout.html.twig', ['statuses' => $statuses]);
return new JsonResponse($data); return new JsonResponse($data);
} }

5
templates/fediplan/scheduled.html.twig
View file

@ -48,8 +48,7 @@
$(document).ready(function() { $(document).ready(function() {
window.max_id = ""; window.max_id = "";
$(window).scroll(function() { $(window).scroll(function() {
if(($(window).scrollTop() === $(document).height() - $(window).height() )&& max_id != null) {
if(($(window).scrollTop() == $(document).height() - $(window).height() )&& max_id != null) {
loadMore(); loadMore();
} }
}); });
@ -64,7 +63,7 @@
.done(function(data) { .done(function(data) {
$("#content").append(data.html); $("#content").append(data.html);
$('#loader').addClass("d-none"); $('#loader').addClass("d-none");
if( typeof data.html != "undefined" && data.html != "") { if( typeof data.html != "undefined" && data.html !== "") {
// $("#no_content").addClass("d-none"); // $("#no_content").addClass("d-none");
}else{ }else{
$("#no_content").removeClass("d-none"); $("#no_content").removeClass("d-none");