[dpy2] (#9)

* add DPY2 constants and update asset access

* remove MemberAdapter typing test

* [dpy2] update discord adapters with some missing info fixes

* [discordadapters] make guild.icon return empty if no icon set

* [utils] fix dpy2 check + maybe_await typing

* update version

Author: phenom4n4n

TagScriptEngine/__init__.py

@@ -8,7 +8,7 @@
 from .utils import *
 from .verb import Verb
 
-__version__ = "2.6.5"
+__version__ = "2.6.4"
 
 
 class VersionInfo(namedtuple("VersionInfo", "major minor micro")):

TagScriptEngine/adapter/discordadapters.py

@@ -1,9 +1,9 @@
 from random import choice
 
-from discord import TextChannel
+import discord
 
 from ..interface import Adapter
-from ..utils import escape_content
+from ..utils import DPY2, escape_content
 from ..verb import Verb
 
 __all__ = (
@@ -19,10 +19,11 @@ class AttributeAdapter(Adapter):
 
     def __init__(self, base):
         self.object = base
+        created_at = getattr(base, "created_at", None) or discord.utils.snowflake_time(base.id)
         self._attributes = {
             "id": base.id,
-            "created_at": base.created_at,
-            "timestamp": int(base.created_at.timestamp()),
+            "created_at": created_at,
+            "timestamp": int(created_at.timestamp()),
             "name": getattr(base, "name", str(base)),
         }
         self._methods = {}
@@ -107,18 +108,19 @@ class MemberAdapter(AttributeAdapter):
     """
 
     def update_attributes(self):
+        avatar_url = self.object.display_avatar.url if DPY2 else self.object.avatar_url
         joined_at = getattr(self.object, "joined_at", self.object.created_at)
         additional_attributes = {
             "color": self.object.color,
             "colour": self.object.color,
             "nick": self.object.display_name,
-            "avatar": (self.object.avatar_url, False),
+            "avatar": (avatar_url, False),
             "discriminator": self.object.discriminator,
             "joined_at": joined_at,
             "joinstamp": int(joined_at.timestamp()),
             "mention": self.object.mention,
             "bot": self.object.bot,
-            "top_role": getattr(self.object, "top_role", None),
+            "top_role": getattr(self.object, "top_role", ""),
         }
         if roleids := getattr(self.object, "_roles", None):
             additional_attributes["roleids"] = " ".join(str(r) for r in roleids)
@@ -156,11 +158,11 @@ class ChannelAdapter(AttributeAdapter):
     """
 
     def update_attributes(self):
-        if isinstance(self.object, TextChannel):
+        if isinstance(self.object, discord.TextChannel):
             additional_attributes = {
                 "nsfw": self.object.nsfw,
                 "mention": self.object.mention,
-                "topic": self.object.topic or None,
+                "topic": self.object.topic or "",
             }
             self._attributes.update(additional_attributes)
 
@@ -213,8 +215,9 @@ def update_attributes(self):
             else:
                 humans += 1
         member_count = guild.member_count
+        icon_url = getattr(guild.icon, "url", "") if DPY2 else guild.icon_url
         additional_attributes = {
-            "icon": (guild.icon_url, False),
+            "icon": (icon_url, False),
             "member_count": member_count,
             "members": member_count,
             "bots": bots,

TagScriptEngine/utils.py

@@ -1,14 +1,20 @@
 import re
 from inspect import isawaitable
-from typing import Any, Awaitable, Callable, Union
+from typing import Any, Awaitable, Callable, T, TypeVar, Union
 
-__all__ = ("escape_content", "maybe_await")
+import discord
+
+__all__ = ("escape_content", "maybe_await", "DPY2")
+
+T = TypeVar("T")
+
+DPY2 = discord.version_info >= (2, 0, 0, "alpha", 0)
 
 pattern = re.compile(r"(?<!\\)([{():|}])")
 
 
 def _sub_match(match: re.Match) -> str:
-    return "\\" + match.group(1)
+    return "\\" + match[1]
 
 
 def escape_content(string: str) -> str:
@@ -25,7 +31,7 @@ def escape_content(string: str) -> str:
     return pattern.sub(_sub_match, string)
 
 
-async def maybe_await(func: Union[Callable[..., Any], Awaitable[Any]], *args, **kwargs) -> Any:
+async def maybe_await(func: Callable[..., Union[T, Awaitable[T]]], *args: Any, **kwargs: Any) -> T:
     """
     Await the given function if it is awaitable or call it synchronously.
 

requirements.txt

@@ -1,5 +1,5 @@
 autoflake
 black
-discord.py==1.7.3
+discord.py==2.2.3
 isort
 pyparsing

setup.cfg

@@ -21,7 +21,7 @@ keywords = tagscript,
 [options]
 packages = find_namespace:
 install_requires =
-    discord.py==1.7.3
+    discord.py==2.2.3
     pyparsing
 python_requires = >=3.8