Fix IMDB Typo and change motor to async pymongo

database/__init__.py

@@ -4,9 +4,8 @@
  * @projectName   MissKatyPyro
  * Copyright @YasirPedia All rights reserved
 """
-from motor.motor_asyncio import AsyncIOMotorClient as MongoClient
+from async_pymongo import AsyncClient
+from misskaty.vars import DATABASE_URI, DATABASE_NAME
 
-from misskaty.vars import DATABASE_URI
+mongo = AsyncClient(DATABASE_URI)
-
+dbname = mongo[DATABASE_NAME]
-mongo = MongoClient(DATABASE_URI)
-dbname = mongo.MissKatyDB

database/afk_db.py

@@ -10,8 +10,8 @@
 
 from database import dbname
 
-usersdb = dbname.users
+usersdb = dbname["users"]
-cleandb = dbname.cleanmode
+cleandb = dbname["cleanmode"]
 cleanmode = {}
 
 

database/filters_db.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Union
 
 from database import dbname
 
-filtersdb = dbname.filters
+filtersdb = dbname["filters"]
 
 
 async def _get_filters(chat_id: int) -> Dict[str, int]:

database/gban_db.py

@@ -1,6 +1,6 @@
 from database import dbname
 
-gbansdb = dbname.gban
+gbansdb = dbname["gban"]
 
 
 async def is_gbanned_user(user_id: int) -> bool:

database/imdb_db.py

@@ -1,6 +1,6 @@
 from database import dbname
 
-imbd_db = dbname.imdb
+imbd_db = dbname["imdb"]
 
 
 async def is_imdbset(user_id: int) -> bool:

database/karma_db.py

@@ -3,7 +3,7 @@ from typing import Dict, Union
 from database import dbname
 from misskaty.helper.functions import int_to_alpha
 
-karmadb = dbname.karma
+karmadb = dbname["karma"]
 
 
 async def get_karmas_count() -> dict:

database/locale_db.py

@@ -4,7 +4,7 @@ from pyrogram.enums import ChatType
 
 from database import dbname
 
-localesdb = dbname.locale  # DB for localization
+localesdb = dbname["locale"]  # DB for localization
 
 group_types: Iterable[ChatType] = (ChatType.GROUP, ChatType.SUPERGROUP)
 

database/notes_db.py

@@ -2,7 +2,7 @@ from typing import Dict, List, Union
 
 from database import dbname
 
-notesdb = dbname.notes
+notesdb = dbname["notes"]
 
 
 async def _get_notes(chat_id: int) -> Dict[str, int]:

database/sangmata_db.py

@@ -1,6 +1,6 @@
 from database import dbname
 
-matadb = dbname.sangmata
+matadb = dbname["sangmata"]
 
 
 # Get Data User

database/users_chats_db.py

@@ -1,14 +1,13 @@
-import motor.motor_asyncio
+from async_pymongo import AsyncClient
-
 from misskaty.vars import DATABASE_NAME, DATABASE_URI
 
 
-class Database:
+class UsersData:
     def __init__(self, uri, database_name):
-        self._client = motor.motor_asyncio.AsyncIOMotorClient(uri)
+        self._client = AsyncClient(uri)
         self.db = self._client[database_name]
-        self.col = self.db.users
+        self.col = self.db["users"]
-        self.grp = self.db.groups
+        self.grp = self.db["groups"]
 
     @staticmethod
     def new_user(id, name):
@@ -109,4 +108,4 @@ class Database:
         return (await self.db.command("dbstats"))["dataSize"]
 
 
-db = Database(DATABASE_URI, DATABASE_NAME)
+db = UsersData(DATABASE_URI, DATABASE_NAME)

database/warn_db.py

@@ -2,7 +2,7 @@ from typing import Dict, Union
 
 from database import dbname
 
-warnsdb = dbname.warn
+warnsdb = dbname["warn"]
 
 
 async def get_warns_count() -> dict:

misskaty/__init__.py

@@ -8,7 +8,6 @@ from logging import ERROR, INFO, StreamHandler, basicConfig, getLogger, handlers
 from apscheduler.jobstores.mongodb import MongoDBJobStore
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from async_pymongo import AsyncClient
-from motor.motor_asyncio import AsyncIOMotorClient
 from pymongo import MongoClient
 from pyrogram import Client
 

misskaty/plugins/imdb_search.py

@@ -649,7 +649,7 @@ async def imdb_en_callback(self: Client, query: CallbackQuery):
                 for i in r_json["creator"]
                 if i["@type"] == "Person"
             )
-            res_str += f"<b>Writer:</b> {creator[-2]}\n"
+            res_str += f"<b>Writer:</b> {creator[:-2]}\n"
         if r_json.get("actor"):
             actors = actors = "".join(
                 f"<a href='{i['url']}'>{i['name']}</a>, " for i in r_json["actor"]

misskaty/plugins/inline_search.py

@@ -11,7 +11,6 @@ from sys import version as pyver
 
 from bs4 import BeautifulSoup
 from deep_translator import GoogleTranslator
-from motor import version as mongover
 from pykeyboard import InlineButton, InlineKeyboard
 from pyrogram import __version__ as pyrover
 from pyrogram import enums, filters
@@ -26,6 +25,7 @@ from pyrogram.types import (
 )
 
 from misskaty import BOT_USERNAME, app, user
+from misskaty.plugins.dev import shell_exec
 from misskaty.core.decorator.ratelimiter import ratelimiter
 from misskaty.helper import GENRES_EMOJI, http, post_to_telegraph, search_jw
 from misskaty.plugins.misc_tools import get_content
@@ -50,6 +50,7 @@ LOGGER = getLogger()
 @app.on_inline_query()
 async def inline_menu(_, inline_query: InlineQuery):
     if inline_query.query.strip().lower().strip() == "":
+        aspymon_ver = (await shell_exec("pip freeze | grep async-pymongo"))[0]
         buttons = InlineKeyboard(row_width=2)
         buttons.add(
             *[
@@ -59,8 +60,8 @@ async def inline_menu(_, inline_query: InlineQuery):
         )
 
         btn = InlineKeyboard(row_width=2)
-        bot_state = "Alive" if await app.get_me() else "Dead"
+        bot_state = "Alive" if USER_SESSION and await app.get_me() else "Dead"
-        ubot_state = "Alive" if await user.get_me() else "Dead"
+        ubot_state = "Alive" if USER_SESSION and await user.get_me() else "Dead"
         btn.add(
             InlineKeyboardButton("Stats", callback_data="stats_callback"),
             InlineKeyboardButton("Go Inline!", switch_inline_query_current_chat=""),
@@ -72,10 +73,12 @@ async def inline_menu(_, inline_query: InlineQuery):
 **UserBot:** `{ubot_state}`
 **Python:** `{pyver.split()[0]}`
 **Pyrogram:** `{pyrover}`
-**MongoDB:** `{mongover}`
+**MongoDB:** `{aspymon_ver}`
 **Platform:** `{platform}`
-**Profiles:** {(await app.get_me()).username} | {(await user.get_me()).first_name}
+**Profiles:** {(await app.get_me()).username}
         """
+        if USER_SESSION:
+            msg += f" | {(await user.get_me()).first_name}"
         answerss = [
             InlineQueryResultArticle(
                 title="Inline Commands",

requirements.txt

@@ -4,7 +4,6 @@ tgcrypto
 async_pymongo
 pymongo
 python-dotenv
-motor[srv]>=3.1.2
 requests
 bs4
 aiohttp