dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

propagate side as enum instead of Qstring (#3544)

Browse source
This commit is contained in:
timoreo 2025-07-09 10:01:51 +02:00 • committed by GitHub
commit 37a9271d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 89 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
launcher/ui/pages/modplatform/ModModel.cpp
View file

@ -7,6 +7,7 @@
#include "minecraft/MinecraftInstance.h"
#include "minecraft/PackProfile.h"
#include "minecraft/mod/ModFolderModel.h"
#include "modplatform/ModIndex.h"
#include <QMessageBox>
#include <algorithm>
@ -101,9 +102,10 @@ QVariant ModModel::getInstalledPackVersion(ModPlatform::IndexedPack::Ptr pack) c
return {};
}
bool checkSide(QString filter, QString value)
bool checkSide(ModPlatform::Side filter, ModPlatform::Side value)
{
return filter.isEmpty() || value.isEmpty() || filter == "both" || value == "both" || filter == value;
return filter == ModPlatform::Side::NoSide || value == ModPlatform::Side::NoSide || filter == ModPlatform::Side::UniversalSide ||
value == ModPlatform::Side::UniversalSide || filter == value;
}
bool ModModel::checkFilters(ModPlatform::IndexedPack::Ptr pack)

5
launcher/ui/pages/modplatform/flame/FlameModel.cpp
View file

@ -187,8 +187,9 @@ void ListModel::performPaginatedSearch()
sort.index = currentSort + 1;
auto netJob = makeShared<NetJob>("Flame::Search", APPLICATION->network());
auto searchUrl = FlameAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort,
m_filter->loaders, m_filter->versions, "", m_filter->categoryIds, m_filter->openSource });
auto searchUrl =
FlameAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort, m_filter->loaders,
m_filter->versions, ModPlatform::Side::NoSide, m_filter->categoryIds, m_filter->openSource });
netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl.value()), response));
jobPtr = netJob;

5
launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
View file

@ -153,8 +153,9 @@ void ModpackListModel::performPaginatedSearch()
} // TODO: Move to standalone API
ResourceAPI::SortingMethod sort{};
sort.name = currentSort;
auto searchUrl = ModrinthAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort,
m_filter->loaders, m_filter->versions, "", m_filter->categoryIds, m_filter->openSource });
auto searchUrl =
ModrinthAPI().getSearchURL({ ModPlatform::ResourceType::MODPACK, nextSearchOffset, currentSearchTerm, sort, m_filter->loaders,
m_filter->versions, ModPlatform::Side::NoSide, m_filter->categoryIds, m_filter->openSource });
auto netJob = makeShared<NetJob>("Modrinth::SearchModpack", APPLICATION->network());
netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl.value()), m_allResponse));