Merge pull request #463 from davidhozic/develop

v3.0.x

Author: davidhozic

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/python-publish.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Python
       uses: actions/setup-python@v4

.github/workflows/python-tests.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         python-version: ["3.8", "3.11"]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

Patches/2_http.patch

@@ -1,5 +1,5 @@
 diff --git a/src/_discord/http.py b/src/_discord/http.py
-index 79455a0..4c16c2b 100644
+index 9eb7837..9ad7137 100644
 --- a/src/_discord/http.py
 +++ b/src/_discord/http.py
 @@ -25,6 +25,8 @@ DEALINGS IN THE SOFTWARE.
@@ -11,7 +11,7 @@ index 79455a0..4c16c2b 100644
  import asyncio
  import logging
  import sys
-@@ -100,6 +102,22 @@ async def json_or_text(response: aiohttp.ClientResponse) -> dict[str, Any] | str
+@@ -101,6 +103,22 @@ async def json_or_text(response: aiohttp.ClientResponse) -> dict[str, Any] | str
      return text
 
 
@@ -34,7 +34,7 @@ index 79455a0..4c16c2b 100644
  class Route:
      def __init__(self, method: str, path: str, **parameters: Any) -> None:
          self.path: str = path
-@@ -166,7 +184,7 @@ class HTTPClient:
+@@ -167,7 +185,7 @@ class HTTPClient:
          proxy: str | None = None,
          proxy_auth: aiohttp.BasicAuth | None = None,
          loop: asyncio.AbstractEventLoop | None = None,
@@ -43,7 +43,7 @@ index 79455a0..4c16c2b 100644
      ) -> None:
          self.loop: asyncio.AbstractEventLoop = (
              asyncio.get_event_loop() if loop is None else loop
-@@ -177,7 +195,7 @@ class HTTPClient:
+@@ -178,7 +196,7 @@ class HTTPClient:
          self._global_over: asyncio.Event = asyncio.Event()
          self._global_over.set()
          self.token: str | None = None
@@ -52,15 +52,15 @@ index 79455a0..4c16c2b 100644
          self.proxy: str | None = proxy
          self.proxy_auth: aiohttp.BasicAuth | None = proxy_auth
          self.use_clock: bool = not unsync_clock
-@@ -188,6 +206,7 @@ class HTTPClient:
+@@ -189,6 +207,7 @@ class HTTPClient:
          self.user_agent: str = user_agent.format(
              __version__, sys.version_info, aiohttp.__version__
          )
 +        self.user_limit = UserLimit(self.loop)
 
      def recreate(self) -> None:
          if self.__session.closed:
-@@ -234,8 +253,23 @@ class HTTPClient:
+@@ -235,8 +254,23 @@ class HTTPClient:
              "User-Agent": self.user_agent,
          }
 
@@ -85,7 +85,7 @@ index 79455a0..4c16c2b 100644
          # some checking if it's a JSON request
          if "json" in kwargs:
              headers["Content-Type"] = "application/json"
-@@ -279,6 +313,11 @@ class HTTPClient:
+@@ -280,6 +314,11 @@ class HTTPClient:
                      kwargs["data"] = form_data
 
                  try:
@@ -97,16 +97,25 @@ index 79455a0..4c16c2b 100644
                      async with self.__session.request(
                          method, url, **kwargs
                      ) as response:
-@@ -316,7 +355,7 @@ class HTTPClient:
+@@ -319,7 +358,8 @@ class HTTPClient:
 
                          # we are being rate limited
                          if response.status == 429:
 -                            if not response.headers.get("Via") or isinstance(data, str):
-+                            if not response.headers.get("Via") or isinstance(data, str) or ("code" in data and data["code"] == 20016):
++                            retry_after: float = data.get("retry_after", 0)
++                            if not response.headers.get("Via") or isinstance(data, str) or ("code" in data and data["code"] == 20016) or retry_after > 30:
                                  # Banned by Cloudflare more than likely.
                                  raise HTTPException(response, data)
 
-@@ -401,22 +440,28 @@ class HTTPClient:
+@@ -329,7 +369,6 @@ class HTTPClient:
+                             )
+ 
+                             # sleep a bit
+-                            retry_after: float = data["retry_after"]
+                             _log.warning(fmt, retry_after, bucket)
+ 
+                             # check if it's a global rate limit
+@@ -406,22 +445,28 @@ class HTTPClient:
 
      # login management
 

Patches/3_gateway.patch

@@ -1,24 +1,24 @@
 diff --git a/src/_discord/gateway.py b/src/_discord/gateway.py
-index e3e7d1b..e847fc6 100644
+index bd13f22..0040f3a 100644
 --- a/src/_discord/gateway.py
 +++ b/src/_discord/gateway.py
-@@ -302,6 +302,7 @@ class DiscordWebSocket:
+@@ -304,6 +304,7 @@ class DiscordWebSocket:
          self._buffer = bytearray()
          self._close_code = None
          self._rate_limiter = GatewayRatelimiter()
 +        self.bot: bool = True
 
      @property
      def open(self):
-@@ -338,6 +339,7 @@ class DiscordWebSocket:
+@@ -340,6 +341,7 @@ class DiscordWebSocket:
 
          # dynamically add attributes needed
          ws.token = client.http.token
 +        ws.bot = client.http.bot_token
          ws._connection = client._connection
          ws._discord_parsers = client._connection.parsers
          ws._dispatch = client.dispatch
-@@ -398,23 +400,41 @@ class DiscordWebSocket:
+@@ -400,23 +402,40 @@ class DiscordWebSocket:
 
      async def identify(self):
          """Sends the IDENTIFY packet."""
@@ -68,7 +68,6 @@ index e3e7d1b..e847fc6 100644
 +                        "browser_user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
 +                        "browser_version":"109.0.0.0",
 +                    },
-+                    "presence": {"status":"online","since":0,"activities":[],"afk": False},
 +                    "compress": True
 +                }
 +            }

Patches/6_embeds.patch

@@ -1,29 +1,22 @@
 diff --git a/src/_discord/embeds.py b/src/_discord/embeds.py
-index 39dc855..83c986b 100644
+index 44d51e8..7633330 100644
 --- a/src/_discord/embeds.py
 +++ b/src/_discord/embeds.py
-@@ -28,6 +28,8 @@ from __future__ import annotations
+@@ -28,6 +28,9 @@ from __future__ import annotations
  import datetime
- from typing import TYPE_CHECKING, Any, Final, Mapping, Protocol, TypeVar, Union
+ from typing import TYPE_CHECKING, Any, Mapping, TypeVar
 
 +from _discord.types.embed import EmbedType
++
 +
  from . import utils
  from .colour import Colour
 
-@@ -69,13 +71,11 @@ class EmbedProxy:
- 
- 
- E = TypeVar("E", bound="Embed")
-+T = TypeVar("T")
-+MaybeEmpty = Union[T, _EmptyEmbed]
+@@ -45,7 +48,6 @@ E = TypeVar("E", bound="Embed")
 
  if TYPE_CHECKING:
      from _discord.types.embed import Embed as EmbedData
 -    from _discord.types.embed import EmbedType
--
--    T = TypeVar("T")
--    MaybeEmpty = Union[T, _EmptyEmbed]
 
-     class _EmbedFooterProxy(Protocol):
-         text: MaybeEmpty[str]
+ 
+ class EmbedAuthor:

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,91 @@ 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
-----------------------
+---------------------
+
+v3.0.0
+====================
+- SQL analytics:
+  
+  - Counts now have better error reporting when an invalid value was passed.
+
+- GUI:
+
+  - Higher refresh rate due to threading redesign - instead of calling Tkinter's root.update inside an asyncio task,
+    the root.mainroot is called directly, while the asyncio event loop is running inside another thread.
+  - The GUI will not block the asyncio tasks (explained in previous bullet).
+  - When saving a new object definition, if the type of a parameter is literal, the value will be pre-checked inside
+    the GUI and an exception will be raised if a valid value is not given.
+  - Properties that start with ``_`` will no longer be displayed when viewing live structured objects.
+  - Toast notifications for :func:`~daf.logging.tracing.trace`.
+  - Parameter validation for literals, enums and bool.
+  - Copy / Paste globally for both drop-down menus and list menus.
+
+- Core:
+
+  - New events system and module :ref:`Event reference`  
+  - Updated PyCord API wrapper to 2.5.0 RC5
+  - New property :py:attr:`daf.client.ACCOUNT.removed_servers` for tracking removed servers.
+  - New property :py:attr:`daf.guild.GUILD.removed_messages` :py:attr:`daf.guild.USER.removed_messages`
+    for tracking removed messages.
+  - New parameter ``removal_buffer_length`` to :class:`daf.client.ACCOUNT` for setting maximum amount of
+    of servers to keep in the :py:attr:`daf.client.ACCOUNT.removed_servers` buffer.
+  - New parameter ``removal_buffer_length`` to :class:`daf.guild.GUILD` and :class:`daf.guild.USER`
+    for setting maximum amount of messages to keep in the :py:attr:`daf.guild.GUILD.removed_messages`
+    / :py:attr:`daf.guild.USER.removed_messages` buffer.
+
+  - Event loop based API - All API methods that get called now submit an event in the event loop, which causes
+    the API call to happen asynchronously unless awaited with ``await`` keyword. This also makes DAF
+    much more efficient.
+
+  - Remote:
+
+    - Persistent WebSocket connection for receiving events from the core server
+      (eg. :func:`~daf.logging.tracing.trace()` events).
+
+
+  - Removed ``remaining_before_removal`` property from all message classes.
+  - Added ``remove_after`` property to :class:`~daf.guild.GUILD`, :class:`~daf.guild.USER`,
+    :class:`~daf.message.TextMESSAGE`, :class:`~daf.message.VoiceMESSAGE` and :class:`~daf.message.DirectMESSAGE`.
+
+
+v2.10.4
+======================
+- Fixed prematurely exiting when waiting for captcha to be completed by user.
+
+
+v2.10.3
+======================
+- Fixed Chrome driver not working with newer Chrome versions (115+).
+- Fetching invite links better bypass.
+- Remove invalid presence
+- Fixed ``remaining_before_removal`` properties
+- Fixed SQL queries not working on direct messages.
+
+
+v2.10.2
+=======================
+- Fixed *Unclosed client session* warning when removing an user account.
+- Fixed documentation of :func:`daf.core.shutdown` - removed information about non existent parameters.
+- Selenium better waiting avoidance
+- Fixed ACCOUNT not being removed from the list if the update failed and the re-login after update failed.
+
+
+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
 ====================

docs/source/conf.py

@@ -30,6 +30,10 @@
 # -- General configuration ---------------------------------------------------
 root_doc = 'index'
 
+rst_prolog = """
+.. |ASYNC_API| replace:: This is an asynchronous API operation. When returning from this function, the action is not immediately executed.
+"""
+
 numfig = True
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

docs/source/scripts/generate_autodoc.py

@@ -87,6 +87,7 @@
             )
 
             for category, items in titles.items():
+                export_enum_items = "" # All enum classes string
                 export_c_items = ""  # All classes string
                 export_f_items = ""  # All functions string
                 for item, manual, path in items:
@@ -131,7 +132,7 @@
                     elif inspect.isclass(item):
                         # Fill properties
                         if isinstance(item, EnumMeta):
-                            export_c_items += AUTO_ENUM_TEMPLATE.format(object_name=object_name, object_path=object_path) + "\n"
+                            export_enum_items += AUTO_ENUM_TEMPLATE.format(object_name=object_name, object_path=object_path) + "\n"
                         else:
                             export_c_items += AUTO_CLASS_TEMPLATE.format(object_name=object_name, object_path=object_path) + "\n"
 
@@ -142,6 +143,7 @@
                     # file_name = <...>/<output>/<Program/HTTP>/<category>.rst
                     with open(file_name, "w", encoding="utf-8") as writer:
                         writer.write(CATEGORY_TEMPLATE.format(category_name=category))
+                        writer.write(export_enum_items)
                         writer.write(export_f_items)
                         writer.write(export_c_items)
 

docs/thesis/conf.py

@@ -173,12 +173,14 @@
             \newpage
         }
     ''',
-    "maketitle": r"""
-        \pagenumbering{roman}
-        \includepdf{NaslovnaStranDiplome.pdf}
-        \includepdf{IzjavaOAvtorstvu.pdf}
-        \includepdf{NaslovnaStranDiplome.pdf}
+    "maketitle": rf"""
+        \includepdf{{NaslovnaStranDiplome.pdf}}
         \blankpage
+        \includepdf{{IzjavaOAvtorstvu.pdf}}
+        \blankpage
+        {latex_title_page}
+        \blankpage
+        \pagenumbering{{roman}}
     """,
     "printindex": ''
 }