From eb6d711f49297ec361fbe045bd4c596edada29a2 Mon Sep 17 00:00:00 2001
From: AbooMinister25 <aboominister@gmail.com>
Date: Mon, 8 Aug 2022 10:15:04 -0400
Subject: Fixed conflicts from PR 1078

---
 bot/exts/fun/uwu.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bot')

diff --git a/bot/exts/fun/uwu.py b/bot/exts/fun/uwu.py
index 9e228065..0d650de0 100644
--- a/bot/exts/fun/uwu.py
+++ b/bot/exts/fun/uwu.py
@@ -10,6 +10,9 @@ from discord.ext.commands import Cog, Context, clean_content
 from bot.bot import Bot
 from bot.utils import helpers
 
+if t.TYPE_CHECKING:
+    from bot.exts.fun.fun import Fun  # pragma: no cover
+
 WORD_REPLACE = {
     "small": "smol",
     "cute": "kawaii~",
@@ -129,7 +132,8 @@ class Uwu(Cog):
 
         await clean_content(fix_channel_mentions=True).convert(ctx, text)
 
-        fun_cog = ctx.bot.get_cog("Fun")
+        fun_cog: t.Optional[Fun] = ctx.bot.get_cog("Fun")
+
         if fun_cog:
             text, embed = await fun_cog._get_text_and_embed(ctx, text)
 
-- 
cgit v1.2.3