From f504177e93e1318c110e899859882cbe544c2875 Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Thu, 20 Jan 2022 09:26:09 +0200
Subject: [PATCH] (LCtx): Complete util migration.

---
 bot/modules/topgg/commands.py |  8 ++++----
 bot/utils/ctx_addons.py       |  2 +-
 bot/utils/interactive.py      | 16 +++++++---------
 bot/utils/seekers.py          |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bot/modules/topgg/commands.py b/bot/modules/topgg/commands.py
index af2a9c3d..bff229d4 100644
--- a/bot/modules/topgg/commands.py
+++ b/bot/modules/topgg/commands.py
@@ -1,8 +1,8 @@
 import discord
 from .module import module
-from wards import guild_admin
 from bot.cmdClient.checks import in_guild, is_owner
 from settings.user_settings import UserSettings
+from LionContext import LionContext
 
 from .webhook import on_dbl_vote
 from .utils import lion_loveemote
@@ -14,7 +14,7 @@ from .utils import lion_loveemote
     group="Bot Admin",
 )
 @is_owner()
-async def cmd_forcevote(ctx):
+async def cmd_forcevote(ctx: LionContext):
     """
     Usage``:
         {prefix}forcevote
@@ -42,7 +42,7 @@ async def cmd_forcevote(ctx):
     aliases=('topgg', 'topggvote', 'upvote')
 )
 @in_guild()
-async def cmd_vote(ctx):
+async def cmd_vote(ctx: LionContext):
     """
     Usage``:
         {prefix}vote
@@ -67,7 +67,7 @@ async def cmd_vote(ctx):
     group="Personal Settings",
     desc="Turn on/off boost reminders."
 )
-async def cmd_remind_vote(ctx):
+async def cmd_remind_vote(ctx: LionContext):
     """
     Usage:
         `{prefix}vote_reminder on`
diff --git a/bot/utils/ctx_addons.py b/bot/utils/ctx_addons.py
index 1a01139c..12d89cda 100644
--- a/bot/utils/ctx_addons.py
+++ b/bot/utils/ctx_addons.py
@@ -1,6 +1,6 @@
 import asyncio
 import discord
-from cmdClient import Context
+from LionContext import LionContext as Context
 from cmdClient.lib import SafeCancellation
 
 from data import tables
diff --git a/bot/utils/interactive.py b/bot/utils/interactive.py
index 01bd49a3..8f31de7c 100644
--- a/bot/utils/interactive.py
+++ b/bot/utils/interactive.py
@@ -1,10 +1,8 @@
 import asyncio
 import discord
-from LionContext import LionContext
+from LionContext import LionContext as Context
 from cmdClient.lib import UserCancelled, ResponseTimedOut
 
-import datetime
-from cmdClient import lib
 from .lib import paginate_list
 
 # TODO: Interactive locks
@@ -21,7 +19,7 @@ async def discord_shield(coro):
         pass
 
 
-@LionContext.util
+@Context.util
 async def cancellable(ctx, msg, add_reaction=True, cancel_message=None, timeout=300):
     """
     Add a cancellation reaction to the given message.
@@ -64,7 +62,7 @@ async def cancellable(ctx, msg, add_reaction=True, cancel_message=None, timeout=
     return task
 
 
-@LionContext.util
+@Context.util
 async def listen_for(ctx, allowed_input=None, timeout=120, lower=True, check=None):
     """
     Listen for a one of a particular set of input strings,
@@ -116,7 +114,7 @@ async def listen_for(ctx, allowed_input=None, timeout=120, lower=True, check=Non
     return message
 
 
-@LionContext.util
+@Context.util
 async def selector(ctx, header, select_from, timeout=120, max_len=20):
     """
     Interactive routine to prompt the `ctx.author` to select an item from a list.
@@ -216,7 +214,7 @@ async def selector(ctx, header, select_from, timeout=120, max_len=20):
     return result
 
 
-@LionContext.util
+@Context.util
 async def pager(ctx, pages, locked=True, start_at=0, add_cancel=False, **kwargs):
     """
     Shows the user each page from the provided list `pages` one at a time,
@@ -373,7 +371,7 @@ async def _pager(ctx, out_msg, pages, locked, start_at, add_cancel, **kwargs):
         pass
 
 
-@LionContext.util
+@Context.util
 async def input(ctx, msg="", timeout=120):
     """
     Listen for a response in the current channel, from ctx.author.
@@ -415,7 +413,7 @@ async def input(ctx, msg="", timeout=120):
     return result
 
 
-@LionContext.util
+@Context.util
 async def ask(ctx, msg, timeout=30, use_msg=None, del_on_timeout=False):
     """
     Ask ctx.author a yes/no question.
diff --git a/bot/utils/seekers.py b/bot/utils/seekers.py
index 7f3d49d3..e7938d47 100644
--- a/bot/utils/seekers.py
+++ b/bot/utils/seekers.py
@@ -1,9 +1,9 @@
 import asyncio
 import discord
 
-from cmdClient import Context
+from LionContext import LionContext as Context
 from cmdClient.lib import InvalidContext, UserCancelled, ResponseTimedOut, SafeCancellation
-from . import interactive
+from . import interactive as _interactive
 
 
 @Context.util