From 2e9d7f5c3d3cbc33ad95d830af4fdcab6eab6a06 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Mon, 16 May 2022 19:17:37 -0300
Subject: [PATCH] fix: mod skipping between pages and remove dead code

---
 .../modplatform/modrinth/ModrinthModel.cpp    | 30 ++++---------------
 .../modplatform/modrinth/ModrinthModel.h      |  4 +--
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index 701a2032..7cacf37a 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -109,11 +109,12 @@ void ModpackListModel::performPaginatedSearch()
     auto searchAllUrl = QString(BuildConfig.MODRINTH_PROD_URL +
                             "/search?"
                             "offset=%1&"
-                            "limit=20&"
-                            "query=%2&"
-                            "index=%3&"
+                            "limit=%2&"
+                            "query=%3&"
+                            "index=%4&"
                             "facets=[[\"project_type:modpack\"]]")
                             .arg(nextSearchOffset)
+                            .arg(m_modpacks_per_page)
                             .arg(currentSearchTerm)
                             .arg(currentSort);
 
@@ -269,10 +270,10 @@ void ModpackListModel::searchRequestFinished(QJsonDocument& doc_all)
         }
     }
 
-    if (packs_all.size() < 25) {
+    if (packs_all.size() < m_modpacks_per_page) {
         searchState = Finished;
     } else {
-        nextSearchOffset += 25;
+        nextSearchOffset += m_modpacks_per_page;
         searchState = CanPossiblyFetchMore;
     }
 
@@ -308,25 +309,6 @@ void ModpackListModel::searchRequestFailed(QString reason)
     }
 }
 
-void ModpackListModel::versionRequestSucceeded(QJsonDocument doc, QString id)
-{
-    auto& current = m_parent->getCurrent();
-    if (id != current.id) {
-        return;
-    }
-
-    auto arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
-
-    try {
-        // loadIndexedPackVersions(current, arr);
-    } catch (const JSONValidationError& e) {
-        qDebug() << doc;
-        qWarning() << "Error while reading " << debugName() << " mod version: " << e.cause();
-    }
-
-    // m_parent->updateModVersions();
-}
-
 }  // namespace Modrinth
 
 /******** Helpers ********/
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index bffea54d..14aa6747 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -79,8 +79,6 @@ class ModpackListModel : public QAbstractListModel {
     void searchRequestFinished(QJsonDocument& doc_all);
     void searchRequestFailed(QString reason);
 
-    void versionRequestSucceeded(QJsonDocument doc, QString addonId);
-
    protected slots:
 
     void logoFailed(QString logo);
@@ -112,5 +110,7 @@ class ModpackListModel : public QAbstractListModel {
 
     QByteArray m_all_response;
     QByteArray m_specific_response;
+
+    int m_modpacks_per_page = 20;
 };
 }  // namespace ModPlatform