Limit simultaneous challenges from one user (#1098)

In order to limit the number of games with a single opponent, the number
of queued challenges from a single opponent must be limited as well.
This change adds the number of active challenges to the number of active
games to keep the eventual number of simultaneous games with a single
user under the max_simultaneous_games_per_user configuration.

Author: MarkZH

lib/lichess_bot.py

@@ -607,9 +607,10 @@ def handle_challenge(event: EventType, li: lichess.Lichess, challenge_queue: MUL
     if chlng.from_self:
         return
 
-    players_with_active_games = Counter(game["opponent"]["username"] for game in li.get_ongoing_games())
+    opponent_engagements = Counter(game["opponent"]["username"] for game in li.get_ongoing_games())
+    opponent_engagements.update(challenge.challenger.name for challenge in challenge_queue)
 
-    is_supported, decline_reason = chlng.is_supported(challenge_config, recent_bot_challenges, players_with_active_games)
+    is_supported, decline_reason = chlng.is_supported(challenge_config, recent_bot_challenges, opponent_engagements)
     if is_supported:
         challenge_queue.append(chlng)
         sort_challenges(challenge_queue, challenge_config)

lib/model.py

@@ -92,7 +92,7 @@ def decline_due_to(self, requirement_met: bool, decline_reason: str) -> str:
         return "" if requirement_met else decline_reason
 
     def is_supported(self, config: Configuration, recent_bot_challenges: defaultdict[str, list[Timer]],
-                     players_with_active_games: Counter[str]) -> tuple[bool, str]:
+                     opponent_engagements: Counter[str]) -> tuple[bool, str]:
         """Whether the challenge is supported."""
         try:
             if self.from_self:
@@ -109,7 +109,7 @@ def is_supported(self, config: Configuration, recent_bot_challenges: defaultdict
                               or self.decline_due_to(self.challenger.name not in config.block_list, "generic")
                               or self.decline_due_to(self.challenger.name in allowed_opponents, "generic")
                               or self.decline_due_to(self.is_supported_recent(config, recent_bot_challenges), "later")
-                              or self.decline_due_to(players_with_active_games[self.challenger.name]
+                              or self.decline_due_to(opponent_engagements[self.challenger.name]
                                                      < config.max_simultaneous_games_per_user, "later")
                               or self.decline_due_to(is_supported_extra(self), "generic"))