2.9.5 fixes

Author: davidhozic

docs/source/changelog.rst

@@ -32,6 +32,12 @@ Glossary
 Releases
 ----------------------
 
+v2.9.5
+=================
+- Fixed incorrect caching of the SQL logs, causing incorrect values to be returned back to the GUI.
+- Fixed detection of browser automation on searching for new guilds to join.
+
+
 v2.9.4
 =================
 - Fixed :class:`AutoGUILD` concurrent access. When updating AutoGUILD, the update method did not block

src/daf/logging/sql/tables.py

@@ -17,15 +17,7 @@
 
 class ORMBase(DeclarativeBase):
     "Base for all of ORM classes"
-
-    def __eq__(self, value: object) -> bool:
-        try:
-            return self.__dict__["id"] == value.__dict__["id"]
-        except KeyError:
-            return False
-
-    def __hash__(self):
-        return hash(type(self)) << 4 | self.__dict__.get("id", id(self))
+    pass
 
 
 class MessageTYPE(ORMBase):
@@ -49,6 +41,12 @@ class MessageTYPE(ORMBase):
     def __init__(self, name: str = None):
         self.name = name
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, MessageTYPE) and self.id == __value.id
+
+    def __hash__(self):
+        return hash(self.id)
+
 
 class MessageMODE(ORMBase):
     """
@@ -72,6 +70,12 @@ class MessageMODE(ORMBase):
     def __init__(self, name: str = None):
         self.name = name
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, MessageMODE) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class GuildTYPE(ORMBase):
     """
@@ -95,6 +99,12 @@ class GuildTYPE(ORMBase):
     def __init__(self, name: str = None):
         self.name = name
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, GuildTYPE) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class GuildUSER(ORMBase):
     """
@@ -126,6 +136,12 @@ def __init__(self, guild_type: GuildTYPE, snowflake: int, name: str):
         self.name = name
         self.guild_type = guild_type
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, GuildUSER) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class CHANNEL(ORMBase):
     """
@@ -156,6 +172,12 @@ def __init__(self, snowflake: int, name: str, guild: GuildUSER):
         self.name = name
         self.guild = guild
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, CHANNEL) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class DataHISTORY(ORMBase):
     """
@@ -180,6 +202,12 @@ class DataHISTORY(ORMBase):
     def __init__(self, content: dict):
         self.content = content
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, DataHISTORY) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class MessageChannelLOG(ORMBase):
     """
@@ -208,6 +236,15 @@ def __init__(self, channel: CHANNEL, reason: str = None):
         self.channel = channel
         self.reason = reason
 
+    def __eq__(self, __value: object) -> bool:
+        return (
+            isinstance(__value, MessageChannelLOG) and
+            (self.channel_id, self.log_id) == (__value.channel_id, __value.log_id)
+        )
+
+    def __hash__(self):
+        return hash((self.channel_id, self.log_id))
+
 
 class MessageLOG(ORMBase):
     """
@@ -289,6 +326,12 @@ def __init__(
         self.timestamp = datetime.now()
         self.channels = channels
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, MessageLOG) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class Invite(ORMBase):
     __tablename__ = "Invite"
@@ -307,6 +350,12 @@ def __init__(self, discord_id: str, guild: GuildUSER):
         self.discord_id = discord_id
         self.guild = guild
 
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, Invite) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id
+
 
 class InviteLOG(ORMBase):
     __tablename__ = "InviteLOG"
@@ -328,3 +377,9 @@ def __init__(self, invite: Invite, member: GuildUSER):
         self.invite = invite
         self.member = member
         self.timestamp = datetime.now()
+
+    def __eq__(self, __value: object) -> bool:
+        return isinstance(__value, InviteLOG) and self.id == __value.id
+
+    def __hash__(self):
+        return self.id

src/daf/web.py

@@ -64,6 +64,8 @@ class GLOBALS:
 WD_TIMEOUT_MED = 15
 WD_TIMEOUT_30 = 30
 WD_TIMEOUT_LONG = 90
+
+WD_FETCH_INVITE_CLOUDFLARE_TRIES = 5
 WD_RD_CLICK_UPPER_N = 5
 WD_RD_CLICK_LOWER_N = 2
 WD_OUTPUT_PATH = pathlib.Path.home().joinpath("daf/daf_web_data")
@@ -145,6 +147,7 @@ async def initialize(self) -> None:
         opts.add_argument("--no-first-run")
         opts.add_argument("--disable-background-networking")
         opts.add_argument("--disable-sync")
+        opts.add_argument("--disable-popup-blocking")
 
         if self._proxy is not None:
             proxy = self._proxy.split("://")  # protocol, url
@@ -293,10 +296,28 @@ 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
-        driver.switch_to.new_window("tab")
-        await self.async_execute(driver.get, url)
-        await asyncio.sleep(1)
+        # Open a new tab with javascript to bypass detection
+        driver.execute_script("window.open('https://top.gg', '_blank');")  # Open a new tab
+        await asyncio.sleep(3)
+        new_handle = driver.window_handles[-1]
         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(5 * (i + 1))
+                    continue
+
+                await asyncio.sleep(2)
+                driver.switch_to.window(new_handle)
+                trace("No 'challenge-running' found. Checks suceeded", TraceLEVELS.DEBUG)
+                break
+            else:
+                raise RuntimeError("Could not complete cloudflare checks")
+
+            await self.async_execute(driver.get, url)
             await self.async_execute(
                 WebDriverWait(driver, WD_TIMEOUT_LONG).until,
                 url_contains("discord.com")