From 7bae8fdac60da94cc2af97f6f9bde4e60a304245 Mon Sep 17 00:00:00 2001 From: allinoneallinone00 Date: Thu, 2 May 2024 00:07:20 +0000 Subject: [PATCH] Done ig --- app.py | 1 + main.py | 14 ++++++++------ modules/sessionkiller.py | 4 ++-- modules/shell.py | 1 + utils/__init__.py | 1 - utils/db.py | 1 + utils/lexicapi.py | 5 ++++- utils/scripts.py | 1 + 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app.py b/app.py index ed094a9..08abe22 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,7 @@ from flask import Flask app = Flask(__name__) + @app.route('/') def hello_world(): return 'This is Moon' diff --git a/main.py b/main.py index 8c5f845..052ca02 100644 --- a/main.py +++ b/main.py @@ -53,6 +53,7 @@ if config.STRINGSESSION: app = Client("my_account", **common_params) + async def main(): logging.basicConfig( format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", @@ -73,9 +74,10 @@ async def main(): raise except (errors.NotAcceptable, errors.Unauthorized) as e: logging.error( - f"{e.__class__.__name__}: {e}\n" - f"Moving session file to my_account.session-old..." - ) + "%s: %s\nMoving session file to my_account.session-old..." % ( + e.__class__.__name__, e + ) + ) os.rename("./my_account.session", "./my_account.session-old") restart() @@ -88,14 +90,14 @@ async def main(): path.stem, app, core="custom_modules" not in path.parent.parts ) except Exception: - logging.warning(f"Can't import module {path.stem}", exc_info=True) + logging.warning("Can't import module %s", path.stem, exc_info=True) failed_modules += 1 else: success_modules += 1 - logging.info(f"Imported {success_modules} modules") + logging.info("Imported %s modules", success_modules) if failed_modules: - logging.warning(f"Failed to import {failed_modules} modules") + logging.warning("Failed to import %s modules", failed_modules) if info := db.get("core.updater", "restart_info"): text = { diff --git a/modules/sessionkiller.py b/modules/sessionkiller.py index 0e448b6..2593f1a 100644 --- a/modules/sessionkiller.py +++ b/modules/sessionkiller.py @@ -40,8 +40,8 @@ async def sessions_list(client: Client, message: Message): for num, session in enumerate(sessions, 1): formatted_sessions.append( f"{num}. {escape(session.device_model)} on {escape(session.platform if session.platform!= '' else 'unknown platform')}\n" - f"Hash: {escape(session.hash)}\n" - f"App name: {escape(session.app_name)} v.{escape(session.app_version if session.app_version!= '' else 'unknown')}\n" + f"Hash: {session.hash}\n" + f"App name: {escape(session.app_name)} v.{escape(session.app_version if session.app_version!= '' else 'unknown')}\n" f"Created (last activity): {datetime.fromtimestamp(session.date_created).isoformat()} ({datetime.fromtimestamp(session.date_active).isoformat()})\n" f"IP and location: : {session.ip} ({session.country})\n" f"Official status: {'✅' if session.official_app else '❌️'}\n" diff --git a/modules/shell.py b/modules/shell.py index f8437f8..6dc5ff5 100644 --- a/modules/shell.py +++ b/modules/shell.py @@ -23,6 +23,7 @@ from pyrogram.types import Message from utils.misc import modules_help, prefix + @Client.on_message(filters.command(["shell", "sh"], prefix) & filters.me) async def shell(_, message: Message): if len(message.command) < 2: diff --git a/utils/__init__.py b/utils/__init__.py index 8b13789..e69de29 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -1 +0,0 @@ - diff --git a/utils/db.py b/utils/db.py index b32011c..880cdd3 100644 --- a/utils/db.py +++ b/utils/db.py @@ -228,6 +228,7 @@ class SqliteDatabase(Database): def getaiusers(self): return self.get("core.chatbot", "chatai_users", default=[]) + if config.db_type in ["mongo", "mongodb"]: db = MongoDatabase(config.db_url, config.db_name) else: diff --git a/utils/lexicapi.py b/utils/lexicapi.py index a64f6a1..31cec51 100644 --- a/utils/lexicapi.py +++ b/utils/lexicapi.py @@ -3,6 +3,7 @@ import logging import asyncio from lexica import AsyncClient, Client + def ImageModels(): models = Client().models['models']['image'] dict_models = {} @@ -12,7 +13,8 @@ def ImageModels(): dict_models[model_name] = model_id return dict_models -async def ImageGeneration(model,prompt): + +async def ImageGeneration(model, prompt): try: output = await AsyncClient().generate(model, prompt, "") if output['code'] != 1: @@ -40,6 +42,7 @@ async def ImageGeneration(model,prompt): finally: await AsyncClient().close() + async def UpscaleImages(image: bytes) -> str: content = await AsyncClient().upscale(image) await AsyncClient().close() diff --git a/utils/scripts.py b/utils/scripts.py index 024af43..2e514b5 100644 --- a/utils/scripts.py +++ b/utils/scripts.py @@ -444,6 +444,7 @@ def parse_meta_comments(code: str) -> Dict[str, str]: return {groups[i]: groups[i + 1] for i in range(0, len(groups), 2)} + def ReplyCheck(message: Message): reply_id = None