resolve bug in github code and add basic error handling (#24)

Author: AbstractUmbra

core/bot.py

@@ -22,8 +22,12 @@
 """
 from __future__ import annotations
 
+import datetime
 import json
 import pathlib
+import sys
+import textwrap
+import traceback
 from collections import deque
 from typing import TYPE_CHECKING, Any
 
@@ -82,6 +86,55 @@ async def on_socket_response(self, message: Any) -> None:
         """Quick override to log websocket events."""
         self._previous_websocket_events.append(message)
 
+    async def on_error(self, event_name: str, /, *args: Any, **kwargs: Any) -> None:
+        exc_type, exception, traceback_ = sys.exc_info()
+
+        if isinstance(exception, commands.CommandInvokeError):
+            return
+
+        embed = discord.Embed(title="Event Error", colour=discord.Colour.random())
+        embed.add_field(name="Event", value=event_name)
+
+        traceback_text = "".join(traceback.format_exception(exc_type, exception, traceback_))
+
+        embed.description = f"```py\n{traceback_text}\n```"
+        embed.timestamp = datetime.datetime.now(datetime.timezone.utc)
+
+        args_str = ["```py"]
+        for index, arg in enumerate(args):
+            args_str.append(f"[{index}]: {arg!r}")
+            args_str.append("```")
+            embed.add_field(name="Args", value="\n".join(args_str), inline=False)
+
+        self.log_handler.error("Event Error", extra={"embed": embed})
+
+    async def on_command_error(self, ctx: Context, error: commands.CommandError) -> None:  # type: ignore # weird narrowing
+        assert ctx.command  # wouldn't be here otherwise
+
+        if not isinstance(error, (commands.CommandInvokeError, commands.ConversionError)):
+            return
+
+        error = getattr(error, "original", error)
+        if isinstance(error, (discord.Forbidden, discord.NotFound)):
+            return
+
+        embed = discord.Embed(title="Command Error", colour=0xCC3366)
+        embed.add_field(name="Name", value=ctx.command.qualified_name)
+        embed.add_field(name="Author", value=f"{ctx.author} (ID: {ctx.author.id})")
+
+        fmt = f"Channel: {ctx.channel} (ID: {ctx.channel.id})"
+        if ctx.guild:
+            fmt = f"{fmt}\nGuild: {ctx.guild} (ID: {ctx.guild.id})"
+
+        embed.add_field(name="Location", value=fmt, inline=False)
+        embed.add_field(name="Content", value=textwrap.shorten(ctx.message.content, width=512))
+
+        exc = "".join(traceback.format_exception(type(error), error, error.__traceback__, chain=False))
+        embed.description = f"```py\n{exc}\n```"
+        embed.timestamp = discord.utils.utcnow()
+
+        self.log_handler.error("Command Error", extra={"embed": embed})
+
     async def start(self, token: str, *, reconnect: bool = True) -> None:
         try:
             await super().start(token=token, reconnect=reconnect)

modules/github.py

@@ -32,6 +32,9 @@
 
 GITHUB_ISSUE_URL = "https://github.com/{}/issues/{}"
 LIB_ISSUE_REGEX = re.compile(r"(?P<lib>[a-z]+)?##(?P<number>[0-9]+)", flags=re.IGNORECASE)
+GITHUB_CODE_REGION_REGEX = re.compile(
+    r"https?://github\.com/(?P<user>.*)/(?P<repo>.*)/blob/(?P<hash>[a-zA-Z0-9]+)/(?P<path>.*)(?:\#L)(?P<linestart>[0-9]+)(?:-L)?(?P<lineend>[0-9]+)?"
+)
 
 GITHUB_BASE_URL = "https://github.com/"
 GITHUB_RAW_CONTENT_URL = "https://raw.githubusercontent.com/"
@@ -56,8 +59,13 @@ def _strip_content_path(self, url: str) -> str:
         return file_path
 
     async def format_highlight_block(self, url: str, line_adjustment: int = 10) -> dict[str, str | int] | None:
+        match = GITHUB_CODE_REGION_REGEX.search(url)
+
+        if not match:
+            return
+
         try:
-            highlighted_line = int(url.split("#L")[1])  # separate the #L{n} highlight
+            highlighted_line = int(match["linestart"])  # separate the #L{n} highlight
         except IndexError:
             return
 

modules/logging.py

@@ -54,17 +54,21 @@ async def logging_loop(self) -> None:
         assert self.webhook
 
         to_log = await self.bot.logging_queue.get()
+
         attributes = {"INFO": "\U00002139\U0000fe0f", "WARNING": "\U000026a0\U0000fe0f"}
 
         emoji = attributes.get(to_log.levelname, "\N{CROSS MARK}")
         dt = datetime.datetime.utcfromtimestamp(to_log.created)
 
         message = textwrap.shorten(f"{emoji} {format_dt(dt)}\n{to_log.message}", width=1990)
 
+        embed = to_log.__dict__.get("embed") or discord.utils.MISSING
+
         await self.webhook.send(
             message,
             username="PythonistaBot Logging",
             avatar_url=core.CONFIG["LOGGING"].get("webhook_avatar_url"),
+            embed=embed,
         )