types: more type fixes

Author: onerandomusername

monty/exts/filters/codeblock/_cog.py

@@ -72,7 +72,7 @@ def __init__(self, bot: Monty) -> None:
 
         # Stores allowed channels plus epoch times since the last instructional messages sent.
         # TODO: remove or refactor this unused code
-        self.channel_cooldowns = dict.fromkeys((), 0.0)
+        self.channel_cooldowns: dict[int, float] = dict.fromkeys((), 0.0)
 
         # Maps users' messages to the messages the bot sent with instructions.
         self.codeblock_message_ids = {}
@@ -104,7 +104,10 @@ async def get_sent_instructions(self, payload: disnake.RawMessageUpdateEvent) ->
             log.debug("Could not find instructions message; it was probably deleted.")
             return None
 
-    def is_on_cooldown(self, channel: Union[GuildMessageable, disnake.DMChannel]) -> bool:
+    def is_on_cooldown(
+        self,
+        channel: disnake.DMChannel | disnake.GroupChannel | disnake.abc.GuildChannel | disnake.Thread,
+    ) -> bool:
         """
         Return True if an embed was sent too recently for `channel`.
 
@@ -115,10 +118,13 @@ def is_on_cooldown(self, channel: Union[GuildMessageable, disnake.DMChannel]) ->
         cooldown = constants.CodeBlock.cooldown_seconds
         return (time.time() - self.channel_cooldowns.get(channel.id, 0)) < cooldown
 
-    async def is_valid_channel(self, channel: Union[GuildMessageable, disnake.DMChannel]) -> bool:
+    async def is_valid_channel(
+        self,
+        channel: disnake.DMChannel | disnake.GroupChannel | disnake.abc.GuildChannel | disnake.Thread,
+    ) -> bool:
         """Return True if `channel` is a help channel, may be on a cooldown, or is whitelisted."""
         log.trace(f"Checking if #{channel} qualifies for code block detection.")
-        if isinstance(channel, disnake.DMChannel):
+        if not isinstance(channel, GuildMessageable):
             return False
         res = channel.guild and await self.bot.guild_has_feature(
             channel.guild, constants.Feature.CODEBLOCK_RECOMMENDATIONS

monty/exts/filters/codeblock/_instructions.py

@@ -108,17 +108,18 @@ def _get_bad_lang_message(content: str) -> Optional[str]:
             f"There must not be any spaces after `{language}`."
         )
 
-    if lines:
-        lines = " ".join(lines)
-        example_blocks = _get_example(language)
-
-        # Note that _get_bad_ticks_message expects the first line to have two newlines.
-        return (
-            f"It looks like you incorrectly specified a language for your code block.\n\n{lines}"
-            f"\n\n**Here is an example of how it should look:**\n{example_blocks}"
-        )
-    else:
+    if not lines:
         log.trace("Nothing wrong with the language specifier; no instructions to return.")
+        return
+
+    joined_lines = " ".join(lines)
+    example_blocks = _get_example(language)
+
+    # Note that _get_bad_ticks_message expects the first line to have two newlines.
+    return (
+        f"It looks like you incorrectly specified a language for your code block.\n\n{joined_lines}"
+        f"\n\n**Here is an example of how it should look:**\n{example_blocks}"
+    )
 
 
 def _get_no_lang_message(content: str) -> Optional[str]:

monty/exts/meta/guild_config.py

@@ -53,7 +53,7 @@ async def can_guild_set_config_option(bot: Monty, *, metadata: ConfigAttrMetadat
 
 
 @commands.register_injection
-async def config_option(inter: disnake.ApplicationCommandInteraction, option: str) -> tuple[str, ConfigAttrMetadata]:
+async def config_option(inter: disnake.GuildCommandInteraction, option: str) -> tuple[str, ConfigAttrMetadata]:
     """
     Get a valid configuration option and its metadata.
 

monty/utils/html_parsing.py

@@ -6,7 +6,7 @@
 from collections import namedtuple
 from typing import TYPE_CHECKING, Collection, Iterable, Iterator, List, Optional, Union
 
-from bs4.element import NavigableString, Tag
+from bs4.element import NavigableString, PageElement, Tag
 
 from monty.exts.info.docs import MAX_SIGNATURE_AMOUNT
 from monty.exts.info.docs._html import get_dd_description, get_general_description, get_signatures
@@ -137,7 +137,7 @@ def _truncate_signatures(signatures: Collection[str]) -> Union[List[str], Collec
 
 
 def _get_truncated_description(
-    elements: Iterable[Union[Tag, NavigableString]] | Tag,
+    elements: Iterable[Union[Tag, NavigableString, PageElement]] | Tag,
     markdown_converter: DocMarkdownConverter,
     max_length: int,
     max_lines: int,
@@ -153,21 +153,28 @@ def _get_truncated_description(
     rendered_length = 0
 
     tag_end_index = 0
+
     for element in elements:
         is_tag = isinstance(element, Tag)
+        is_page_element = isinstance(element, PageElement)
         if is_tag:
             # remove links in headers
             # see also https://github.com/sphinx-doc/sphinx/blob/ba7408209e84ee413f240afc20f3c6b484a81f8f/sphinx/themes/basic/static/searchtools.js#L157
             for link in element.select(".headerlink"):
                 link.decompose()
-        element_length = len(element.text) if is_tag else len(element)
+
+            element_length = len(element.text)
+        elif is_page_element:
+            element_length = 0
+        else:
+            element_length = len(element)
 
         if rendered_length + element_length >= max_length:
             break
         if is_tag:
             element_markdown = markdown_converter.process_tag(element, convert_as_inline=False)
         else:
-            element_markdown = markdown_converter.process_text(element)
+            element_markdown = markdown_converter.process_text(element.text)
 
         rendered_length += element_length
         tag_end_index += len(element_markdown)