Merge branch 'master' into v4.1.x

Author: davidhozic

docs/source/changelog.rst

@@ -46,12 +46,15 @@ Releases
 
 - Added optional case-sensitive matching to :class:`daf.logic.contains` and :class:`daf.logic.regex`. The default
   is still case-insensitive.
+- For word matching, the :class:`daf.logic.contains` now accepts multiple words inside seperated by a space.
 - Added ``constraints`` parameter to :class:`daf.message.TextMESSAGE`. See :ref:`Message constraints` for more
   information.
 - Fixed SQL log removal through the GUI.
 - Fixed CSV and JSON reading through remote.
 - Fixed exception when GUI tried to print a message.
 - Fixed invite ``invite_track`` attribute error in :class:`daf.guild.AutoGUILD`.
+- Fixed properties not being refreshed when pressing the ``Refresh`` button inside the GUI (``Live view`` tab).
+- Fixed update failure when using :class:`daf.guild.AutoGUILD` (cache was not invalidated).
 - |BREAK_CH| Disabled the :ref:`Automatic guild discovery and join` features due to the search provider shutting down its
   services. It will be reenabled in a future version.
 

src/daf/__init__.py

@@ -22,7 +22,7 @@
 import warnings
 
 
-VERSION = "4.1.0rc2"
+VERSION = "4.1.0rc3"
 
 
 if sys.version_info.minor == 12 and sys.version_info.major == 3:

src/daf/core.py

@@ -198,12 +198,7 @@ async def schema_load_from_file() -> None:
     trace("Updating accounts.", TraceLEVELS.DEBUG)
     for account in accounts:
         try:
-            await account.update()  # Refresh without __init__ call
-            for guild in account.servers:
-                guild.update()
-                for message in guild.messages:
-                    message.update()
-
+            await account.update()
             account._event_ctrl.start()
         except Exception as exc:
             trace(

src/daf/guild/autoguild.py

@@ -565,6 +565,7 @@ async def _close(self):
         """
         Closes any lower-level async objects.
         """
+        self._cache.clear()
         if self._event_ctrl is None:  # Not initialized or already closed
             return
 
@@ -591,5 +592,3 @@ async def _close(self):
 
         for guild in self._cache:
             await guild._close()
-        
-        self._cache.clear()

src/daf/guild/guilduser.py

@@ -602,13 +602,13 @@ async def _on_invite_delete(self, invite: discord.Invite):
                 TraceLEVELS.DEBUG
             )
 
-    def _close(self):
+    async def _close(self):
         if self._event_ctrl is None:  # Already closed
             return
 
         self._event_ctrl.remove_listener(EventID.discord_member_join, self._on_member_join)
         self._event_ctrl.remove_listener(EventID.discord_invite_delete, self._on_invite_delete)
-        return super()._close()
+        return await super()._close()
 
 
 @instance_track.track_id

src/daf/logic.py

@@ -128,7 +128,7 @@ def check(self, input: str):
         if not self.case_sensitive:
             input = input.lower()
 
-        return self.keyword in re.findall(r'\w+', input)  # \w+ == match all words, including **bold**
+        return set(self.keyword.split(' ')).issubset(set(re.findall(r'\w+', input)))  # \w+ == match all words, including **bold**
 
 
 @doc_category("Text matching (logic)")

src/daf_gui/tod_extensions/live_objects.py

@@ -25,5 +25,5 @@ def load_extension_oi_to_object(self, result_object_info: ObjectInfo, **kwargs):
 
 def load_extension_oi_load(self, old_data: ObjectInfo, *args, **kwargs):
     if self.old_gui_data is not None:  # Preserve the old reference, even if reloading data
-        old_data.real_object = self.old_gui_data.real_object
-        old_data.property_map = self.old_gui_data.property_map
+        self.old_gui_data.real_object = old_data.real_object
+        self.old_gui_data.property_map = old_data.property_map

testing/test_period_dynamic.py

@@ -75,7 +75,7 @@ async def dynamic_getter_async(items: list):
     # Test TextMESSAGE
 
     assert len(guild.parent.servers) == 2
-    await asyncio.sleep(5)
+    await asyncio.sleep(10)
     text_message = daf.message.TextMESSAGE(None, TEST_SEND_PERIOD_TEXT, TEXT_MESSAGE_TEST_MESSAGE, [text_channels[0]],
                                         "send", start_in=TEST_SEND_PERIOD_TEXT, remove_after=None)
     await guild.add_message(text_message)
@@ -93,7 +93,7 @@ async def dynamic_getter_async(items: list):
             assert item.to_dict() in embeds, "TextMESSAGE embed not in message embeds"
 
     await guild.remove_message(text_message)
-    await asyncio.sleep(5)
+    await asyncio.sleep(10)
     # Test DirectMESSAGE
     direct_message = daf.message.DirectMESSAGE(None, TEST_SEND_PERIOD_TEXT, DIRECT_MESSAGE_TEST_MESSAGE, "send",
                                                 start_in=TEST_SEND_PERIOD_TEXT, remove_after=None)