2.10.1 bug fixes

Author: davidhozic

docs/source/changelog.rst

@@ -5,6 +5,8 @@ Changelog
 
 .. |POTENT_BREAK_CH| replace:: **[Potentially breaking change]**
 
+.. |UNRELEASED| replace:: **[Not yet released]**
+
 ------------------------
 Info
 ------------------------
@@ -28,9 +30,23 @@ Glossary
         The change could break functionality from previous versions but only if it
         was used in a certain way.
 
-----------------------
+    |UNRELEASED|
+        Documented changes are not yet available to use.
+
+---------------------
 Releases
-----------------------
+---------------------
+
+|UNRELEASED| v2.10.1
+=======================
+- Fixed files in DirectMESSAGE.
+- Fixed file paths over remote not having the full patch when returned back.
+- Fixed files not having full path in the logs.
+- Added :py:attr:`daf.dtypes.FILE.fullpath` to support the previous fix.
+- Fixed exception when adding messages inside AutoGUILD, when one of the cached guilds fails initialization.
+- Fixed serialization for :class:`discord.VoiceChannel`, which included slowmode_delay,
+  even though the attribute doesn't exist in the VoiceChannel.
+
 
 v2.10
 ====================

src/daf/convert.py

@@ -127,6 +127,12 @@ def import_class(path: str):
     },
     discord.Guild: {
         "attrs": ["name", "id"]
+    },
+    discord.TextChannel: {
+        "attrs": ["name", "id", "slowmode_delay"],
+    },
+    discord.VoiceChannel: {
+        "attrs": ["name", "id"],
     }
 }
 """
@@ -155,12 +161,6 @@ def import_class(path: str):
 - "custom_decoder": A function that accepts the JSON compatible object. It must return the original Python object.
 """
 
-
-for cls in {discord.TextChannel, discord.VoiceChannel}:
-    attrs = {"attrs": ["name", "id", "slowmode_delay"]}
-    CONVERSION_ATTRS[cls] = attrs
-
-
 # Guilds
 CONVERSION_ATTRS[guild.GUILD] = {
     "attrs": attributes.get_all_slots(guild.GUILD),

src/daf/dtypes.py

@@ -3,6 +3,7 @@
     you can send using the xxxMESSAGE objects.
 """
 from typing import Any, Callable, Coroutine, Union, Optional
+from os.path import basename
 from typeguard import typechecked
 import importlib.util as iu
 import io
@@ -163,7 +164,7 @@ class FILE:
     ValueError
         The ``data`` parameter is of incorrect format.
     """
-    __slots__ = ("_filename", "_data")
+    __slots__ = ("_filename", "_basename", "_data")
 
     def __init__(self, filename: str, data: Optional[Union[bytes, str]] = None):
         if data is None:
@@ -174,9 +175,10 @@ def __init__(self, filename: str, data: Optional[Union[bytes, str]] = None):
             data = bytes.fromhex(data)
 
         self._filename = filename
+        self._basename = basename(filename)
         self._data = data
 
-    def __str__(self) -> str:
+    def __repr__(self) -> str:
         return f"FILE(filename={self._filename})"
 
     @property
@@ -187,6 +189,11 @@ def stream(self) -> io.BytesIO:
     @property
     def filename(self) -> str:
         "The name of the file"
+        return self._basename
+    
+    @property
+    def fullpath(self) -> str:
+        "The full path to the file"
         return self._filename
 
     @property
@@ -207,7 +214,7 @@ def to_dict(self):
         """
         return {
             "type:": "File",
-            "filename": self._filename
+            "filename": self.fullpath
         }
 
 

src/daf/guild.py

@@ -3,6 +3,7 @@
     regarding the guild and also defines a USER class from the
     _BaseGUILD class.
 """
+from contextlib import suppress
 from typing import Any, Coroutine, Union, List, Optional, Dict, Callable
 from typeguard import typechecked
 from datetime import timedelta, datetime
@@ -975,7 +976,10 @@ async def add_message(self, message: Union[TextMESSAGE, VoiceMESSAGE]):
         """
         self.messages.append(message)
         for guild in self.cache.values():
-            await guild.add_message(deepcopy(message))
+            try:
+                await guild.add_message(deepcopy(message))
+            except Exception:
+                trace(f"Could not add message {message} to {guild}, cached in {self}", TraceLEVELS.WARNING)
 
     def remove_message(self, message: BaseMESSAGE):
         """
@@ -993,7 +997,8 @@ def remove_message(self, message: BaseMESSAGE):
         """
         self.messages.remove(message)
         for guild in self.guilds:
-            guild.remove_message(message)
+            with suppress(ValueError):  # Guilds can remove messages themselves
+                guild.remove_message(message)
 
     def _get_server(self, snowflake: Union[int, discord.Guild, discord.User, discord.Object]):
         """

src/daf/message/text_based.py

@@ -244,7 +244,7 @@ def generate_log_context(self,
 
         embed = embed.to_dict() if embed is not None else None
 
-        files = [x.filename for x in files]
+        files = [x.fullpath for x in files]
         sent_data_context = {}
         if text is not None:
             sent_data_context["text"] = text
@@ -631,7 +631,7 @@ def generate_log_context(self,
                 }
         """
         embed = embed.to_dict() if embed is not None else None
-        files = [x.filename for x in files]
+        files = [x.fullpath for x in files]
 
         success_context = success_context.copy()  # Don't modify outside
         if not success_context["success"]:
@@ -759,12 +759,13 @@ async def _send_channel(self,
                     self.previous_message = await self.dm_channel.send(
                         text,
                         embed=embed,
-                        files=[discord.File(fwFILE.filename) for fwFILE in files]
+                        files=[discord.File(fwFILE.stream, fwFILE.filename) for fwFILE in files]
                     )
 
                 # Mode is edit and message was already send to this channel
                 elif self.mode == "edit":
                     await self.previous_message.edit(text, embed=embed)
+
                 return {"success": True}
 
             except Exception as ex:

src/daf/message/voice_based.py

@@ -194,7 +194,7 @@ def generate_log_context(self,
                      "reason": str(entry["reason"])} for entry in failed_ch]
         return {
             "sent_data": {
-                "streamed_audio": audio.to_dict()
+                "streamed_audio": audio.fullpath
             },
             "channels": {
                 "successful": succeeded_ch,

src/daf_gui/convert.py

@@ -110,6 +110,7 @@ def issubclass_noexcept(*args):
 
 CONVERSION_ATTR_TO_PARAM[daf.dtypes.FILE] = {k: k for k in daf.dtypes.FILE.__init__.__annotations__}
 CONVERSION_ATTR_TO_PARAM[daf.dtypes.FILE]["data"] = "hex"
+CONVERSION_ATTR_TO_PARAM[daf.dtypes.FILE]["filename"] = "fullpath"
 
 
 if daf.sql.SQL_INSTALLED: