fd leak fixed for reals this time?

Author: Bombg

Constants.py

@@ -51,7 +51,7 @@ class Constants:
     WAIT_BETWEEN_MESSAGES = 1800 # minimum amount of time in seconds the stream has to be offline before new notification messages. 
     MIN_TIME_BEFORE_AVATAR_CHANGE = 48 # Minimum time before avatar changes -- in hours
     ONLINE_MESSAGE_REBROADCAST_TIME = 86400 #Time in seconds the stream will be online before another online notification will be broadcasted
-    TIME_BEFORE_BOT_RESTART = 3600 #time in seconds before bot will restart. Restart checks are made every 10 minutes
+    TIME_BEFORE_BOT_RESTART = 43200 #time in seconds before bot will restart. Restart checks are made every 10 minutes
     TIME_OFFLINE_BEFORE_RESTART = 900 #minimum time in seconds stream needs to be offline before bot will restart IF TIME_BEFORE_BOT_RESTART time has been met
     TEMP_TITLE_UPTIME = 57600 #Time in seconds temp titles will be used before default titles are used
     TIME_BEFORE_REVIEW_RESET = 300 # Time a whitelisted person has to review a confession before its added back to the queue

checkers/Fansly.py

@@ -4,11 +4,7 @@
 import NoDriverBrowserCreator as ndb
 import globals
 
-def isModelOnline(fansUserName):
-    isOnline, title, thumbUrl, icon = uc.loop().run_until_complete(GetOnlineStatus(fansUserName))
-    return isOnline, title, thumbUrl, icon
-
-async def GetOnlineStatus(fansUserName):
+async def isModelOnline(fansUserName):
     fansUrl = f"https://fansly.com/{fansUserName}"
     thumbUrl = ""
     title = Constants.fansDefaultTitle

checkers/Kick.py

@@ -6,11 +6,7 @@
 import globals
 from Constants import Constants
 
-def isModelOnline(kickUserName):
-    isOnline, title, thumbUrl, icon = uc.loop().run_until_complete(GetOnlineStatus(kickUserName))
-    return isOnline, title, thumbUrl, icon
-
-async def GetOnlineStatus(kickUserName):
+async def isModelOnline(kickUserName):
     isOnline, title, thumbUrl, icon = setDefaultStreamValues()
     apiUrl = f"https://kick.com/api/v1/channels/{kickUserName}"
     try:

checkers/Onlyfans.py

@@ -6,29 +6,7 @@
 import globals
 from Constants import Constants
 
-async def GetIcon(page:uc.Tab):
-    icon = 'images/errIcon.png'
-    reString = r'^https:\/\/.+avatar.jpg$'
-    try:
-        imageElements = await page.find_all("data-v-325c6981")
-        for element in imageElements:
-            if element.attrs.get("src") and re.search(reString, element.attrs.get("src")):
-                icon = element.attrs.get("src")
-    except:
-        pass
-    return icon
-
-async def IsLiveBadge(page:uc.Tab):
-    live = False
-    try:
-        liveBadge = await page.find("g-avatar__icon m-live", best_match=True)
-        if liveBadge:
-            live = True
-    except:
-        pass
-    return live
-
-async def GetOnlineStatus(ofUserName):
+async def isModelOnline(ofUserName):
     isOnline = False
     ofUrl = f"https://onlyfans.com/{ofUserName}"
     title = Constants.ofDefaultTitle
@@ -52,6 +30,24 @@ async def GetOnlineStatus(ofUserName):
         globals.browserOpen = False
     return isOnline, title, thumbUrl, icon
 
-def isModelOnline(ofUserName):
-    isOnline, title, thumbUrl, icon = uc.loop().run_until_complete(GetOnlineStatus(ofUserName))
-    return isOnline, title, thumbUrl, icon
+async def GetIcon(page:uc.Tab):
+    icon = 'images/errIcon.png'
+    reString = r'^https:\/\/.+avatar.jpg$'
+    try:
+        imageElements = await page.find_all("data-v-325c6981")
+        for element in imageElements:
+            if element.attrs.get("src") and re.search(reString, element.attrs.get("src")):
+                icon = element.attrs.get("src")
+    except:
+        pass
+    return icon
+
+async def IsLiveBadge(page:uc.Tab):
+    live = False
+    try:
+        liveBadge = await page.find("g-avatar__icon m-live", best_match=True)
+        if liveBadge:
+            live = True
+    except:
+        pass
+    return live

plugins/checks.py

@@ -23,6 +23,7 @@
 from datetime import date
 import datetime
 from datetime import timedelta
+import inspect
 
 component = tanjun.Component()
 
@@ -31,7 +32,10 @@ def load(client: tanjun.abc.Client) -> None:
     client.add_component(component.copy())
 
 async def platformChecker(isOnlineFunc: Callable,platformNotifFunc: Callable, userName: str, platformName: str, rest: hikari.impl.RESTClientImpl):
-    isOnline, title, thumbUrl, icon = await asyncio.get_running_loop().run_in_executor(None,isOnlineFunc,userName)
+    if inspect.iscoroutinefunction(isOnlineFunc):
+        isOnline, title, thumbUrl, icon = await isOnlineFunc(userName)
+    else:
+        isOnline, title, thumbUrl, icon = await asyncio.get_running_loop().run_in_executor(None,isOnlineFunc,userName)
     isRerun = False
     db = Database()
     lastOnlineMessage,streamStartTime,streamEndTime = db.getPlatformAccountsRowValues(platformName,userName)