7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 11:05:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(ModSource): fix bad unwrap in fetchValidTags
Some checks are pending
Build Binaries / Build Windows (push) Waiting to run
Details
Build Binaries / Build macOS (push) Waiting to run
Details
Build Binaries / Build Android (64-bit) (push) Waiting to run
Details
Build Binaries / Build Android (32-bit) (push) Waiting to run
Details
Build Binaries / Publish (push) Blocked by required conditions
Details
Check CHANGELOG.md / Check CHANGELOG.md (push) Waiting to run
Details

Browse source
This commit is contained in:
Fleeym 2024-11-13 23:19:07 +02:00
parent 22a11b96e2
commit 01807fedc9
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
loader/src/ui/mods/sources/ModSource.cpp
View file

@ -5,6 +5,7 @@
#include <Geode/ui/GeodeUI.hpp> #include <Geode/ui/GeodeUI.hpp>
#include <server/DownloadManager.hpp> #include <server/DownloadManager.hpp>
#include <Geode/binding/GameObject.hpp> #include <Geode/binding/GameObject.hpp>
#include <unordered_set>
LoadModSuggestionTask loadModSuggestion(LoadProblem const& problem) { LoadModSuggestionTask loadModSuggestion(LoadProblem const& problem) {
// Recommended / suggested are essentially the same thing for the purposes of this // Recommended / suggested are essentially the same thing for the purposes of this
@ -183,19 +184,22 @@ server::ServerRequest<std::unordered_set<std::string>> ModSource::fetchValidTags
return std::visit(makeVisitor { return std::visit(makeVisitor {
[](Mod* mod) { [](Mod* mod) {
return server::getTags().map( return server::getTags().map(
[mod](auto* result) -> Result<std::unordered_set<std::string>, server::ServerError> { [mod](Result<std::unordered_set<std::string>, server::ServerError>* result)
-> Result<std::unordered_set<std::string>, server::ServerError> {
std::unordered_set<std::string> finalTags;
auto modTags = mod->getMetadata().getTags();
if (result->isOk()) { if (result->isOk()) {
std::unordered_set<std::string> fetched = result->unwrap();
// Filter out invalid tags // Filter out invalid tags
auto modTags = mod->getMetadata().getTags(); for (std::string const& tag : modTags) {
auto finalTags = std::unordered_set<std::string>(); if (fetched.contains(tag)) {
for (auto& tag : modTags) {
if (result->unwrap().contains(tag)) {
finalTags.insert(tag); finalTags.insert(tag);
} }
} }
return Ok(finalTags);
} }
return Ok(result->unwrap());
return Ok(finalTags);
}, },
[](server::ServerProgress* progress) { [](server::ServerProgress* progress) {
return *progress; return *progress;