Merge pull request #243 from davidhozic/bug/autoobjects

Bug fixes

Author: davidhozic

src/daf/message/base.py

@@ -10,12 +10,15 @@
 from ..logging.tracing import *
 from ..timing import *
 from .. import misc
+from .. import client
 
 import random
 import re
+import copy
 import asyncio
 import _discord as discord
 
+
 __all__ = (
     "BaseMESSAGE",
     "AutoCHANNEL",
@@ -151,6 +154,20 @@ def __eq__(self, o: object) -> bool:
 
         raise TypeError(f"Comparison of {type(self)} not allowed with {type(o)}")
 
+    def __deepcopy__(self, *args):
+        "Duplicates the object (for use in AutoGUILD)"
+        new = copy.copy(self)
+        for slot in list(self.__slots__) + list(BaseMESSAGE.__slots__):
+            self_val = getattr(self, slot)
+            if isinstance(self_val, (asyncio.Semaphore, asyncio.Lock)):
+                # Hack to copy semaphores since not all of it can be copied directly
+                copied = type(self_val)(self_val._value)
+            else:
+                copied = copy.deepcopy((self_val))
+
+            setattr(new, slot, copied)
+
+        return new
 
     @property
     def created_at(self) -> datetime:
@@ -408,10 +425,18 @@ def _process(self):
         stamp = datetime.now().timestamp()
         if stamp - self.last_scan > self.interval:
             self.last_scan = stamp
-            for channel in getattr(self.parent.parent.apiobject, self.channel_getter):
+            guild: discord.Guild = self.parent.parent.apiobject
+            client_: discord.Client = client.get_client()
+            member = guild.get_member(client_.user.id)
+            if member is None:
+                return
+
+            for channel in getattr(guild, self.channel_getter):
                 if channel not in self.cache:
+                    perms = channel.permissions_for(member)
                     name = channel.name
-                    if (re.search(self.include_pattern, name) is not None and
+                    if ((perms.send_messages or (perms.connect and perms.stream and perms.speak)) and
+                        re.search(self.include_pattern, name) is not None and
                         (self.exclude_pattern is None or re.search(self.exclude_pattern, name) is None)
                     ):
                         self.cache.add(channel)

src/daf/message/text_based.py

@@ -233,6 +233,8 @@ def generate_log_context(self,
                     mode: str - The mode used to send the message (send, edit, clear-send)
                 }
         """
+        if not (len(succeeded_ch) + len(failed_ch)):
+            return None
 
         succeeded_ch = [{"name": str(channel), "id" : channel.id} for channel in succeeded_ch]
         failed_ch = [{"name": str(entry["channel"]), "id" : entry["channel"].id,

src/daf/message/voice_based.py

@@ -96,11 +96,9 @@ class VoiceMESSAGE(BaseMESSAGE):
     """
 
     __slots__ = (
-        "randomized_time",
         "period",
         "start_period",
         "end_period",
-        "data",
         "volume",
         "channels",
     )
@@ -190,6 +188,8 @@ def generate_log_context(self,
                     type: str - The type of the message, this is always VoiceMESSAGE.
               }
         """
+        if not (len(succeeded_ch) + len(failed_ch)):
+            return None
 
         succeeded_ch = [{"name": str(channel), "id" : channel.id} for channel in succeeded_ch]
         failed_ch = [{"name": str(entry["channel"]), "id" : entry["channel"].id,
@@ -347,6 +347,7 @@ async def _send(self) -> Union[dict, None]:
                     errored_channels.append({"channel":channel, "reason": context["reason"]})
 
             self._update_state(errored_channels)
+            
             return self.generate_log_context(**_data_to_send, succeeded_ch=succeeded_channels, failed_ch=errored_channels)
 
         return None