Fix block logic and rewrite into helper function

Author: fourjr

bot.py

@@ -47,7 +47,7 @@
 )
 from core.thread import ThreadManager
 from core.time import human_timedelta
-from core.utils import normalize_alias, parse_alias, truncate, tryint
+from core.utils import extract_block_timestamp, normalize_alias, parse_alias, truncate, tryint
 
 logger = getLogger(__name__)
 
@@ -735,21 +735,13 @@ def check_manual_blocked_roles(self, author: discord.Member) -> bool:
                 if str(r.id) in self.blocked_roles:
 
                     blocked_reason = self.blocked_roles.get(str(r.id)) or ""
-                    now = discord.utils.utcnow()
-
-                    # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
-                    end_time = re.search(r"until ([^`]+?)\.$", blocked_reason)
-                    if end_time is None:
-                        # backwards compat
-                        end_time = re.search(r"%([^%]+?)%", blocked_reason)
-                        if end_time is not None:
-                            logger.warning(
-                                r"Deprecated time message for role %s, block and unblock again to update.",
-                                r.name,
-                            )
+
+                    try:
+                        end_time, after = extract_block_timestamp(blocked_reason, author.id)
+                    except ValueError:
+                        return False
 
                     if end_time is not None:
-                        after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
                         if after <= 0:
                             # No longer blocked
                             self.blocked_roles.pop(str(r.id))
@@ -765,26 +757,19 @@ def check_manual_blocked(self, author: discord.Member) -> bool:
             return True
 
         blocked_reason = self.blocked_users.get(str(author.id)) or ""
-        now = discord.utils.utcnow()
 
         if blocked_reason.startswith("System Message:"):
             # Met the limits already, otherwise it would've been caught by the previous checks
             logger.debug("No longer internally blocked, user %s.", author.name)
             self.blocked_users.pop(str(author.id))
             return True
-        # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
-        end_time = re.search(r"until ([^`]+?)\.$", blocked_reason)
-        if end_time is None:
-            # backwards compat
-            end_time = re.search(r"%([^%]+?)%", blocked_reason)
-            if end_time is not None:
-                logger.warning(
-                    r"Deprecated time message for user %s, block and unblock again to update.",
-                    author.name,
-                )
+
+        try:
+            end_time, after = extract_block_timestamp(blocked_reason, author.id)
+        except ValueError:
+            return False
 
         if end_time is not None:
-            after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
             if after <= 0:
                 # No longer blocked
                 self.blocked_users.pop(str(author.id))
@@ -891,7 +876,7 @@ async def add_reaction(
         if reaction != "disable":
             try:
                 await msg.add_reaction(reaction)
-            except (discord.HTTPException, discord.InvalidArgument) as e:
+            except (discord.HTTPException, discord.BadArgument) as e:
                 logger.warning("Failed to add reaction %s: %s.", reaction, e)
                 return False
         return True
@@ -1316,7 +1301,7 @@ async def handle_reaction_events(self, payload):
                     for msg in linked_messages:
                         await msg.remove_reaction(reaction, self.user)
                     await message.remove_reaction(reaction, self.user)
-                except (discord.HTTPException, discord.InvalidArgument) as e:
+                except (discord.HTTPException, discord.BadArgument) as e:
                     logger.warning("Failed to remove reaction: %s", e)
 
     async def handle_react_to_contact(self, payload):

cogs/modmail.py

@@ -1654,46 +1654,10 @@ async def blocked(self, ctx):
         blocked_users = list(self.bot.blocked_users.items())
         for id_, reason in blocked_users:
             # parse "reason" and check if block is expired
-            # etc "blah blah blah... until <t:XX:f>."
-            end_time = re.search(r"until <t:(\d+):(?:R|f)>.$", reason)
-            attempts = [
-                # backwards compat
-                re.search(r"until ([^`]+?)\.$", reason),
-                re.search(r"%([^%]+?)%", reason),
-            ]
-            if end_time is None:
-                for i in attempts:
-                    if i is not None:
-                        end_time = i
-                        break
-
-                if end_time is not None:
-                    # found a deprecated version
-                    try:
-                        after = (
-                            datetime.fromisoformat(end_time.group(1)).replace(tzinfo=timezone.utc) - now
-                        ).total_seconds()
-                    except ValueError:
-                        logger.warning(
-                            r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
-                            id_,
-                        )
-                        continue
-                    logger.warning(
-                        r"Deprecated time message for user %s, block and unblock again to update.",
-                        id_,
-                    )
-            else:
-                try:
-                    after = (
-                        datetime.fromtimestamp(int(end_time.group(1))).replace(tzinfo=timezone.utc) - now
-                    ).total_seconds()
-                except ValueError:
-                    logger.warning(
-                        r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
-                        id_,
-                    )
-                    continue
+            try:
+                end_time, after = extract_block_timestamp(reason, id_)
+            except ValueError:
+                continue
 
             if end_time is not None:
                 if after <= 0:
@@ -1713,15 +1677,10 @@ async def blocked(self, ctx):
         for id_, reason in blocked_roles:
             # parse "reason" and check if block is expired
             # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
-            end_time = re.search(r"until ([^`]+?)\.$", reason)
-            if end_time is None:
-                # backwards compat
-                end_time = re.search(r"%([^%]+?)%", reason)
-                if end_time is not None:
-                    logger.warning(
-                        r"Deprecated time message for role %s, block and unblock again to update.",
-                        id_,
-                    )
+            try:
+                end_time, after = extract_block_timestamp(reason, id_)
+            except ValueError:
+                continue
 
             if end_time is not None:
                 after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()

core/thread.py

@@ -22,7 +22,6 @@
 from core.time import human_timedelta
 from core.utils import (
     is_image_url,
-    days,
     parse_channel_topic,
     match_title,
     match_user_id,

core/time.py

@@ -63,7 +63,7 @@ def __init__(self, argument: str, *, now: Optional[datetime.datetime] = None):
         if match is None or not match.group(0):
             match = self.discord_fmt.fullmatch(argument)
             if match is not None:
-                self.dt = datetime.datetime.fromtimestamp(int(match.group("ts")), tz=datetime.timezone.utc)
+                self.dt = datetime.datetime.utcfromtimestamp(int(match.group("ts")), tz=datetime.timezone.utc)
                 return
             else:
                 raise commands.BadArgument("invalid time provided")
@@ -209,7 +209,7 @@ async def convert(self, ctx: Context, argument: str) -> FriendlyTimeResult:
             match = ShortTime.discord_fmt.match(argument)
             if match is not None:
                 result = FriendlyTimeResult(
-                    datetime.datetime.fromtimestamp(int(match.group("ts")), now, tz=datetime.timezone.utc)
+                    datetime.datetime.utcfromtimestamp(int(match.group("ts")), now, tz=datetime.timezone.utc)
                 )
                 remaining = argument[match.end() :].strip()
                 await result.ensure_constraints(ctx, self, now, remaining)

core/utils.py

@@ -2,6 +2,7 @@
 import functools
 import re
 import typing
+from datetime import datetime, timezone
 from difflib import get_close_matches
 from distutils.util import strtobool as _stb  # pylint: disable=import-error
 from itertools import takewhile, zip_longest
@@ -10,6 +11,9 @@
 import discord
 from discord.ext import commands
 
+from core.models import getLogger
+
+
 __all__ = [
     "strtobool",
     "User",
@@ -34,9 +38,13 @@
     "tryint",
     "get_top_role",
     "get_joint_id",
+    "extract_block_timestamp",
 ]
 
 
+logger = getLogger(__name__)
+
+
 def strtobool(val):
     if isinstance(val, bool):
         return val
@@ -504,3 +512,50 @@ def get_joint_id(message: discord.Message) -> typing.Optional[int]:
         except ValueError:
             pass
     return None
+
+
+def extract_block_timestamp(reason, id_):
+    # etc "blah blah blah... until <t:XX:f>."
+    now = discord.utils.utcnow()
+    end_time = re.search(r"until <t:(\d+):(?:R|f)>.$", reason)
+    attempts = [
+        # backwards compat
+        re.search(r"until ([^`]+?)\.$", reason),
+        re.search(r"%([^%]+?)%", reason),
+    ]
+    after = None
+    if end_time is None:
+        for i in attempts:
+            if i is not None:
+                end_time = i
+                break
+
+        if end_time is not None:
+            # found a deprecated version
+            try:
+                after = (
+                    datetime.fromisoformat(end_time.group(1)).replace(tzinfo=timezone.utc) - now
+                ).total_seconds()
+            except ValueError:
+                logger.warning(
+                    r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
+                    id_,
+                )
+                raise
+            logger.warning(
+                r"Deprecated time message for user %s, block and unblock again to update.",
+                id_,
+            )
+    else:
+        try:
+            after = (
+                datetime.utcfromtimestamp(int(end_time.group(1))).replace(tzinfo=timezone.utc) - now
+            ).total_seconds()
+        except ValueError:
+            logger.warning(
+                r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
+                id_,
+            )
+            raise
+
+    return end_time, after