Merge branch 'master' into caesar-command

1 files changed, 12 insertions, 18 deletions

diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py
index c5f8f9c8..2f575c1c 100644
--- a/bot/exts/evergreen/fun.py
+++ b/bot/exts/evergreen/fun.py
@@ -66,17 +66,13 @@ class Fun(Cog):
         elif num_rolls < 1:
             output = ":no_entry: You must roll at least once."
         for _ in range(num_rolls):
-            terning = f"terning{random.randint(1, 6)}"
-            output += getattr(Emojis, terning, '')
+            dice = f"dice_{random.randint(1, 6)}"
+            output += getattr(Emojis, dice, '')
         await ctx.send(output)
 
     @commands.command(name="uwu", aliases=("uwuwize", "uwuify",))
     async def uwu_command(self, ctx: Context, *, text: str) -> None:
-        """
-        Converts a given `text` into it's uwu equivalent.
-
-        Also accepts a valid discord Message ID or link.
-        """
+        """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
         )
@@ -92,11 +88,7 @@ class Fun(Cog):
 
     @commands.command(name="randomcase", aliases=("rcase", "randomcaps", "rcaps",))
     async def randomcase_command(self, ctx: Context, *, text: str) -> None:
-        """
-        Randomly converts the casing of a given `text`.
-
-        Also accepts a valid discord Message ID or link.
-        """
+        """Randomly converts the casing of a given `text`."""
         def conversion_func(text: str) -> str:
             """Randomly converts the casing of a given string."""
             return "".join(
@@ -194,12 +186,14 @@ class Fun(Cog):
             Union[Embed, None]: The embed if found in the valid Message, else None
         """
         embed = None
-        message = await Fun._get_discord_message(ctx, text)
-        if isinstance(message, Message):
-            text = message.content
-            # Take first embed because we can't send multiple embeds
-            if message.embeds:
-                embed = message.embeds[0]
+
+        # message = await Fun._get_discord_message(ctx, text)
+        # if isinstance(message, Message):
+        #     text = message.content
+        #     # Take first embed because we can't send multiple embeds
+        #     if message.embeds:
+        #         embed = message.embeds[0]
+
         return (text, embed)
 
     @staticmethod