minor fixes

Author: rtk-rnjn

cogs/nsfw/nsfw.py

@@ -2,14 +2,14 @@
 
 from random import choice, random
 from typing import Literal
-
+import io
 import discord
 from core import Cog, Context, Parrot
 from discord.ext import commands, tasks
 from utilities.checks import is_adult
 from utilities.exceptions import ParrotCheckFailure
-from utilities.nsfw.sexdotcom import SexDotComGif, SexDotComPics
 from utilities.nsfw.constants import SEXDOTCOM_TAGS
+from utilities.nsfw.sexdotcom import SexDotComGif, SexDotComPics
 from utilities.paginator import PaginationView as PV
 
 from ._nsfw import ENDPOINTS
@@ -213,7 +213,7 @@ async def _sex_gif(self, ctx: Context) -> None:
             return
 
         _bytes = await response.read()
-        file = discord.File(_bytes, "file.gif")
+        file = discord.File(io.BytesIO(_bytes), "file.gif")
         await ctx.reply(file=file)
 
     async def sexdotcom_write_to_db(self):

cogs/ticket/ticket.py

@@ -68,7 +68,7 @@ async def log(self, *, guild: discord.Guild, author: discord.Member | discord.Us
     async def new_ticket(self, *, guild: discord.Guild, author: discord.Member | discord.User) -> None:
         ticket_config = self.bot.guild_configurations_cache[guild.id]["ticket_config"]
 
-        mod_role: int = ticket_config["mod_role"]
+        mod_role: int | None = self.bot.guild_configurations_cache[guild.id]["mod_role"]
 
         category: discord.CategoryChannel = guild.get_channel(ticket_config["category"] or 0)  # type: ignore
         overwrites = {

custom_commands/sector_17_29/__init__.py

@@ -204,7 +204,7 @@ async def claim_vote(self, ctx: Context):
     @in_support_server()
     async def my_votes(self, ctx: Context):
         if data := await self.bot.user_collections_ind.find_one({"_id": ctx.author.id, "topgg_votes": {"$exists": True}}):
-            await ctx.send(f"You voted for **{self.bot.user}** for **{len(data['topgg_votes'])}** times on Top.gg")
+            await ctx.send(f"You voted for **{self.bot.user}** for **{data['topgg_votes']}** times on Top.gg")
         else:
             await ctx.send("You haven't voted for the bot on Top.gg yet.")
 
@@ -222,7 +222,7 @@ async def __add_to_db(self, member: discord.Member) -> None:
             message=int(discord.utils.utcnow().timestamp() * 10),
             expires_at=(discord.utils.utcnow() + timedelta(hours=12)).timestamp(),
             messageAuthor=member.id,
-            content=f"You can vote for the bot again on Top.gg.\n>>> Click **<https://top.gg/bot/{self.bot.user.id}/vote>** to vote.",
+            content=f"You can vote for the bot again on Top.gg. Click **<https://top.gg/bot/{self.bot.user.id}/vote>** to vote.",
             dm_notify=True,
         )
 

events/on_cmd.py

@@ -3,17 +3,17 @@
 import asyncio
 import pathlib
 import random
-from typing import TYPE_CHECKING, TypeVar
 from collections.abc import Sequence
+from typing import TYPE_CHECKING, TypeVar
 
 import arrow
+from rapidfuzz import fuzz, process
+
 import discord
 from core import Cog
 from discord.ext import commands
 from utilities.exceptions import ParrotCheckFailure
 
-from rapidfuzz import fuzz, process
-
 if TYPE_CHECKING:
     from core import Context, Parrot
 
@@ -59,21 +59,17 @@ async def on_command(self, ctx: Context):
         """This event will be triggered when the command is being completed; triggered by [discord.User]!."""
         if ctx.author.bot:
             return
-        await ctx.database_command_update(
-            success=not ctx.command_failed,
-        )
+        await ctx.database_command_update(success=not ctx.command_failed)
 
-    def _get_object_by_fuzzy(self, *, argument: str, objects: Sequence[T]) -> tuple[T | None, str | None, int | None] | None:
+    def _get_object_by_fuzzy(self, *, argument: str, objects: Sequence[T]) -> tuple[T, str, int] | None:
         """Get an object from a list of objects by fuzzy matching."""
         if not argument:
             return None
         CUT_OFF = 90
         names = [o.name for o in objects]
-        algorithms = [fuzz.ratio, fuzz.partial_ratio, fuzz.token_sort_ratio, fuzz.token_set_ratio, fuzz.WRatio]
-        for algo in algorithms:
-            if data := process.extractOne(argument, names, scorer=algo, score_cutoff=CUT_OFF):
-                result, score, position = data
-                return objects[position], result, int(score)
+        if data := process.extractOne(argument, names, scorer=fuzz.WRatio, score_cutoff=CUT_OFF):
+            result, score, position = data
+            return objects[position], result, int(score)
 
     @Cog.listener()
     async def on_command_error(self, ctx: Context, error: commands.CommandError):  # noqa: PLR0912, PLR0915, C901
@@ -84,7 +80,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
 
         # get the original exception
         error = getattr(error, "original", error)
-        TO_RAISE_ERROR, DELETE_AFTER = False, None
+        TO_RAISE_ERROR, DELETE_AFTER, RESET_COOLDOWN = False, None, False
         ignore = (
             commands.CommandNotFound,
             discord.NotFound,
@@ -105,6 +101,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
                 fmt = " and ".join(missing)
             ERROR_EMBED.description = f"Please provide the following permission(s) to the bot.```\n{fmt}```"
             ERROR_EMBED.set_author(name=(f"{QUESTION_MARK} Bot Missing permissions {QUESTION_MARK}"))
+            RESET_COOLDOWN = True
 
         elif isinstance(error, commands.CommandOnCooldown):
             now = arrow.utcnow().shift(seconds=error.retry_after).datetime
@@ -126,7 +123,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
 
             ERROR_EMBED.description = f"You need the following permission(s) to the run the command.```\n{fmt}```"
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Missing permissions {QUESTION_MARK}")
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
 
         elif isinstance(error, commands.MissingRole):
             missing = [error.missing_role]
@@ -136,7 +133,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
                 fmt = " and ".join(missing)  # type: ignore
             ERROR_EMBED.description = f"You need the the following role(s) to use the command```\n{fmt}```"
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Missing Role {QUESTION_MARK}")
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
 
         elif isinstance(error, commands.MissingAnyRole):
             missing = list(error.missing_roles)
@@ -146,16 +143,16 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
                 fmt = " and ".join(missing)  # type: ignore
             ERROR_EMBED.description = f"You need the the following role(s) to use the command```\n{fmt}```"
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Missing Role {QUESTION_MARK}")
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
 
         elif isinstance(error, commands.NSFWChannelRequired):
             ERROR_EMBED.description = "This command will only run in NSFW marked channel. https://i.imgur.com/oe4iK5i.gif"
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} NSFW Channel Required {QUESTION_MARK}")
             ERROR_EMBED.set_image(url="https://i.imgur.com/oe4iK5i.gif")
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
 
         elif isinstance(error, commands.BadArgument):
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
             objects = []
             if isinstance(error, commands.MessageNotFound):
                 ERROR_EMBED.description = "Message ID/Link you provied is either invalid or deleted"
@@ -189,7 +186,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
                 ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Bad Argument {QUESTION_MARK}")
 
             if objects:
-                if (obj := self._get_object_by_fuzzy(argument=error.argument, objects=objects)):  # type: ignore
+                if obj := self._get_object_by_fuzzy(argument=error.argument, objects=objects):  # type: ignore
                     _, result, score = obj
                     ERROR_EMBED.description += f"\n\nDid you mean `{result}`?"
                     ERROR_EMBED.set_footer(text=f"Confidence: {score}%")
@@ -199,7 +196,7 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
             commands.MissingRequiredArgument | commands.BadUnionArgument | commands.TooManyArguments,
         ):
             command = ctx.command
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
             ERROR_EMBED.description = f"Please use proper syntax.```\n{ctx.clean_prefix}{command.qualified_name}{'|' if command.aliases else ''}{'|'.join(command.aliases or '')} {command.signature}```"
 
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Invalid Syntax {QUESTION_MARK}")
@@ -218,17 +215,17 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
             ERROR_EMBED.set_author(name=(f"{QUESTION_MARK} Max Concurrenry Reached {QUESTION_MARK}"))
 
         elif isinstance(error, ParrotCheckFailure):
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
             ERROR_EMBED.description = f"{error.__str__().format(ctx=ctx)}"
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Unexpected Error {QUESTION_MARK}")
 
         elif isinstance(error, commands.CheckAnyFailure):
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
             ERROR_EMBED.description = " or\n".join([error.__str__().format(ctx=ctx) for error in error.errors])
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Unexpected Error {QUESTION_MARK}")
 
         elif isinstance(error, commands.CheckFailure):
-            ctx.command.reset_cooldown(ctx)
+            RESET_COOLDOWN = True
             ERROR_EMBED.set_author(name=f"{QUESTION_MARK} Unexpected Error {QUESTION_MARK}")
             ERROR_EMBED.description = "You don't have the required permissions to use this command."
 
@@ -257,6 +254,9 @@ async def on_command_error(self, ctx: Context, error: commands.CommandError):  #
 
         ERROR_EMBED.timestamp = discord.utils.utcnow()
 
+        if RESET_COOLDOWN:
+            ctx.command.reset_cooldown(ctx)
+
         msg: discord.Message | None = await ctx.reply(random.choice(quote), embed=ERROR_EMBED)
 
         try: