Fix pvp subscriptions

versx · Sep 4, 2020 · 4ed61db · 4ed61db
1 parent 04a5d4e
commit 4ed61db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Data/Subscriptions/Models/PvPSubscription.cs b/src/Data/Subscriptions/Models/PvPSubscription.cs
@@ -94,7 +94,7 @@ public PvPSubscription()
             League = PvPLeague.Great;
             MinimumRank = 25;
             MinimumPercent = 90;
-            City = "all";
+            City = null;// "all";
         }
     }
 }
diff --git a/src/Data/Subscriptions/SubscriptionProcessor.cs b/src/Data/Subscriptions/SubscriptionProcessor.cs
@@ -314,14 +314,14 @@ public async Task ProcessPvPSubscription(PokemonData pkmn)
                         continue;
                     }
 
-                    matchesGreat = pkmn.GreatLeague?.Exists(x => subscribedPokemon.League == PvPLeague.Great &&
-                                                                     (x.CP ?? 0) >= 2400 && (x.CP ?? 0) <= 2500 &&
+                    matchesGreat = pkmn.GreatLeague != null && (pkmn.GreatLeague?.Exists(x => subscribedPokemon.League == PvPLeague.Great &&
+                                                                     (x.CP ?? 0) >= 1400 && (x.CP ?? 0) <= 1500 &&
                                                                      (x.Rank ?? 4096) <= subscribedPokemon.MinimumRank &&
-                                                                     (x.Percentage ?? 0) >= subscribedPokemon.MinimumPercent) ?? false;
-                    matchesUltra = pkmn.GreatLeague?.Exists(x => subscribedPokemon.League == PvPLeague.Ultra &&
+                                                                     (x.Percentage ?? 0) * 100 >= subscribedPokemon.MinimumPercent) ?? false);
+                    matchesUltra = pkmn.UltraLeague != null && (pkmn.GreatLeague?.Exists(x => subscribedPokemon.League == PvPLeague.Ultra &&
                                                                      (x.CP ?? 0) >= 2400 && (x.CP ?? 0) <= 2500 &&
                                                                      (x.Rank ?? 4096) <= subscribedPokemon.MinimumRank &&
-                                                                     (x.Percentage ?? 0) >= subscribedPokemon.MinimumPercent) ?? false;
+                                                                     (x.Percentage ?? 0) * 100 >= subscribedPokemon.MinimumPercent) ?? false);
 
                     if (!matchesGreat && !matchesUltra)
                         continue;