Fixed mods marked as beta showing for everyone regardless of setting

Deli-Collective · May 7, 2021 · 544b694 · 544b694
1 parent a6165af
commit 544b694
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/DeliCounter/Backend/ModRepository.cs b/DeliCounter/Backend/ModRepository.cs
@@ -203,6 +203,7 @@ private Exception ScanMods()
                             if (version.IconUrl == "") throw new JsonException($"[{version}] Icon url cannot be empty, must be null.");
                             if ((App.Current.Settings is not null && !App.Current.Settings.ShowModBetas) &&
                                 !string.IsNullOrEmpty(version.VersionNumber.PreRelease)) continue;
+                            if (!App.Current.Settings.ShowModBetas && version.IsBeta) continue;
                             mod.Versions.Add(version.VersionNumber, version);
                         }
 

diff --git a/DeliCounter/Backend/Models/Mod.cs b/DeliCounter/Backend/Models/Mod.cs
@@ -158,6 +158,11 @@ public class ModVersion
             /// </summary>
             public string[] IncompatibleTags { get; set; }
 
+            /// <summary>
+            ///     True if the mod should only be shown to people who have the beta option enbled
+            /// </summary>
+            public bool IsBeta { get; set; }
+
             [JsonIgnore]
             public IEnumerable<Mod> IncompatibleInstalledMods => IncompatibleTags == null
                 ? Array.Empty<Mod>()
@@ -168,11 +173,6 @@ public class ModVersion
                         x.Installed.Tags != null &&
                         IncompatibleTags.Any(tag => x.Installed.Tags.Contains(tag))));
 
-            /// <summary>
-            ///     Checks if the version number has a pre release tag
-            /// </summary>
-            public bool IsBeta => !string.IsNullOrEmpty(VersionNumber.PreRelease);
-
 
             public bool MatchesQuery(string query)
             {