latest patch to fix nested db update bug

Author: Nusab19

bot/handlers/callbackQuery/handleSettingsButtonPress.py

@@ -292,7 +292,7 @@ async def handleGroupSettingsButtonPress(u: Update, c):
             ]
         else:
             settings["handleMessages"] = int(query_data[1])
-            db.updateChat(chatID, settings)
+            db.updateChatSettings(chatID, settings)
             reply = f"Handling messages has been set to <b>{['No', 'Yes'][settings['handleMessages']]}</b>"
             buttons = homeStateGroup
 
@@ -319,7 +319,7 @@ async def handleGroupSettingsButtonPress(u: Update, c):
             ]
         else:
             settings["allowAudio"] = int(query_data[1])
-            db.updateChat(chatID, settings)
+            db.updateChatSettings(chatID, settings)
             reply = f"Allowing audio has been set to <b>{['No', 'Yes'][settings['allowAudio']]}</b>"
             buttons = homeStateGroup
 
@@ -348,7 +348,7 @@ async def handleGroupSettingsButtonPress(u: Update, c):
             ]
         else:
             settings["previewLink"] = int(query_data[1])
-            db.updateChat(chatID, settings)
+            db.updateChatSettings(chatID, settings)
             reply = f"Preview link has been set to <b>{['No', 'Yes'][settings['previewLink']]}</b>"
             buttons = homeStateGroup
 
@@ -391,7 +391,7 @@ async def handleGroupSettingsButtonPress(u: Update, c):
 
         settings["restrictedLangs"].append(langCode)
 
-        db.updateChat(chatID, settings)
+        db.updateChatSettings(chatID, settings)
 
         # -- Previous State --
         restrictedLangs = settings["restrictedLangs"]
@@ -431,7 +431,7 @@ async def handleGroupSettingsButtonPress(u: Update, c):
 
         settings["restrictedLangs"].remove(langCode)
 
-        db.updateChat(chatID, settings)
+        db.updateChatSettings(chatID, settings)
 
         # -- Previous State --
         restrictedLangs = settings["restrictedLangs"]

bot/handlers/database.py

@@ -66,15 +66,23 @@ def addChannel(self, channel) -> None:
         self.channels.append(channel)
         return None
 
-    def updateUser(self, userID: int, settings: dict) -> dict:
+    def updateUser(self, userID: int, data: dict) -> dict:
+        user = self.findUser(userID)
+        if not user:
+            user = self.addUser(userID)
+
+        user.update(data)
+        return user
+
+    def updateUserSettings(self, userID: int, settings: dict) -> dict:
         user = self.findUser(userID)
         if not user:
             user = self.addUser(userID)
 
         user["settings"] = {**user["settings"], **settings}
         return user
 
-    def updateChat(self, chatID: int, settings: dict) -> dict:
+    def updateChatSettings(self, chatID: int, settings: dict) -> dict:
         chat = self.findChat(chatID)
         if not chat:
             chat = self.addChat(chatID)
@@ -237,17 +245,17 @@ def updateUser(self, userID: int, newData: dict):
     def updateUserSettings(self, userID: int, settings: dict):
         user = self.getUser(userID)
         settings = {**user["settings"], **settings}
-        self.localDB.updateUser(userID, settings)
+        self.localDB.updateUserSettings(userID, settings)
         func = self.db.users.update_one
         value = ({"_id": userID}, {"$set": {"settings": settings}})
         self.queue.append((func, value))
         return None
 
-    def updateChat(self, chatID: int, settings: dict):
+    def updateChatSettings(self, chatID: int, settings: dict):
         chat = self.getChat(chatID)
         settings = {**chat["settings"], **settings}
         settings["restrictedLangs"] = list(set(settings["restrictedLangs"]))
-        self.localDB.updateChat(chatID, settings)
+        self.localDB.updateChatSettings(chatID, settings)
 
         func = self.db.chats.update_one
         value = ({"_id": chatID}, {"$set": {"settings": settings}})
@@ -293,7 +301,10 @@ def runQueue(self):
                 try:
                     func(value)
                 except Exception as e:
-                    logger.info("Error in queue:", e)
+                    logger.error("Error in queue:", e)
+                    logger.info(f"Func: {func}")
+                    logger.info(f"Value: {value}")
+                    logger.info("-" * 33)
 
         end = time.time()
         timeMs = (end - start) * 1000

bot/handlers/middleware.py

@@ -39,5 +39,5 @@ async def middleware(u: Update, c):
     if isGroup:  # for new groups
         if not chat:
             chat = db.addChat(chatID)
-        db.updateChat(chatID, {"lastMessageTime": utcTime})
+        db.updateChatSettings(chatID, {"lastMessageTime": utcTime})
     db.updateCounter()  # Update counter for each day

bot/handlers/sendScheduled.py

@@ -8,7 +8,7 @@
 
 from bot.handlers import Quran
 from bot.handlers.database import db
-from datetime import datetime
+from datetime import datetime, timezone
 from bot.utils import getLogger
 
 logger = getLogger(__name__)
@@ -29,18 +29,18 @@ async def jobSendScheduled(context: ContextTypes.DEFAULT_TYPE):
             runTime = schedule["time"]
             hour, minute = runTime.split(":")
             hour, minute = int(hour), int(minute)
-            nowHour, nowMinute = datetime.utcnow().strftime("%H:%M").split(":")
+            nowHour, nowMinute = datetime.now(timezone.utc).strftime("%H:%M").split(":")
             nowHour, nowMinute = int(nowHour), int(nowMinute)
-            logger.info(
-                f"Chat ID: {chatID}, Time: {runTime}, Now Time: {nowHour}:{nowMinute}"
-            )
 
             if hour == nowHour and (0 <= nowMinute - minute <= 5):
                 logger.info("Sending scheduled verse...")
+                logger.info(
+                    f"Chat ID: {chatID}, Time: {runTime}, Now Time: {nowHour}:{nowMinute}"
+                )
                 lastSent = schedule.get("lastSent")
                 if lastSent:
                     lastSent = datetime.strptime(lastSent, "%d:%m:%Y %H:%M:%S")
-                    diff = datetime.utcnow() - lastSent
+                    diff = datetime.now(timezone.utc) - lastSent
                     if diff.total_seconds() < 11 * 60:
                         logger.info("Skipping due to last sent.")
                         continue
@@ -82,7 +82,9 @@ async def jobSendScheduled(context: ContextTypes.DEFAULT_TYPE):
                             {"_id": newChatID}, {"$set": {"lastSent": currentTime}}
                         )
                     except Exception as e:
-                        logger.error(f"Failing to send to new chat ID: {newChatID} - {e}")
+                        logger.error(
+                            f"Failing to send to new chat ID: {newChatID} - {e}"
+                        )
 
                 except Forbidden as e:
                     logger.error(f"Forbidden: {e}")
@@ -94,7 +96,7 @@ async def jobSendScheduled(context: ContextTypes.DEFAULT_TYPE):
                 await asyncio.sleep(0.1)
 
             # sleep for dueNextMinute seconds
-            dueNextMinute = 60 - int(datetime.utcnow().strftime("%S"))
+            dueNextMinute = 60 - int(datetime.now(timezone.utc).strftime("%S"))
             # await asyncio.sleep(dueNextMinute - 1)
         except Exception as e:
             logger.error(f"Error: {e}")