Update python-publish.yml

2.10.3

Unreleased

unused presence

Fixed sql and remaining_before_removal

Fix selenium

Author: davidhozic

.github/workflows/python-publish.yml

@@ -1,4 +1,4 @@
-name: (todo) Nuitka build and publish to PyPi
+name: Publish to PyPi
 
 on:
   workflow_dispatch:

Patches/3_gateway.patch

@@ -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
 +                }
 +            }

docs/source/changelog.rst

@@ -37,6 +37,15 @@ Glossary
 Releases
 ---------------------
 
+|UNRELEASED| 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.

requirements/web.txt

@@ -1,2 +1,3 @@
 selenium==4.11.2
 undetected-chromedriver==3.5.2
+webdriver-manager==4.0.0

src/_discord/gateway.py

@@ -433,7 +433,6 @@ async def identify(self):
                         "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
                 }
             }

src/daf/__init__.py

@@ -15,4 +15,4 @@
 from .remote import *
 
 
-VERSION = "2.10.2"
+VERSION = "2.10.3"

src/daf/logging/sql/tables.py

@@ -293,26 +293,26 @@ class MessageLOG(ORMBase):
     success_rate = column_property(
         case(
             (
-                select(MessageTYPE.name).where(MessageTYPE.id == message_type_id) != "DirectMESSAGE",
+                select(MessageTYPE.name).where(MessageTYPE.id == message_type_id).scalar_subquery() != "DirectMESSAGE",
                 100 * select(func.count()).where(MessageChannelLOG.reason.is_(None), MessageChannelLOG.log_id == id)
                 .select_from(MessageChannelLOG)
                 .scalar_subquery() /
                 select(func.count()).where(MessageChannelLOG.log_id == id).select_from(MessageChannelLOG)
-                .scalar_subquery(),
+                .scalar_subquery()
             ),
             else_=case((dm_reason.is_(None), 100), else_=0)
         )
     )
 
     def __init__(
-            self,
-            sent_data: DataHISTORY = None,
-            message_type: MessageTYPE = None,
-            message_mode: MessageMODE = None,
-            dm_reason: str = None,
-            guild: GuildUSER = None,
-            author: GuildUSER = None,
-            channels: List["MessageChannelLOG"] = None
+        self,
+        sent_data: DataHISTORY = None,
+        message_type: MessageTYPE = None,
+        message_mode: MessageMODE = None,
+        dm_reason: str = None,
+        guild: GuildUSER = None,
+        author: GuildUSER = None,
+        channels: List["MessageChannelLOG"] = None
     ):
         self.sent_data = sent_data
         self.message_type = message_type

src/daf/message/base.py

@@ -223,7 +223,11 @@ def remaining_before_removal(self) -> Any:
 
         .. versionadded:: v2.10
         """
-        raise NotImplementedError
+        r = self.remove_after
+        if isinstance(r, timedelta):
+            r = r - (datetime.now() - self._created_at)
+
+        return r
 
     @property
     def created_at(self) -> datetime:
@@ -624,9 +628,20 @@ def __init__(
         self.remove_after_by_channel = {}
 
     @property
-    def remaining_before_removal(self) -> Union[Dict[int, int], timedelta, datetime, int]:
-        # Return the counts dictionary or the original remove_after parameter if dictionary is empty
-        return self.remove_after_by_channel or self.remove_after
+    def remaining_before_removal(self) -> Union[Dict[ChannelType, int], timedelta, datetime, int]:
+        """
+        Returns
+        ------------
+        int
+            (Only if message not yet sent) Number of successful sends to each channel before removal.
+        Dict[ChannelType, int]
+            Dictionary mapping channel objects to remaining number of sends to that channel.
+        timedelta
+            Remaining ammount of time before removal.
+        datetime
+            Timestamp of removal.
+        """
+        return {self.parent.parent.client.get_channel(k): v for k, v in self.remove_after_by_channel.items()} or super().remaining_before_removal
 
     def _check_state(self) -> bool:
         return (

src/daf/message/text_based.py

@@ -573,7 +573,8 @@ def __init__(self,
 
     @property
     def remaining_before_removal(self) -> Union[timedelta, datetime, int]:
-        return self._remove_after
+        r = self._remove_after
+        return r if isinstance(r, int) else super().remaining_before_removal
 
     def _check_state(self) -> bool:
         return (

src/daf/web.py

@@ -28,6 +28,7 @@ class GLOBALS:
 
 # ----------------- OPTIONAL ----------------- #
 try:
+    from webdriver_manager.chrome import ChromeDriverManager
     from undetected_chromedriver import Chrome
     from selenium.webdriver.chrome.options import Options
     from selenium.webdriver.remote.webelement import WebElement
@@ -168,7 +169,7 @@ async def initialize(self) -> None:
             proxy = f"{proxy[0]}://{proxy[1]}"
             opts.add_argument(f"--proxy-server={proxy}")
 
-        driver = Chrome(options=opts)
+        driver = Chrome(options=opts, driver_executable_path=ChromeDriverManager().install())
         driver.maximize_window()
         self.driver = driver
 
@@ -306,31 +307,31 @@ async def fetch_invite_link(self, url: str):
         trace(f"Fetching invite link from {url}", TraceLEVELS.DEBUG)
         driver = self.driver
         main_window_handle = driver.current_window_handle
-        # Open a new tab with javascript to bypass detection
-        driver.execute_script(f"window.open('{url}', '_blank');")  # Open a new tab
-        await asyncio.sleep(3)
-        new_handle = driver.window_handles[-1]
+
+        driver.execute_script(f"window.open('{url}', '_blank');")  # Try to bypass from start
+        await asyncio.sleep(5)
+        invite_handle = driver.window_handles[-1]
+        driver.switch_to.window(invite_handle)
         try:
             for i in range(WD_FETCH_INVITE_CLOUDFLARE_TRIES):
                 with suppress(NoSuchElementException):
-                    driver.switch_to.window(new_handle)
                     trace("Finding 'challenge-running' cloudflare ID", TraceLEVELS.DEBUG)
-                    driver.find_element(By.ID, "challenge-running")
-                    driver.switch_to.window(main_window_handle)
-                    await asyncio.sleep(WD_FETCH_INVITE_CLOUDFLARE_DELAY * (i + 1))
-                    continue
-
-                await asyncio.sleep(2)
-                driver.switch_to.window(new_handle)
-                trace("No 'challenge-running' found. Checks suceeded", TraceLEVELS.DEBUG)
+                    if "top.gg" in driver.current_url:
+                        driver.find_element(By.ID, "challenge-running")
+                        # Open a new tab with javascript to bypass detection
+                        trace("Found 'challenge-running' tag", TraceLEVELS.DEBUG)
+                        driver.execute_script("window.open('https://top.gg', '_blank');")
+                        await asyncio.sleep(WD_FETCH_INVITE_CLOUDFLARE_DELAY * (i + 1))
+                        driver.switch_to.window(driver.window_handles[-1])
+                        driver.close()
+                        driver.switch_to.window(invite_handle)
+                        await self.async_execute(driver.refresh)
+
+                trace("Great! 'challenge-running' not found", TraceLEVELS.DEBUG)
                 break
             else:
-                driver.switch_to.window(new_handle)
-                driver.close()
-                driver.switch_to.window(main_window_handle)
-                raise RuntimeError("Could not complete cloudflare checks")
+                raise RuntimeError("Could not bypass 'challenge-running'")
 
-            # await self.async_execute(driver.get, url)
             await self.async_execute(
                 WebDriverWait(driver, WD_TIMEOUT_LONG).until,
                 url_contains("discord.com")
@@ -646,6 +647,7 @@ async def join_guild(self, invite: str) -> None:
                     "//span[contains(text() , 'Unable to accept')]"
                 )
                 # Element found -> join error
+                ActionChains(driver).send_keys(Keys.ESCAPE).perform()
                 raise RuntimeError(f"The user appears to be banned from the guild w/ invite {invite}")
 
             await self.random_sleep(2, 3)