diff --git a/database/users_chats_db.py b/database/users_chats_db.py index a0ac45e7..35682698 100644 --- a/database/users_chats_db.py +++ b/database/users_chats_db.py @@ -7,7 +7,7 @@ class UsersData: def __init__(self, uri, database_name): self._client = AsyncClient(uri) self.db = self._client[database_name] - self.col = self.db["users"] + self.col = self.db["userlist"] self.grp = self.db["groups"] @staticmethod diff --git a/misskaty/plugins/broadcast.py b/misskaty/plugins/broadcast.py index cb4f16c3..81d6cc2f 100644 --- a/misskaty/plugins/broadcast.py +++ b/misskaty/plugins/broadcast.py @@ -5,27 +5,30 @@ import time from pyrogram import filters from pyrogram.types import Message -from database.users_chats_db import db -from misskaty import app +from async_pymongo import AsyncClient +from misskaty import app, DATABASE_URI from misskaty.vars import SUDO from utils import broadcast_messages @app.on_message(filters.command("broadcast") & filters.user(SUDO) & filters.reply) async def broadcast(_, ctx: Message): - users = await db.get_all_users() + mongo = AsyncClient(DATABASE_URI) + userdb = mongo["MissKatyBot"]["peers"] b_msg = ctx.reply_to_message sts = await ctx.reply_msg("Broadcasting your messages...") start_time = time.time() - total_users = await db.total_users_count() + total_users = await userdb.count_documents({}) done = 0 blocked = 0 deleted = 0 failed = 0 success = 0 - async for user in users: - pti, sh = await broadcast_messages(int(user["id"]), b_msg) + async for chat in userdb.find({}): + if chat["type"] == "user": + continue + pti, sh = await broadcast_messages(int(chat["id"]), b_msg) if pti: success += 1 elif pti is False: diff --git a/misskaty/plugins/web_scraper.py b/misskaty/plugins/web_scraper.py index c0a93c7a..881e577d 100644 --- a/misskaty/plugins/web_scraper.py +++ b/misskaty/plugins/web_scraper.py @@ -308,8 +308,8 @@ async def getDataNodrakor(msg, kueri, CurrentPage, user, strings): ) return None, 0, None for i in entry: - genre = i.find(class_="gmr-movie-on").text - genre = f"{genre}" if genre != "" else "N/A" + genre = i.find(class_="gmr-movie-on") + genre = f"{genre.text}" if genre != "" else "N/A" judul = i.find(class_="entry-title").find("a").text link = i.find(class_="entry-title").find("a").get("href") nodrakordata.append({"judul": judul, "link": link, "genre": genre})