From 8aff756e30ef544a660d0106c262d4797b57c6fe Mon Sep 17 00:00:00 2001
From: ghost <localhost>
Date: Sat, 18 Nov 2023 09:27:33 +0200
Subject: [PATCH] apply search filter for RSS #35

---
 src/Controller/TorrentController.php     | 16 ++++++++--------
 templates/default/torrent/list.html.twig | 24 +++++++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php
index 0da8c26..38205db 100644
--- a/src/Controller/TorrentController.php
+++ b/src/Controller/TorrentController.php
@@ -632,11 +632,11 @@ class TorrentController extends AbstractController
 
         // Get total torrents
         $total = $torrentService->findTorrentsTotal(
-            $user->getId(),
+            $request->get('filter') ? 0 : $user->getId(),
             $query,
-            $user->getLocales(),
-            $user->getCategories(),
-            $user->isSensitive() ? false : null,
+            $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(),
+            $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(),
+            $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null),
             !$user->isModerator() ? true : null,
             !$user->isModerator() ? true : null,
         );
@@ -644,11 +644,11 @@ class TorrentController extends AbstractController
         // Create torrents list
         $torrents = [];
         foreach ($torrentService->findTorrents(
-            $user->getId(),
+            $request->get('filter') ? 0 : $user->getId(),
             $query,
-            $user->getLocales(),
-            $user->getCategories(),
-            $user->isSensitive() ? false : null,
+            $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(),
+            $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(),
+            $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null),
             !$user->isModerator() ? true : null,
             !$user->isModerator() ? true : null,
             $this->getParameter('app.pagination'),
diff --git a/templates/default/torrent/list.html.twig b/templates/default/torrent/list.html.twig
index 941b1c9..10187cb 100644
--- a/templates/default/torrent/list.html.twig
+++ b/templates/default/torrent/list.html.twig
@@ -11,18 +11,27 @@
                             <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm.5 5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1 0-1zM4 8.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm2 3a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5z"/>
                         </svg>
                     </a>
+                    <a class="text-color-night margin-x-4-px" href="{{ path('rss_torrents_recent', { query : query | url_encode(true),
+                                                                                                     locales : app.request.get('locales'),
+                                                                                                     categories : app.request.get('categories'),
+                                                                                                     sensitive : app.request.get('sensitive'),
+                                                                                                     filter : app.request.get('filter') }) }}" title="RSS">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                            <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1 0-2zm0 4a6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1 0-2zm.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
+                        </svg>
+                    </a>
                 {% else %}
                     <a class="text-color-night margin-l-4-px" rel="nofollow" href="{{ path('torrent_search', { query : query | url_encode(true), filter : 'true' }) }}" title="{{ 'Show filter' | trans }}">
                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-filter-square-fill" viewBox="0 0 16 16">
                             <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm.5 5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1 0-1zM4 8.5a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm2 3a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5z"/>
                         </svg>
                     </a>
+                    <a class="text-color-night margin-x-4-px" href="{{ path('rss_torrents_recent', { query : query | url_encode(true) }) }}" title="RSS">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+                            <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1 0-2zm0 4a6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1 0-2zm.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
+                        </svg>
+                    </a>
                 {% endif %}
-                <a class="text-color-night margin-x-4-px" href="{{ path('rss_torrents_recent', { query : query | url_encode(true) }) }}" title="RSS">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-                        <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1 0-2zm0 4a6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1 0-2zm.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
-                    </svg>
-                </a>
             </sub>
         {% else %}
             <h2>{{ 'Recent uploads' | trans }}</h2>
@@ -186,7 +195,7 @@
                 {% if query %}
                     {% if pagination.page > 1 %}
                         {% if pagination.page == 2 %}
-                            <a rel="nofollow" class="button margin-l-8-px" href="{{ path('torrent_search', { query : query | url_encode(true) | raw,
+                            <a rel="nofollow" class="button margin-l-8-px" href="{{ path('torrent_search', { query : query | url_encode(true),
                                                                                                              locales : app.request.get('locales'),
                                                                                                              categories : app.request.get('categories'),
                                                                                                              sensitive : app.request.get('sensitive'),
@@ -194,7 +203,8 @@
                                 {{ 'Back' | trans | lower }}
                             </a>
                         {% else %}
-                            <a rel="nofollow" class="button margin-l-8-px" href="{{ path('torrent_search', { query : query | url_encode(true), page : pagination.page - 1,
+                            <a rel="nofollow" class="button margin-l-8-px" href="{{ path('torrent_search', { query : query | url_encode(true),
+                                                                                                             page : pagination.page - 1,
                                                                                                              locales : app.request.get('locales'),
                                                                                                              categories : app.request.get('categories'),
                                                                                                              sensitive : app.request.get('sensitive'),