From 2cde858674fa6b4828f1a91028a62fb986c874f0 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 20 Aug 2020 22:38:34 +0100 Subject: Temporarily remove message functionality from Fun Remove message link functionality from uwu and randomcase due to a security vulnerability --- bot/exts/evergreen/fun.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'bot/exts/evergreen/fun.py') diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index 67a4bae5..b2c0aad9 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -49,8 +49,6 @@ class Fun(Cog): 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. """ conversion_func = functools.partial( utils.replace_many, replacements=UWU_WORDS, ignore_case=True, match_case=True @@ -69,8 +67,6 @@ class Fun(Cog): 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. """ def conversion_func(text: str) -> str: """Randomly converts the casing of a given string.""" @@ -97,12 +93,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 -- cgit v1.2.3 From 09553df414dc225d2857c100a8cf02eaeeca4d47 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 20 Aug 2020 22:45:56 +0100 Subject: Update fun.py to satisfy the linter --- bot/exts/evergreen/fun.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'bot/exts/evergreen/fun.py') diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index b2c0aad9..0a5d22f9 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -47,9 +47,7 @@ class Fun(Cog): @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. - """ + """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 ) @@ -65,9 +63,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`. - """ + """Randomly converts the casing of a given `text`.""" def conversion_func(text: str) -> str: """Randomly converts the casing of a given string.""" return "".join( -- cgit v1.2.3 From e0caf6787d862ba605a734fdf9b9363cdf100b85 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 20 Aug 2020 22:49:36 +0100 Subject: Remove whitespace from fun.py --- bot/exts/evergreen/fun.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bot/exts/evergreen/fun.py') diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index 0a5d22f9..36a13ac0 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -89,7 +89,7 @@ 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 -- cgit v1.2.3 From c8ba498d34fbbc9cd8ac49092d19fafe1f97cefa Mon Sep 17 00:00:00 2001 From: Gustav Odinger Date: Wed, 16 Sep 2020 23:50:10 +0200 Subject: Update .roll to use new dice emojis - Resolves #440 --- bot/constants.py | 12 ++++++------ bot/exts/evergreen/fun.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'bot/exts/evergreen/fun.py') diff --git a/bot/constants.py b/bot/constants.py index 295bb90b..6605882d 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -108,12 +108,12 @@ class Emojis: trashcan = "<:trashcan:637136429717389331>" ok_hand = ":ok_hand:" - terning1 = "<:terning1:431249668983488527>" - terning2 = "<:terning2:462339216987127808>" - terning3 = "<:terning3:431249694467948544>" - terning4 = "<:terning4:579980271475228682>" - terning5 = "<:terning5:431249716328792064>" - terning6 = "<:terning6:431249726705369098>" + dice_1 = "<:dice_1:755891608859443290>" + dice_2 = "<:dice_2:755891608741740635>" + dice_3 = "<:dice_3:755891608251138158>" + dice_4 = "<:dice_4:755891607882039327>" + dice_5 = "<:dice_5:755891608091885627>" + dice_6 = "<:dice_6:755891607680843838>" issue = "<:IssueOpen:629695470327037963>" issue_closed = "<:IssueClosed:629695470570307614>" diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index 36a13ac0..1a7ebb90 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -41,7 +41,7 @@ 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)}" + terning = f"dice_{random.randint(1, 6)}" output += getattr(Emojis, terning, '') await ctx.send(output) -- cgit v1.2.3 From f1ac62822d070d5df3a2cc9d13dc018149c55898 Mon Sep 17 00:00:00 2001 From: Gustav Odinger Date: Thu, 17 Sep 2020 00:32:55 +0200 Subject: Update variable name from terning to dice --- bot/exts/evergreen/fun.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bot/exts/evergreen/fun.py') diff --git a/bot/exts/evergreen/fun.py b/bot/exts/evergreen/fun.py index 1a7ebb90..b0240c45 100644 --- a/bot/exts/evergreen/fun.py +++ b/bot/exts/evergreen/fun.py @@ -41,8 +41,8 @@ class Fun(Cog): elif num_rolls < 1: output = ":no_entry: You must roll at least once." for _ in range(num_rolls): - terning = f"dice_{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",)) -- cgit v1.2.3