Fix Ranker Commands

edoakes · Sep 26, 2020 · 6f771c4 · 6f771c4
1 parent 354e816
commit 6f771c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/cogs/lobby_commands.py b/cogs/lobby_commands.py
@@ -125,14 +125,20 @@ async def shuffle(self, ctx: Context):
         )
 
     @command()
-    async def ranked(self, ctx: Context, option: str):
+    async def ranked(self, ctx: Context):
+        await self.get_lobby_then(
+            ctx,
+            lambda lobby: lobby.show_next_match(get_ranker(ctx.channel)),
+        )
+
+    @command()
+    async def leaderboard(self, ctx: Context, option: str):
         then = option_switch(
             ctx.channel,
             option,
             {
-                "list": lambda l: l.show_ranking(filter_lobby=False),
-                "list-lobby": lambda l: l.show_ranking(filter_lobby=True),
-                None: lambda l: l.show_next_match(get_ranker(ctx.channel)),
+                "lobby": lambda l: l.show_ranking(filter_lobby=True),
+                None: lambda l: lambda l: l.show_ranking(filter_lobby=False),
             },
         )
 

diff --git a/utils/option_switch.py b/utils/option_switch.py
@@ -10,6 +10,6 @@ def option_switch(channel: TextChannel, option, cases: Dict[str, Any]):
             options = ["None"]
         else:
             options = filter(cases.keys())
-        raise UsageException.unexpected_option(channel, options)
+        raise UsageException.unexpected_option(channel, option, options)
 
     return cases[option]