Massive refactor/update/UX improvement dump. Closes #6.

src/pluralkit/bot/commands/api_commands.py

@@ -1,18 +1,16 @@
-import logging
-from discord import DMChannel
-
 from pluralkit.bot.commands import CommandContext
 
-logger = logging.getLogger("pluralkit.commands")
 disclaimer = "Please note that this grants access to modify (and delete!) all your system data, so keep it safe and secure. If it leaks or you need a new one, you can invalidate this one with `pk;token refresh`."
 
-async def reply_dm(ctx: CommandContext, message: str):
-    await ctx.message.author.send(message)
 
-    if not isinstance(ctx.message.channel, DMChannel):
-        await ctx.reply_ok("DM'd!")
+async def token_root(ctx: CommandContext):
+    if ctx.match("refresh") or ctx.match("expire") or ctx.match("invalidate") or ctx.match("update"):
+        await token_refresh(ctx)
+    else:
+        await token_get(ctx)
 
-async def get_token(ctx: CommandContext):
+
+async def token_get(ctx: CommandContext):
     system = await ctx.ensure_system()
 
     if system.token:
@@ -21,11 +19,13 @@ async def get_token(ctx: CommandContext):
         token = await system.refresh_token(ctx.conn)
 
     token_message = "Here's your API token: \n**`{}`**\n{}".format(token, disclaimer)
-    return await reply_dm(ctx, token_message)
+    return await ctx.reply_ok_dm(token_message)
 
-async def refresh_token(ctx: CommandContext):
+
+async def token_refresh(ctx: CommandContext):
     system = await ctx.ensure_system()
 
     token = await system.refresh_token(ctx.conn)
-    token_message = "Your previous API token has been invalidated. You will need to change it anywhere it's currently used.\nHere's your new API token:\n**`{}`**\n{}".format(token, disclaimer)
-    return await reply_dm(ctx, token_message)
+    token_message = "Your previous API token has been invalidated. You will need to change it anywhere it's currently used.\nHere's your new API token:\n**`{}`**\n{}".format(
+        token, disclaimer)
+    return await ctx.reply_ok_dm(token_message)