Fix cog

Author: MaskDuck

_orangcbot/__main__.py

@@ -92,7 +92,7 @@ def convert_none_to_0(key: Optional[ConvertibleToInt] = None) -> int:
 # WARNING: Do not remove this if!
 if nextcord.version_info < (3, 0, 0):
     bot.load_extension("onami")
-bot.load_extension("extensions.antihoist")
+# bot.load_extension("extensions.antihoist")
 
 bot.load_extension("extensions.fun")
 bot.load_extension("extensions.faq")

_orangcbot/extensions/antihoist.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
+from datetime import datetime
 import logging
 from string import ascii_letters
 from typing import TYPE_CHECKING, Final
 
-from nextcord.ext import commands
+from nextcord import HTTPException, Permissions, user_command, Interaction, Member
+from nextcord.ext import commands, application_checks as ac
 
 if TYPE_CHECKING:
     import nextcord
+    from nextcord import AutoModerationActionExecution
+
 
 NUMBERS: Final[str] = "1234567890"
 normal_characters: Final[str] = ascii_letters + NUMBERS
@@ -39,6 +43,33 @@ async def check_nickname_on_edit(
                 nick="kid", reason="having a strong craving to be a discord ecelebrity"
             )
 
+    # @commands.Cog.listener("on_auto_moderation_action_execution")
+    # async def check_nword_pass(self, execution: AutoModerationActionExecution):
+    #     if execution.rule_id == 1196650528889905305:  # racial slur N word automod rule
+    #         try:
+    #             await execution.member.send(
+    #                 f"seriously? you think you are better just because you were born in somewhere rather than Africa? you're banned from is-a.dev now. oh yes, if you're looking for an appeal form, sorry, no, cuz we are so disgusted at you. it's {datetime.now().year}, get some braincells rather than spamming your keyboard online like that!"
+    #             )
+    #         except HTTPException:
+    #             pass
+    #         await execution.member.ban(
+    #             reason="thought that they are better just because they weren't born in somewhere rather than Africa"
+    #         )
+
+    @user_command(
+        dm_permission=False, name="Cleanse Nickname", default_member_permissions=8
+    )
+    @ac.has_role(830875873027817484)
+    async def cleanse_nickname(self, interaction: Interaction, member: Member) -> None:
+        previous_display_name = member.display_name
+        await member.edit(
+            nick="kid",
+            reason=f"nickname cleansing requested by {interaction.user.display_name}",
+        )
+        await interaction.send(
+            f"Nickname of {previous_display_name} has been cleansed to `kid`."
+        )
+
 
 def setup(bot: commands.Bot) -> None:
     bot.add_cog(AutoMod(bot))

_orangcbot/extensions/converters.py

@@ -10,39 +10,40 @@
     "SlashSubdomainNameConverter",
     "EnsureHTTPConverter",
     "SlashEnsureHTTPConverter",
+    "RGBColorTupleConverter",
 )
 
 
 class SubdomainNameConverter(commands.Converter):
-    async def convert(self, ctx: commands.Context, argument: str) -> str:
+    async def convert(self, ctx: commands.Context, argument: str) -> str:  # type: ignore
         argument = argument.lower()
         if argument.endswith(".is-a.dev"):
             return argument[:-9]
         return argument
 
 
 class RGBColorTupleConverter(commands.Converter):
-    async def convert(self, ctx: commands.Context, argument: str) -> Tuple[str]:
+    async def convert(self, ctx: commands.Context, argument: str) -> Tuple[str]:  # type: ignore
         return argument.split("-")  # type: ignore[reportReturnType]
 
 
 class SlashSubdomainNameConverter(OptionConverter):
-    async def convert(self, interaction: Interaction, value: str) -> str:
+    async def convert(self, interaction: Interaction, value: str) -> str:  # type: ignore
         value = value.lower()
         if value.endswith(".is-a.dev"):
             return value[:-9]
         return value
 
 
 class SlashEnsureHTTPConverter(OptionConverter):
-    async def convert(self, interaction: Interaction, value: str) -> str:
+    async def convert(self, interaction: Interaction, value: str) -> str:  # type: ignore
         if value.startswith("https://") or value.startswith("http://"):
             return value
         return "http://" + value
 
 
 class EnsureHTTPConverter(commands.Converter):
-    async def convert(self, ctx: commands.Context, argument: str) -> str:
+    async def convert(self, ctx: commands.Context, argument: str) -> str:  # type: ignore
         if argument.startswith("https://") or argument.startswith("http://"):
             return argument
         return "http://" + argument
@@ -60,7 +61,7 @@ async def convert(self, ctx: commands.Context, argument: str) -> str:  # type: i
 
 
 class SlashEnsureNoHTTPConverter(commands.Converter):
-    async def convert(self, ctx: commands.Context, argument: str) -> str:  # type: ignore[reportUnusedArgument]
+    async def convert(self, interaction: Interaction, argument: str) -> str:  # type: ignore[reportUnusedArgument]
         if argument.startswith("https://"):
             return argument[len("https://") - 1 :]
 

_orangcbot/extensions/dns.py

@@ -40,7 +40,7 @@ def construct_embed(url: str, answer: str, record_type: str):
 
 class DigDropdown(nextcord.ui.Select):
     if TYPE_CHECKING:
-        _message: nextcord.Message
+        _message: nextcord.Message | nextcord.PartialInteractionMessage
 
     def __init__(self, url: str):
         options = [
@@ -53,21 +53,24 @@ def __init__(self, url: str):
             DigSelectOption("PTR"),
         ]
         self._url: str = url
-        super().__init__(options=options, placeholder="What records do you want?")
+        super().__init__(options=options, placeholder="What records do you want?")  # type: ignore -- perfectly compatible!
 
     async def callback(self, interaction: nextcord.Interaction):
         await interaction.response.defer()
+
+        assert interaction.data is not None
+        assert "values" in interaction.data
         try:
             answers = _dnsresolver.resolve(self._url, interaction.data["values"][0])
-            answer = "\n".join([str(ans) for ans in answers])
+            answer = "\n".join([str(ans) for ans in answers])  # type: ignore
         except _dnsresolver.NoAnswer:
             answer = "NOT FOUND"
         await self._message.edit(
             embed=construct_embed(self._url, answer, interaction.data["values"][0])
         )
 
     def update_msg(self, msg: nextcord.Message):
-        self._message: nextcord.Message = msg
+        self._message: nextcord.Message | nextcord.PartialInteractionMessage = msg
 
 
 class DNSView(nextcord.ui.View):
@@ -91,10 +94,11 @@ def update_msg(
         self, msg: nextcord.Message | nextcord.PartialInteractionMessage
     ) -> None:
         self._message = msg
-        self.dropdown.update_msg(msg)
+        self.dropdown.update_msg(msg)  # type: ignore
 
     async def on_timeout(self):
         for child in self.children:
+            assert isinstance(child, nextcord.ui.Button)
             child.disabled = True
         await self._message.edit(view=self)
 
@@ -108,7 +112,7 @@ async def dig(self, ctx: commands.Context, url: str):
         """Dig an URL for its DNS records. Default to CNAME, if you want other then select in the dropdown."""
         try:
             answers = _dnsresolver.resolve(url, "CNAME")
-            answer = "\n".join([str(ans) for ans in answers])
+            answer = "\n".join([str(ans) for ans in answers])  # type: ignore -- those are subscriptable
         except _dnsresolver.NoAnswer:
             answer = "NOT FOUND"
         except _dnsresolver.NXDOMAIN:
@@ -130,7 +134,7 @@ async def dig_(
         """Dig an URL for its DNS records. Default to CNAME, if you want other things then please choose in the dropdown provided later."""
         try:
             answers = _dnsresolver.resolve(url, "CNAME")
-            answer = "\n".join([str(ans) for ans in answers])
+            answer = "\n".join([str(ans) for ans in answers])  # type: ignore -- those are subscriptible
         except _dnsresolver.NoAnswer:
             answer = "NOT FOUND"
         except _dnsresolver.NXDOMAIN:

_orangcbot/extensions/faq.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Dict, List
+from typing import TYPE_CHECKING, Dict, List
 
 import nextcord
 from nextcord.ext import commands
@@ -57,6 +57,9 @@ def __init__(self, question: str, answer: str) -> None:
 
 
 class FAQDropdown(nextcord.ui.Select):
+    if TYPE_CHECKING:
+        _message: nextcord.Message | nextcord.PartialInteractionMessage
+
     def __init__(self):
         options: List[nextcord.SelectOption] = [
             nextcord.SelectOption(
@@ -94,10 +97,11 @@ def __init__(self):
             ),
         ]
         super().__init__(placeholder="Select your question.", options=options)
-        self._message: nextcord.Message = None
 
-    def update_msg(self, message: nextcord.Message | nextcord.InteractionMessage):
-        self._message: nextcord.Message | nextcord.InteractionMessage = message
+    def update_msg(
+        self, message: nextcord.Message | nextcord.PartialInteractionMessage
+    ):
+        self._message: nextcord.Message | nextcord.PartialInteractionMessage = message
 
     async def callback(self, interaction: nextcord.Interaction):
         await interaction.response.defer()

_orangcbot/extensions/suggestions.py

@@ -1,14 +1,15 @@
 from __future__ import annotations
 
 from contextlib import suppress
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal, cast
 
 from nextcord import (
     Colour,
     Embed,
     Interaction,
     Message,
     SlashOption,
+    TextChannel,
     TextInputStyle,
     message_command,
     slash_command,
@@ -41,7 +42,7 @@ def __init__(self, mode: bool, message: Message) -> None:
     async def callback(self, interaction: Interaction) -> None:
         embed = self._suggestion_msg.embeds[0]
         embed.add_field(
-            name=f"{'Approved by' if self._mode else 'Denied by'} {interaction.user.display_name}",
+            name=f"{'Approved by' if self._mode else 'Denied by'} {interaction.user.name}",
             value=self.reas.value,
         )
         await self._suggestion_msg.edit(embed=embed)
@@ -75,7 +76,7 @@ async def deny_suggestion_msg(
         await interaction.response.send_modal(ApproveOrDeny(False, message))
 
     @slash_command(name="suggestion")
-    async def _suggestion(self, interaction: Interaction):
+    async def _suggestion(self, interaction: Interaction):  # type: ignore[reportUnusedVariable]
         pass
 
     @_suggestion.subcommand(
@@ -91,6 +92,9 @@ async def _suggest(
             name="suggestion", description="Write your suggestion here.", required=True
         ),
     ):
+        embed: Embed
+
+        for_ = cast(Literal["the server", "the service"], for_)
         if for_ == "the server":
             embed = Embed(
                 title="Server Suggestion", description=suggestion, colour=Colour.red()
@@ -99,19 +103,26 @@ async def _suggest(
                 text=f"By {str(interaction.user)} (ID {interaction.user.id})"
             )
 
-        if for_ == "the service":
+        elif for_ == "the service":
             embed = Embed(
                 title="Service Suggestion", description=suggestion, colour=Colour.red()
             )
             embed.set_footer(
                 text=f"By {str(interaction.user)} (ID {interaction.user.id})"
             )
 
+        else:
+            await interaction.send(
+                "Well, what do you want to suggest for? Use your brain and let autocomplete guide you."
+            )
+
         channel = interaction.guild.get_channel(self.suggestion_channel)
-        message = await channel.send(embed=embed)
+        channel = cast(TextChannel, channel)
+        message = await channel.send(embed=embed)  # type: ignore
         await message.add_reaction("✅")
         await message.add_reaction("❌")
         log_channel = self.bot.get_channel(955105139461607444)
+        log_channel = cast(TextChannel, log_channel)
         await log_channel.send(f"{str(interaction.user)} has suggested {suggestion}.")
         await interaction.send(
             f"You can now see your suggestion in {channel.mention}.",
@@ -146,6 +157,7 @@ async def _deny(
         ),
     ):
         channel = interaction.guild.get_channel(self.suggestion_channel)
+        channel = cast(TextChannel, channel)
         message = await channel.fetch_message(int(messageId))
         embed = message.embeds[0]
         new_embed = embed.add_field(
@@ -171,6 +183,7 @@ async def _approve(
         if not why:
             why = "No reason provided"
         channel = self.bot.get_channel(self.suggestion_channel)
+        channel = cast(TextChannel, channel)
         message = await channel.fetch_message(int(messageId))
         embed = message.embeds[0]
         new_embed = embed.add_field(

_orangcbot/extensions/types.py

@@ -16,14 +16,20 @@ class _OwnerObject(TypedDict):
     twitter: NotRequired[str]
 
 
-class _RecordObject(TypedDict, total=False):
+class _OtherRecordObject(TypedDict, total=False):
     A: List[str]
-    CNAME: str
     URL: str
     TXT: Union[str, List[str]]
     MX: List[str]
 
 
+class _CNAMERecordObject(TypedDict):
+    CNAME: str
+
+
+_RecordObject = Union[_OtherRecordObject, _CNAMERecordObject]
+
+
 class Domain(TypedDict):
     description: NotRequired[str]
     repo: NotRequired[str]