daily request count

Author: Nusab19

ChangeLogs.md

@@ -2,6 +2,17 @@
 
 **Latests are on top**
 
+## 17) 30th November, 2024
+- Add Active users field
+- Forward messages to the active users only and give proper report
+- `/login` command to login as an admin
+- Keep log of daily request count in `db.analytics`
+
+
+## 16) 29th November, 2024
+
+- Better Search for the Surahs
+
 ## 15) 20th October, 2024
 
 - Bot can now send the audio of a Full Surah.

bot/bot.py

@@ -45,8 +45,9 @@ def runBot(token):
 
     # Send a message to the admin when the bot starts
     loop = asyncio.get_event_loop()
-
-    msg = f"<b>Bot started at {datetime.now(timezone.utc).strftime('%d %B %Y, %H:%M:%S %A UTC')} 🚀</b>"
+    
+    currentTime = datetime.now(timezone.utc).strftime('%d %B %Y, %H:%M:%S %A UTC')
+    msg = f"<b>Bot started at {currentTime} 🚀</b>"
     print(msg[3:-4])
     loop.run_until_complete(app.bot.sendMessage(5596148289, msg))
 

bot/handlers/command/adminCommand.py

@@ -1,6 +1,11 @@
+import os
 import html
+import asyncio
+import hashlib
 
 
+from datetime import datetime, timezone
+
 from telegram.ext import CommandHandler, filters
 from telegram import (
     Bot,
@@ -70,41 +75,105 @@ async def forwardMessage(u: Update, c):
 
         return
 
+    if chatID == "me":
+        try:
+            await message.reply_to_message.forward(userID)
+            await message.reply_html("<b>Message forwarded</b>")
+        except Exception as e:
+            await message.reply_html(f"<b>Error:</b> <code>{e}</code>")
+
+        return
+
+    reply = """
+Sending message to <b>{total}</b> users.
+
+Success: {success}
+Failed: {failed}
+
+Progress: {progress}%
+"""
+
     if chatID == "all":
-        users = db.getAllUsers()
+        users = db.getActiveUsers() # send message to the active users only
         success = 0
         errors = 0
-        for user in users:
+        m = await message.reply_text(
+            reply.format(total=len(users), success=success, failed=errors, progress=0)
+        )
+        for count, user in enumerate(users, 1):
             userID = user["_id"]
             try:
                 await message.reply_to_message.forward(userID)
+                success += 1
                 with open("success.txt", "a") as f:
                     f.write(f"{userID}\n")
 
-                success += 1
-
             except Exception as e:
                 logger.error(f"Error while forwarding to {userID}: {e}")
-                with open("errors.txt", "a") as f:
-                    f.write(f"{userID}\n")
-
                 errors += 1
-
-        await message.reply_html("<b>Message forwarded to all users</b>")
-
-        await message.reply_document(
+                with open("errors.txt", "a") as f:
+                    f.write(f"{userID} - {e}\n")
+            finally:
+                await asyncio.sleep(0.3)
+
+            # edit the message after 10 iterations
+            currentTime = datetime.now(timezone.utc).strftime(
+                "%d %B %Y, %H:%M:%S %A UTC"
+            )
+            if count % 10 == 0:
+                text = (
+                    reply.format(
+                        total=len(users),
+                        success=success,
+                        failed=errors,
+                        progress=round(count / len(users), 2),
+                    )
+                    + "\n"
+                    + currentTime
+                )
+                try:
+                    await m.edit_text(text)
+                except Exception as e:
+                    logger.error(f"Error editing the message in forward: {e}")
+
+        # after the loop is finished
+        await m.reply_html("<b>Message forwarded to all users</b>")
+        await m.reply_document(
             open("success.txt", "rb"),
             caption=f"<b>Success</b>\nCount: <code>{success} / {len(users)}</code>",
         )
-        await message.reply_document(
+        await m.reply_document(
             open("errors.txt", "rb"),
             caption=f"<b>Errors</b>\nCount: <code>{errors} / {len(users)}</code>",
         )
+        try:
+            os.remove("success.txt")
+            os.remove("errors.txt")
+        except Exception as e:
+            logger.error(f"Failed to remove success.txt and errors.txt - {e}")
         return
 
     await message.reply_html("<b>Invalid chatID</b>")
 
 
+async def loginAsAdmin(u: Update, c):
+    """Login as admin"""
+    message = u.effective_message
+    chatType = u.effective_chat.type
+    userID = u.effective_user.id
+    hashedPass = "b0cc3016f19b4ac2aece3b1312a213b91bfd93224c50615e0952034aa2baf300b3a41e31de8f7e629dc9c23f79a8aadb43eb41e69cfc96dccf99ce83538055dc"
+
+    if chatType != "private":
+        return await message.reply_text("<b>Try in private chat!</b>")
+
+    text = message.text.split()[-1]  # yeah, it's just one word
+    if hashlib.sha512(text.encode("utf8")).hexdigest() != hashedPass:
+        return await message.reply_text("<b>Wrong password. Sorry :p</b>")
+
+    db.localDB.admins.append(userID)
+    await message.reply_text(f"<b>Successfully logged in with {userID = }</b>")
+
+
 @onlyDeveloper(notifyNonAdminUsers=False)
 async def deleteMessage(u: Update, c):
     """Deletes a message"""
@@ -183,6 +252,7 @@ async def evaluateCode(u: Update, c):
     bot: Bot = c.bot
     message = u.effective_message
     userID = u.effective_user.id
+    chatID = u.effective_chat.id
 
     text = message.text[5:].strip()
     if "help" in text:
@@ -234,6 +304,7 @@ async def raiseError(u: Update, c):
     CommandHandler("forward", forwardMessage),
     CommandHandler("getUser", getUser),
     CommandHandler("eval", evaluateCode),
+    CommandHandler("login", loginAsAdmin),
     CommandHandler("delete", deleteMessage),
     CommandHandler("error", raiseError),
 ]

bot/handlers/database.py

@@ -130,8 +130,9 @@ def __init__(self) -> None:
         # --- Local DB ---
         self.queue = []
         channels = self.db.channels.find({})
-        chats = self.db.chats.find({})
-        users = self.db.users.find({})
+        chats = self.db.chats.find({}) or []
+        users = self.db.users.find({}) or []
+
         self.localDB = _LocalDB(users, chats, channels)
 
         # --- Scheduled Tasks ---
@@ -188,7 +189,11 @@ def getChannel(self, channelID: int):
 
     def addUser(self, userID: int):
         utcTime = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
-        user = {"_id": userID, "settings": self.defaultSettings, "lastMessageTime": utcTime}
+        user = {
+            "_id": userID,
+            "settings": self.defaultSettings,
+            "lastMessageTime": utcTime,
+        }
         self.localDB.addUser(user)
 
         func = self.db.users.insert_one
@@ -198,7 +203,11 @@ def addUser(self, userID: int):
 
     def addChat(self, chatID: int):
         utcTime = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
-        chat = {"_id": chatID, "settings": self.defaultGroupSettings, "lastMessageTime": utcTime}
+        chat = {
+            "_id": chatID,
+            "settings": self.defaultGroupSettings,
+            "lastMessageTime": utcTime,
+        }
         self.localDB.addChat(chat)
 
         func = self.db.chats.insert_one
@@ -245,6 +254,16 @@ def updateChannel(self, channelID: int, settings: dict):
         self.queue.append((func, value))
         return None
 
+    def updateActiveUsers(self, userID: int):
+        func = lambda values: self.db.activeUsers.update_one(values, upsert=True)
+        value = ({"_id": "users"}, {"$addToSet": {"list": userID}})
+        self.queue.append((func, value))
+        return None
+
+    def getActiveUsers(self):
+        users = self.db.activeUsers.find_one({"_id": "users"})
+        return users["list"]
+
     def runQueue(self):
         logger.info("--- Running Queue ---")
         start = time.time()
@@ -267,12 +286,13 @@ def runQueue(self):
         if timeMs > 100:
             logger.info(f"Time taken: {timeMs:.2f} ms")
 
-    # TODO: keep count of all the requests handled per day
-    # Run this in a separate thread or use a TypeHandler to run after the other handlers (group=3)
-    # so it doesn't block the event loop
     def updateCounter(self):
         date = time.strftime("%Y-%m-%d")
-        self.db.analytics.update_one({"_id": date}, {"$inc": "requests"})
+        func = lambda: self.db.analytics.update_one(
+            {"_id": date}, {"$inc": {"requests": 1}}, upsert=True
+        )
+        threading.Thread(target=func).start()
+        # logger.info(f"Another request at {date}")
 
     # def deleteUser(self, userID: int):
     #     return self.db.users.delete_one({"_id": userID})
@@ -295,10 +315,11 @@ async def main():
     chats = db.getAllChat()
     print("Total Users:", len(users))
     print("Total Chats:", len(chats))
-    
+
     # import json
-    # with open("users.json", 'w', encoding="utf8") as f:
-    #     json.dump(users, f, ensure_ascii=0)
+    # with open("realUsers.json", 'rb') as f:
+    #     data = json.load(f)
+    #     db.db.activeUsers.insert_one({"_id":"users", "list":data})
 
 
 if __name__ == "__main__":

bot/handlers/middleware.py

@@ -25,6 +25,7 @@ async def middleware(u: Update, c):
 
     # Only check for a new user in the private chat
     if userID == chatID:
+        db.updateActiveUsers(userID) # add a new active user to the `set`
         user = db.getUser(userID)
         if not user:
             user = db.addUser(userID)
@@ -39,3 +40,5 @@ async def middleware(u: Update, c):
         if not chat:
             chat = db.addChat(chatID)
         db.updateChat(chatID, {"lastMessageTime": utcTime})
+    
+    db.updateCounter() # Update counter for each day