database refactor, code cleanup

Author: Bombg

checkers/Kick.py

@@ -1,7 +1,5 @@
 import asyncio
-import nodriver as uc
 import json
-import time
 import utils.NoDriverBrowserCreator as ndb
 import globals
 from DefaultConstants import Settings as Settings
@@ -103,7 +101,7 @@ def getApiStreamingVals(kickUserName:str, apiResponse: requests.Response):
         thumbUrl = GetThumbnail(tempThumbUrl, baseSettings.kickThumbnail)
         if kickUserName.lower() in globals.kickProfilePics:
             icon = globals.kickProfilePics[kickUserName.lower()]
-        if not kickUserName in globals.kickUserIds:
+        if kickUserName not in globals.kickUserIds:
             globals.kickUserIds[kickUserName] = userId
             subscribeWebhooks(globals.kickUserIds[kickUserName], "livestream.status.updated")
         logger.debug(apiData)
@@ -124,7 +122,7 @@ def getAccessToken():
         if response.status_code == 200:
             data = response.json()
             accessToken = data["access_token"]
-            expiresIn = data["expires_in"]
+            #expiresIn = data["expires_in"]
             tokenType = data["token_type"]
             globals.kickAccessToken = tokenType + " " + accessToken
         else:
@@ -193,7 +191,8 @@ def GetWebhookSubs()-> dict:
     return respJson
 
 def DeleteAllWebhooks():
-    if not baseSettings.kickClientId or not baseSettings.kickClientSecret: return
+    if not baseSettings.kickClientId or not baseSettings.kickClientSecret: 
+        return
     subs = GetWebhookSubs()
     if subs and 'data' in subs:
         subIds = []

checkers/Twitch.py

@@ -1,5 +1,4 @@
 import requests
-import json
 from bs4 import BeautifulSoup
 import time
 import logging

decorators/CommandLogger.py

@@ -1,4 +1,3 @@
-from typing import Any
 import tanjun
 from datetime import datetime
 import time

plugins/checks.py

@@ -71,27 +71,27 @@ async def platformChecker(isOnlineFunc: Callable,platformNotifFunc: Callable, us
         isOnline = isOnline if db.getRerunAnnounce() else False
         isRerun = True
     logger.debug(platformName + " +Offline|-Online: " + str((-1 * secondsSinceStreamStartTime) if isOnline else secondsSinceStreamEndTime))
-    if isOnline == True:
+    if isOnline:
         db.setRerun(isRerun, platformName)
         if secondsSinceStreamEndTime >= baseSettings.WAIT_BETWEEN_MESSAGES and secondsSinceLastMessage >= baseSettings.WAIT_BETWEEN_MESSAGES and streamEndTime >= streamStartTime:
             logger.info(f"{platformName}: Sending Notification")
             await platformNotifFunc(rest, title, thumbUrl, icon, userName, isRerun)
-            db.updatePlatformRowCol(platformName,"last_stream_start_time",time.time())
-            db.updatePlatformAccountRowCol(platformName, userName,"last_stream_start_time",time.time())
+            db.SetPlatformLastStreamStartTime(platformName,time.time())
+            db.SetPlatformAccountLastStreamStartTime(platformName, userName,time.time())
             globals.rebroadcast[platformName] = 0
         elif secondsSinceLastMessage >= baseSettings.ONLINE_MESSAGE_REBROADCAST_TIME or globals.rebroadcast[platformName]:
             logger.info(f"{platformName}: Rebroadcast Command or Rebroadcast_TIME Notification sent")
             await platformNotifFunc(rest, title, thumbUrl, icon, userName, isRerun)
             lastOnlineMessage = time.time()
             globals.rebroadcast[platformName] = 0
         elif streamEndTime >= streamStartTime:
-            db.updatePlatformRowCol(platformName,"last_stream_start_time",time.time())
-            db.updatePlatformAccountRowCol(platformName,userName,"last_stream_start_time",time.time())
-    elif isOnline == False:
+            db.SetPlatformLastStreamStartTime(platformName,time.time())
+            db.SetPlatformAccountLastStreamStartTime(platformName,userName,time.time())
+    elif not isOnline:
         db.setRerun(isRerun, platformName)
         if streamEndTime <= streamStartTime:
-            db.updatePlatformRowCol(platformName,"last_stream_end_time",time.time())
-            db.updatePlatformAccountRowCol(platformName,userName,"last_stream_end_time",time.time())
+            db.SetPlatformLastStreamEndTime(platformName,time.time())
+            db.SetPlatformAccountLastStreamEndTime(platformName,userName,time.time())
         globals.rebroadcast[platformName] = 0
 
 @component.with_schedule
@@ -277,7 +277,7 @@ async def presenceGrabber(rest: alluka.Injected[hikari.impl.RESTClientImpl]) ->
     async for member in members:
         memberCount += 1
         presence = member.get_presence()
-        if presence != None:
+        if presence is not None:
             status = presence.visible_status
             statusStr = str(status)
             if statusStr in statusCounts:
@@ -359,7 +359,8 @@ async def resetUnreviewedAppeals(rest: alluka.Injected[hikari.impl.RESTClientImp
 @component.with_schedule
 @tanjun.as_interval(30, max_runs=1)
 async def startWebhookServer(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> None:
-    if not baseSettings.webhookPort or not baseSettings.webhookHostIp: return
+    if not baseSettings.webhookPort or not baseSettings.webhookHostIp: 
+        return
     Kick.DeleteAllWebhooks() # Kick stops sending webhooks to a server that hasn't responded (down or restart). Deleting and resubbing fixes that
     app.state.restClient = rest
     await checkKick(rest)
@@ -402,7 +403,7 @@ async def OAuthCallback(code: str = None, state: str = None, error: str = None):
             status_code=401, 
             detail=f"Authorization failed. Error: {error}"
         )
-    if not state or not state in globals.kickOauth:
+    if not state or state not in globals.kickOauth:
         logger.debug("oauth state didn't match")
         raise HTTPException(
             status_code=403, 
@@ -446,7 +447,8 @@ async def OAuthCallback(code: str = None, state: str = None, error: str = None):
     return RedirectResponse(url=baseSettings.kickDiscordRedirect)
 
 async def processWebhookData(body, headers):
-    if 'kick-event-type' not in headers or headers == globals.kickLastWebhookHeaders: return
+    if 'kick-event-type' not in headers or headers == globals.kickLastWebhookHeaders: 
+        return
     globals.kickLastWebhookHeaders = headers
     if Kick.verifyWebhook(headers, body):
         logger.debug("verified kick webhook")
@@ -486,7 +488,8 @@ async def memberLogger(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> Non
 @component.with_schedule
 @tanjun.as_interval(30, max_runs=1)
 async def startKickWebsocket(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> None:
-    if not baseSettings.kickChatroomId or not baseSettings.kickChannelId: return
+    if not baseSettings.kickChatroomId or not baseSettings.kickChannelId: 
+        return
     lastLaunchTime = time.time()
     maxRetries = 3
     maxRetryWindow = 30
@@ -505,7 +508,8 @@ async def startKickWebsocket(rest: alluka.Injected[hikari.impl.RESTClientImpl])
 @component.with_schedule
 @tanjun.as_interval(baseSettings.ROLE_ADD_REMOVE_TIMER)
 async def AddKickRoles(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> None:
-    if not baseSettings.hasRolePermissions: return
+    if not baseSettings.hasRolePermissions: 
+        return
     db = Database()
     subsShortThreshold = baseSettings.kickSubsShortThreshold
     subsShortLookBackHours = baseSettings.kickSubsShortLookBackHours
@@ -566,7 +570,8 @@ async def HandleLongSubRoles(rest:hikari.impl.RESTClientImpl, db:Database, longS
 @component.with_schedule
 @tanjun.as_interval(baseSettings.ROLE_ADD_REMOVE_TIMER)
 async def RemoveKickRoles(rest: alluka.Injected[hikari.impl.RESTClientImpl]) -> None:
-    if not baseSettings.hasRolePermissions:return
+    if not baseSettings.hasRolePermissions:
+        return
     db = Database()
     longDateRolePeriod = baseSettings.kickLongDateRolePeriod
     shortTimeRolePeriod = baseSettings.kickShortTimeRolePeriod

plugins/commands.py

@@ -5,7 +5,6 @@
 from DefaultConstants import Settings as Settings
 from utils.Database import Database
 from datetime import datetime
-from decorators.Permissions import Permissions
 from decorators.CommandLogger import CommandLogger
 from datetime import date
 from datetime import timedelta
@@ -117,7 +116,6 @@ async def KickClipAutoComplete(ctx: tanjun.abc.AutocompleteContext, value:str) -
 @tanjun.as_slash_command("kick-clip-search", "Search for a kick clip", default_to_ephemeral=True, always_defer=True)
 @CommandLogger
 async def SearchKickClips(ctx: tanjun.abc.SlashContext, title:str):
-    db = Database()
     if title:
         clipUrl = StaticMethods.GetKickClipUrlFromClipId(title)
         if clipUrl:
@@ -210,7 +208,7 @@ async def ConnectKickAccount(ctx: miru.ViewContext) -> None:
         count +=1
         await asyncio.sleep(2)
     await ctx.interaction.delete_initial_response()
-    if not oauthState in globals.kickOauth:
+    if oauthState not in globals.kickOauth:
         await ctx.respond("Success", flags=hikari.MessageFlag.EPHEMERAL)
 
 @CommandLogger

plugins/listeners.py

@@ -23,7 +23,8 @@ async def startup_views(event: hikari.StartedEvent) -> None:
 @component.with_listener(hikari.MessageDeleteEvent)
 async def printDelete(event: hikari.MessageDeleteEvent, rest: alluka.Injected[hikari.impl.RESTClientImpl]):
     try:
-        if event.old_message.author.is_bot: return
+        if event.old_message.author.is_bot:
+            return
         file = open("deletedMessageLogs.txt", 'a')
         date = datetime.fromtimestamp(time.time())
         file.write(f"{date} Author: {event.old_message.author.id}-{event.old_message.author.username} - deleted: {event.old_message.content} or {event.old_message.embeds} in {event.channel_id} \n")

utils/DataGrapher.py

@@ -1,13 +1,9 @@
 from utils.Database import Database
 import matplotlib.pyplot as plt
 import os
-from datetime import date
 from DefaultConstants import Settings as Settings
 from datetime import datetime
 from datetime import timedelta
-import matplotlib.image as mpimg
-import numpy as np
-import matplotlib.cbook as cbook
 import requests
 from matplotlib.gridspec import GridSpec
 
@@ -218,6 +214,6 @@ def GetEmoteStatsImage(prefix, days):
         ax_num.axis('off')
 
     plt.tight_layout()
-    path = f"graphs/emoteStats.png"
+    path = "graphs/emoteStats.png"
     plt.savefig(path)
     return path