Allow admins to bypass map regulations

matte-ek · Apr 30, 2023 · 942f361 · 942f361
1 parent 19b75ba
commit 942f361
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/BanchoMultiplayerBot/Behaviour/MapManagerBehaviour.cs b/BanchoMultiplayerBot/Behaviour/MapManagerBehaviour.cs
@@ -121,10 +121,12 @@ private async void OnBeatmapChanged(BeatmapShell beatmap)
 
     private async Task EnsureBeatmapLimits(BeatmapModel beatmap, int id)
     {
-        if (IsAllowedBeatmapLength(beatmap) && IsAllowedBeatmapStarRating(beatmap) && IsAllowedBeatmapGameMode(beatmap) && !IsBannedBeatmap(beatmap))
+        bool hostIsAdministrator = _lobby.MultiplayerLobby.Host is not null && _lobby.IsAdministrator(_lobby.MultiplayerLobby.Host.Name);
+
+        if ((IsAllowedBeatmapLength(beatmap) && IsAllowedBeatmapStarRating(beatmap) && IsAllowedBeatmapGameMode(beatmap) && !IsBannedBeatmap(beatmap)) || hostIsAdministrator)
         {
             // Update the fallback id whenever someone picks a map that's 
-            // within limits, so we don't have to reset to the osu!tutorial everytime.
+            // within limits, so we don't have to reset to the osu!tutorial every time.
             _beatmapFallbackId = id;
 
             CurrentBeatmapName = $"{beatmap.Artist} - {beatmap.Title}";
@@ -136,7 +138,7 @@ private async Task EnsureBeatmapLimits(BeatmapModel beatmap, int id)
             _botAppliedBeatmap = true;
             _lastBotAppliedBeatmap = CurrentBeatmapId;
 
-            // By "setting" the map ourself directly after the host picked it, 
+            // By "setting" the map our self directly after the host picked it, 
             // it will automatically be set to the newest version, even if the host's one is outdated.
             _lobby.SendMessage($"!mp map {CurrentBeatmapId} 0");
 

diff --git a/BanchoMultiplayerBot/Lobby.cs b/BanchoMultiplayerBot/Lobby.cs
@@ -150,6 +150,16 @@ public void SendMessage(string message)
         Bot.SendMessage(Channel, message);
     }
 
+    public bool IsAdministrator(string username)
+    {
+        if (Bot.Configuration.Username == username)
+            return true;
+        if (Bot.Configuration.Administrators != null && username.Any() && Bot.Configuration.Administrators.FirstOrDefault(x => x.Name == username) != null)
+            return true;
+
+        return false;
+    }
+
     /// <summary>
     /// Get what string to use when passing a player as a parameter in tournament commands.
     /// This will make sure to prioritize player ID, or use player names if not available.
@@ -213,15 +223,5 @@ private void AddMessageToHistory(IPrivateIrcMessage message)
         RecentMessages.Add(message);
     }
 
-    private bool IsAdministrator(string username)
-    {
-        if (Bot.Configuration.Username == username)
-            return true;
-        if (Bot.Configuration.Administrators != null && username.Any() && Bot.Configuration.Administrators.FirstOrDefault(x => x.Name == username) != null)
-            return true;
-
-        return false;
-    }
-
     private void AddBehaviour(IBotBehaviour behaviour) => Behaviours.Add(behaviour);
 }