Fix infinite scroll on user profile and search pages

assets/controllers/infinite_scroll_controller.js

@@ -58,7 +58,7 @@ export default class extends Controller {
         const elements = div.querySelectorAll('[data-controller="subject-list"] > *');
         for (let i = 0; i < elements.length; i++) {
             const element = elements[i];
-            if (element.id && null === document.getElementById(element.id)) {
+            if ((element.id && null === document.getElementById(element.id)) || element.classList.contains('user-box-inline') || element.classList.contains('magazine')) {
                 this.element.before(element);
 
                 if (elements[i + 1] && elements[i + 1].classList.contains('post-comments')) {

src/Controller/SearchController.php

@@ -16,6 +16,7 @@
 use App\Service\SearchManager;
 use App\Service\SettingsManager;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -80,6 +81,14 @@ public function __invoke(Request $request): Response
 
                 $this->logger->debug('results: {num}', ['num' => $res->count()]);
 
+                if ($request->isXmlHttpRequest()) {
+                    return new JsonResponse([
+                        'html' => $this->renderView('search/_list.html.twig', [
+                            'results' => $res,
+                        ]),
+                    ]);
+                }
+
                 return $this->render(
                     'search/front.html.twig',
                     [

src/Controller/User/UserFrontController.php

@@ -23,6 +23,7 @@
 use App\Repository\UserRepository;
 use App\Service\SubjectOverviewManager;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -59,12 +60,24 @@ public function front(User $user, Request $request, UserRepository $repository):
         }
 
         $activity = $repository->findPublicActivity($this->getPageNb($request), $user, $hideAdult);
+        $results = $this->overviewManager->buildList($activity);
+
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse([
+                'html' => $this->renderView(
+                    'layout/_generic_subject_list.html.twig',
+                    [
+                        'results' => $results,
+                    ]
+                ),
+            ]);
+        }
 
         return $this->render(
             'user/overview.html.twig',
             [
                 'user' => $user,
-                'results' => $this->overviewManager->buildList($activity),
+                'results' => $results,
                 'pagination' => $activity,
             ],
             $response
@@ -85,12 +98,24 @@ public function entries(User $user, Request $request, EntryRepository $repositor
         $criteria = new EntryPageView($this->getPageNb($request), $this->security);
         $criteria->sortOption = Criteria::SORT_NEW;
         $criteria->user = $user;
+        $entries = $repository->findByCriteria($criteria);
+
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse([
+                'html' => $this->renderView(
+                    'entry/_list.html.twig',
+                    [
+                        'entries' => $entries,
+                    ]
+                ),
+            ]);
+        }
 
         return $this->render(
             'user/entries.html.twig',
             [
                 'user' => $user,
-                'entries' => $repository->findByCriteria($criteria),
+                'entries' => $entries,
             ],
             $response
         );
@@ -115,6 +140,17 @@ public function comments(User $user, Request $request, EntryCommentRepository $r
 
         $comments = $repository->findByCriteria($criteria);
 
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse([
+                'html' => $this->renderView(
+                    'post/_list.html.twig',
+                    [
+                        'posts' => $comments,
+                    ]
+                ),
+            ]);
+        }
+
         return $this->render(
             'user/comments.html.twig',
             [
@@ -143,6 +179,17 @@ public function posts(User $user, Request $request, PostRepository $repository):
 
         $posts = $repository->findByCriteria($criteria);
 
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse([
+                'html' => $this->renderView(
+                    'post/_list.html.twig',
+                    [
+                        'posts' => $posts,
+                    ]
+                ),
+            ]);
+        }
+
         return $this->render(
             'user/posts.html.twig',
             [
@@ -200,6 +247,17 @@ public function replies(User $user, Request $request, PostCommentRepository $rep
             }
         }
 
+        if ($request->isXmlHttpRequest()) {
+            return new JsonResponse([
+                'html' => $this->renderView(
+                    'post/comment/_list.html.twig',
+                    [
+                        'comments' => $results,
+                    ]
+                ),
+            ]);
+        }
+
         return $this->render(
             'user/replies.html.twig',
             [

templates/layout/_generic_subject_list.html.twig

@@ -0,0 +1,3 @@
+<div data-controller="subject-list">
+    {{ include('layout/_subject_list.html.twig') }}
+</div>

templates/search/_list.html.twig

@@ -0,0 +1,8 @@
+<div data-controller="subject-list">
+    {% include 'layout/_subject_list.html.twig' with {
+        entryCommentAttributes: {showMagazineName: true, showEntryTitle: true},
+        postCommentAttributes: {withPost: false},
+        magazineAttributes: {showMeta: false, showRules: false, showDescription: false, showInfo: false, stretchedLink: false, showTags: false},
+        userAttributes: {},
+    } %}
+</div>

templates/search/front.html.twig

@@ -34,12 +34,7 @@
                 {% endif %}
             {% endfor %}
         {% elseif q is defined and q %}
-            {% include 'layout/_subject_list.html.twig' with {
-                entryCommentAttributes: {showMagazineName: true, showEntryTitle: true},
-                postCommentAttributes: {withPost: false},
-                magazineAttributes: {showMeta: false, showRules: false, showDescription: false, showInfo: false, stretchedLink: false, showTags: false},
-                userAttributes: {},
-            } %}
+            {% include 'search/_list.html.twig' %}
         {% endif %}
     </div>
 {% endblock %}