From 27d29c0981b5e846d6b5b130d2b07a4927950dab Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 21 Sep 2020 18:31:13 +1000
Subject: Prevent uwu output from pinging globally allowed roles.

---
 bot/exts/evergreen/fun.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bot')

diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py
index b0240c45..5d4743e4 100644
--- a/bot/exts/evergreen/fun.py
+++ b/bot/exts/evergreen/fun.py
@@ -5,7 +5,7 @@ from typing import Callable, Tuple, Union
 
 from discord import Embed, Message
 from discord.ext import commands
-from discord.ext.commands import Bot, Cog, Context, MessageConverter
+from discord.ext.commands import Bot, Cog, Context, MessageConverter, clean_content
 
 from bot import utils
 from bot.constants import Emojis
@@ -46,7 +46,7 @@ class Fun(Cog):
         await ctx.send(output)
 
     @commands.command(name="uwu", aliases=("uwuwize", "uwuify",))
-    async def uwu_command(self, ctx: Context, *, text: str) -> None:
+    async def uwu_command(self, ctx: Context, *, text: clean_content(fix_channel_mentions=True)) -> None:
         """Converts a given `text` into it's uwu equivalent."""
         conversion_func = functools.partial(
             utils.replace_many, replacements=UWU_WORDS, ignore_case=True, match_case=True
-- 
cgit v1.2.3


From 1c0afb81dbd690c4051ee90f59d63bb171d1656f Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 21 Sep 2020 20:12:58 +1000
Subject: Use clean_content when fetching linked msgs for fun commands.

---
 bot/exts/evergreen/fun.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bot')

diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py
index 1668982b..de6a92c6 100644
--- a/bot/exts/evergreen/fun.py
+++ b/bot/exts/evergreen/fun.py
@@ -87,7 +87,7 @@ class Fun(Cog):
         await ctx.send(content=converted_text, embed=embed)
 
     @commands.command(name="randomcase", aliases=("rcase", "randomcaps", "rcaps",))
-    async def randomcase_command(self, ctx: Context, *, text: str) -> None:
+    async def randomcase_command(self, ctx: Context, *, text: clean_content(fix_channel_mentions=True)) -> None:
         """Randomly converts the casing of a given `text`."""
         def conversion_func(text: str) -> str:
             """Randomly converts the casing of a given string."""
@@ -193,7 +193,7 @@ class Fun(Cog):
         msg = await Fun._get_discord_message(ctx, text)
         # Ensure the user has read permissions for the channel the message is in
         if isinstance(msg, Message) and ctx.author.permissions_in(msg.channel).read_messages:
-            text = msg.content
+            text = msg.clean_content
             # Take first embed because we can't send multiple embeds
             if msg.embeds:
                 embed = msg.embeds[0]
-- 
cgit v1.2.3