Merge pull request #115 from davidhozic/develop

V1.9

Author: davidhozic

documentation_src/er_diagram.png

@@ -12,7 +12,7 @@
 
 __metadata__ = \
 {
-    "version" :  "1.9.rc2",
+    "version" :  "1.9",
     "requirements" : req,
     "minimum_py_version" :  "3.8",
 }

setup.py

@@ -13,15 +13,16 @@
 C_VC_CONNECT_TIMEOUT = 3     # Timeout of voice channels
 
 # RATE LIMIT CONSTANTS
-C_USER_WAIT_TIME = 1.5               # Initial rate limit avoidance time for user accounts (0 for bot accounts)
-C_RATE_LIMIT_SAFETY_FACTOR = 1.10    # In case of a rate limit, wait times this more
+RLIM_USER_WAIT_TIME = 1.5               # Initial rate limit avoidance time for user accounts (0 for bot accounts)
+RLIM_SAFETY_FACTOR = 1.10    # In case of a rate limit, wait times this more
 
 # SQL CONFIGURATION
-C_FAIL_RETRIES = 10
-C_RECOVERY_TIME = 0.25
-C_RECONNECT_TIME = 5 * C_MINUTE_TO_SECOND
-C_RECONNECT_ATTEMPTS = 3 
-C_CONNECTOR_TIMEOUT = 3
+SQL_MAX_SAVE_ATTEMPTS = 10
+SQL_MAX_EHANDLE_ATTEMPTS = 3
+SQL_RECOVERY_TIME = 0.5
+SQL_RECONNECT_TIME = 5 #* C_MINUTE_TO_SECOND
+SQL_RECONNECT_ATTEMPTS = 3 
+SQL_CONNECTOR_TIMEOUT = 6
 
 # OTHER CONSTANTS
 C_FILE_NAME_FORBIDDEN_CHAR = ('<','>','"','/','\\','|','?','*',":")

src/framework/const.py

@@ -14,7 +14,7 @@
 from    . import sql
 import  time
 import  json
-import pathlib
+import  pathlib
 
 __all__ = (
     "GUILD",
@@ -99,8 +99,8 @@ async def advertise(self,
         """
         raise NotImplementedError
 
-    def generate_log(self,
-                     message_context: dict) -> None:
+    async def generate_log(self,
+                           message_context: dict) -> None:
         """
         Name:   generate_log
         Param:
@@ -117,8 +117,8 @@ def generate_log(self,
         try:
             manager = sql.get_sql_manager()
             if (
-                manager is None or # Short circuit evaluation
-                not manager.save_log(guild_context, message_context)
+                manager is None or  # Short circuit evaluation
+                not await manager.save_log(guild_context, message_context)
             ):
                 timestruct = time.localtime()
                 timestamp = "{:02d}.{:02d}.{:04d} {:02d}:{:02d}:{:02d}".format(timestruct.tm_mday,
@@ -272,7 +272,7 @@ async def advertise(self,
                 if len(message.channels) == 0:
                     marked_del.append(message) # All channels were removed (either not found or forbidden) -> remove message from send list
                 if self._generate_log and message_ret is not None:
-                    self.generate_log(message_ret)
+                    await self.generate_log(message_ret)
 
         # Cleanup messages marked for removal
         for message in marked_del:
@@ -364,7 +364,7 @@ async def advertise(self,
                     message.reset_timer()
                     message_ret = await message.send()
                     if self._generate_log and message_ret is not None:
-                        self.generate_log(message_ret)
+                        await self.generate_log(message_ret)
 
                     if message.dm_channel is None:
                         self.t_messages.clear()            # Remove all messages since that they all share the same user and will fail

src/framework/guild.py

@@ -561,7 +561,7 @@ async def handle_error(self, channel: Union[discord.TextChannel, discord.Thread]
         handled = False
         if isinstance(ex, discord.HTTPException):
             if ex.status == 429:  # Rate limit
-                retry_after = int(ex.response.headers["Retry-After"]) * C_RATE_LIMIT_SAFETY_FACTOR
+                retry_after = int(ex.response.headers["Retry-After"]) * RLIM_SAFETY_FACTOR
                 if ex.code == 20016:    # Slow Mode
                     self.force_retry["ENABLED"] = True
                     self.force_retry["TIME"] = retry_after
@@ -636,7 +636,7 @@ async def send(self) -> Union[dict,  None]:
             for channel in self.channels:
                 # Clear previous messages sent to channel if mode is MODE_DELETE_SEND
                 if GLOBALS.is_user:
-                    await asyncio.sleep(C_USER_WAIT_TIME)
+                    await asyncio.sleep(RLIM_USER_WAIT_TIME)
                 context = await self.send_channel(channel, **data_to_send)
                 if context["success"]:
                     succeded_channels.append(channel)
@@ -783,7 +783,7 @@ async def handle_error(self, ex: Exception):
         handled = False
         if isinstance(ex, discord.HTTPException):
             if ex.status == 429 or ex.code == 40003: # Too Many Requests or opening DMs too fast
-                retry_after = float(ex.response.headers["Retry-After"])  * C_RATE_LIMIT_SAFETY_FACTOR
+                retry_after = float(ex.response.headers["Retry-After"])  * RLIM_SAFETY_FACTOR
                 trace(f"Rate limited, sleeping for {retry_after} seconds", TraceLEVELS.WARNING)
                 await asyncio.sleep(retry_after)
                 handled = True
@@ -792,7 +792,7 @@ async def handle_error(self, ex: Exception):
                     self.previous_message  = None
                     handled = True
             elif ex.status == 400: # Bad Request
-                await asyncio.sleep(C_USER_WAIT_TIME * 5) # To avoid triggering selfbot detection
+                await asyncio.sleep(RLIM_USER_WAIT_TIME * 5) # To avoid triggering selfbot detection
 
         return handled
 
@@ -845,7 +845,7 @@ async def send(self) -> Union[dict, None]:
         data_to_send = self.get_data()
         if any(data_to_send.values()):
             if GLOBALS.is_user:
-                await asyncio.sleep(C_USER_WAIT_TIME)
+                await asyncio.sleep(RLIM_USER_WAIT_TIME)
             context = await self.send_channel(**data_to_send)
             if context["success"] is False:
                 reason  = context["reason"]