feat: update rapptz time parser

Fixes timezone bug.

Author: oliver-ni

bmt_discord_bot/cogs/reminders.py

@@ -30,7 +30,7 @@ async def reminder(
         ctx: Context,
         *,
         time_and_content: Annotated[
-            time.UserFriendlyTime.Result,
+            time.FriendlyTimeResult,
             time.UserFriendlyTime(commands.clean_content, default="\u2026"),
         ],
     ):

bmt_discord_bot/lib/formats.py

@@ -2,25 +2,38 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-# Copyright (c) 2021 Rapptz
+# Copyright (c) 2025 Rapptz
 
-from datetime import timezone
+from __future__ import annotations
+
+import datetime
+
+from typing import Any, Iterable, Optional, Sequence
 
 
 class plural:
-    def __init__(self, value):
-        self.value = value
+    def __init__(self, value: int):
+        self.value: int = value
 
-    def __format__(self, format_spec):
+    def __format__(self, format_spec: str) -> str:
         v = self.value
-        singular, sep, plural = format_spec.partition("|")
+        skip_value = format_spec.endswith("!")
+        if skip_value:
+            format_spec = format_spec[:-1]
+
+        singular, _, plural = format_spec.partition("|")
         plural = plural or f"{singular}s"
+        if skip_value:
+            if abs(v) != 1:
+                return plural
+            return singular
+
         if abs(v) != 1:
             return f"{v} {plural}"
         return f"{v} {singular}"
 
 
-def human_join(seq, delim=", ", final="or"):
+def human_join(seq: Sequence[str], delim: str = ", ", final: str = "or") -> str:
     size = len(seq)
     if size == 0:
         return ""
@@ -36,27 +49,27 @@ def human_join(seq, delim=", ", final="or"):
 
 class TabularData:
     def __init__(self):
-        self._widths = []
-        self._columns = []
-        self._rows = []
+        self._widths: list[int] = []
+        self._columns: list[str] = []
+        self._rows: list[list[str]] = []
 
-    def set_columns(self, columns):
+    def set_columns(self, columns: list[str]):
         self._columns = columns
         self._widths = [len(c) + 2 for c in columns]
 
-    def add_row(self, row):
+    def add_row(self, row: Iterable[Any]) -> None:
         rows = [str(r) for r in row]
         self._rows.append(rows)
         for index, element in enumerate(rows):
             width = len(element) + 2
             if width > self._widths[index]:
                 self._widths[index] = width
 
-    def add_rows(self, rows):
+    def add_rows(self, rows: Iterable[Iterable[Any]]) -> None:
         for row in rows:
             self.add_row(row)
 
-    def render(self):
+    def render(self) -> str:
         """Renders a table in rST format.
 
         Example:
@@ -88,10 +101,19 @@ def get_entry(d):
         return "\n".join(to_draw)
 
 
-def format_dt(dt, style=None):
+def format_dt(dt: datetime.datetime, style: Optional[str] = None) -> str:
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=datetime.timezone.utc)
 
     if style is None:
         return f"<t:{int(dt.timestamp())}>"
     return f"<t:{int(dt.timestamp())}:{style}>"
+
+
+def tick(opt: Optional[bool], /) -> str:
+    lookup = {
+        True: "<:greenTick:330090705336664065>",
+        False: "<:redTick:330090723011592193>",
+        None: "<:greyTick:563231201280917524>",
+    }
+    return lookup.get(opt, "<:redTick:330090723011592193>")