Merge pull request #278 from davidhozic/develop

Release 2.5 Prep

Author: davidhozic

.flake8

@@ -0,0 +1,12 @@
+[flake8]
+min_python_version = 3.10
+
+exclude = src/_discord
+
+ignore = 
+    F403
+    F405
+    W504
+
+max-line-length = 120
+max-complexity=40

.github/workflows/docs.yml

@@ -22,15 +22,13 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
-          python-version: '3.8' 
+          python-version: '3.10' 
     - name: Install requirements
       run: |
-        pip install .[docs]
-        pip install .[all]
-    - name: Install latex
-      run: sudo apt-get update && sudo apt-get install texlive texlive-publishers texlive-science latexmk cm-super
-    - name: Install inkscape
-      run: sudo apt-get install inkscape -y
-    - name: Build html, latex, pdf
-      run: cd docs && make html && make latexpdf
-      
+        sh install.sh
+    - name: Build html and pdf
+      run: |
+        . venv/bin/activate
+        cd docs && make html && make pdf
+
+

.github/workflows/python-tests.yml

@@ -14,7 +14,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.10", "3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -35,13 +35,13 @@ jobs:
     - name: Test version compatibility
       env:
         DISCORD_TOKEN: ${{secrets.DATT}}
-      if: ${{ matrix.python-version != 3.8 }}
+      if: ${{ matrix.python-version != 3.10 }}
       run: |
         pytest -v testing/test_period_dynamic.py  
     - name: Test all
       env:
         DISCORD_TOKEN: ${{secrets.DATT}}
-      if: ${{ matrix.python-version == 3.8 }}
+      if: ${{ matrix.python-version == 3.10 }}
       run: |
         pytest -v
       

.gitignore

@@ -1,9 +1,19 @@
 **/__pycache__/**
-settings.json
 dist/**
 build**
-**.egg-info
-src/test.py
-venv/**
-docs/source/ref.rst
-docs/source/reference/
+**egg-info**
+
+.vscode
+.idea
+
+docs/build
+docs/source/reference/
+
+docs/thesis/thesis_lit.rst
+docs/thesis/reference/
+
+docs/common/reference
+**/DEP/**
+
+daf_web_data
+test.py

.readthedocs.yml

@@ -1,15 +1,19 @@
 version: 2
-formats: []
+formats: [
+  "pdf"
+]
 
 sphinx:
   configuration: docs/source/conf.py
   fail_on_warning: false
 
 build:
   os: ubuntu-22.04
+  apt_packages:
+    - inkscape
   tools:
-    python: "3.8"
+    python: "3.10"
   jobs:
     pre_build:
       - pip install .[all] .[docs]
-      - python3 ./docs/scripts/generate_autodoc.py
+      - python3 ./docs/setup.py

Examples/Web/main_web.py

@@ -0,0 +1,30 @@
+"""
+This example shows how the user can use username and password to login into Discord and
+it also shows how to configure the automatic guild discovery and join feature (auto_join parameter)
+"""
+
+from daf import QuerySortBy, QueryMembers
+import daf
+
+accounts = [
+    daf.ACCOUNT(
+        username="[email protected]",
+        password="Password6745;*",
+        servers=[
+            daf.AutoGUILD(
+                include_pattern=".*",
+                auto_join=daf.GuildDISCOVERY(prompt="NFT arts",
+                                             sort_by=QuerySortBy.TOP,
+                                             total_members=QueryMembers.ALL,
+                                             limit=20),
+            ),
+        ],
+        proxy="protocol://ip:port"
+    )
+]
+
+
+daf.run(
+    accounts=accounts,
+    debug=daf.TraceLEVELS.NORMAL
+)

LICENSE.md

@@ -1,4 +1,5 @@
-**Discord Advertisement Framework Licence:**<br>
+**DAF License**
+
 MIT License
 
 Copyright (c) 2022 David Hozic
@@ -20,14 +21,19 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-***
+
+<br><br><br>
+
+**PyCord (API Wrapper) License:**
+
+*Concerns only src/_discord/ folder*
+<br>
 <br>
 
-**PyCord Licence:**<br>
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 Rapptz <br>
-Copyright (c) 2021-present Pycord Development<br>
+Copyright (c) 2015-2021 Rapptz
+Copyright (c) 2021-present Pycord Development
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -46,3 +52,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
+

Patches/1_client.patch

@@ -1,25 +1,7 @@
 diff --git a/src/_discord/client.py b/src/_discord/client.py
-index e6fa165..9c681a5 100644
+index 0be4855..08c6469 100644
 --- a/src/_discord/client.py
 +++ b/src/_discord/client.py
-@@ -30,7 +30,7 @@ import logging
- import signal
- import sys
- import traceback
--from typing import TYPE_CHECKING, Any, Callable, Coroutine, Generator, Sequence, TypeVar
-+from typing import TYPE_CHECKING, Any, Callable, Coroutine, Generator, Optional, Sequence, TypeVar
- 
- import aiohttp
- 
-@@ -109,7 +109,7 @@ def _cleanup_loop(loop: asyncio.AbstractEventLoop) -> None:
-         loop.run_until_complete(loop.shutdown_asyncgens())
-     finally:
-         _log.info("Closing the event loop.")
--        loop.close()
-+        loop.call_soon(loop.close)
- 
- 
- class Client:
 @@ -482,7 +482,7 @@ class Client:
 
      # login state management
@@ -29,16 +11,7 @@ index e6fa165..9c681a5 100644
          """|coro|
 
          Logs in the client with the specified credentials.
-@@ -492,6 +492,8 @@ class Client:
-         token: :class:`str`
-             The authentication token. Do not prefix this token with
-             anything as the library will do it for you.
-+        bot: bool
-+            Is the token from a bot account.
- 
-         Raises
-         ------
-@@ -511,7 +513,7 @@ class Client:
+@@ -511,7 +511,7 @@ class Client:
 
          _log.info("logging in using static token")
 
@@ -47,16 +20,16 @@ index e6fa165..9c681a5 100644
          self._connection.user = ClientUser(state=self._connection, data=data)
 
      async def connect(self, *, reconnect: bool = True) -> None:
-@@ -646,7 +648,7 @@ class Client:
+@@ -645,7 +645,7 @@ class Client:
          self._connection.clear()
          self.http.recreate()
 
 -    async def start(self, token: str, *, reconnect: bool = True) -> None:
-+    async def start(self, token: str, *, reconnect: bool = True, bot: Optional[bool] = True) -> None:
++    async def start(self, token: str, *, reconnect: bool = True, bot: bool = True) -> None:
          """|coro|
 
          A shorthand coroutine for :meth:`login` + :meth:`connect`.
-@@ -656,7 +658,7 @@ class Client:
+@@ -655,7 +655,7 @@ class Client:
          TypeError
              An unexpected keyword argument was received.
          """