diff --git a/misskaty/plugins/__init__.py b/misskaty/plugins/__init__.py index 1287b949..385a555b 100644 --- a/misskaty/plugins/__init__.py +++ b/misskaty/plugins/__init__.py @@ -10,6 +10,7 @@ import importlib import sys from logging import getLogger from os.path import basename, dirname, isfile + from misskaty import MOD_LOAD, MOD_NOLOAD LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/admin.py b/misskaty/plugins/admin.py index 7b8cd4ff..b1ed8016 100644 --- a/misskaty/plugins/admin.py +++ b/misskaty/plugins/admin.py @@ -1,26 +1,19 @@ -import asyncio, re +import asyncio +import re from logging import getLogger -from misskaty import app -from misskaty.helper.functions import ( - extract_user_and_reason, - time_converter, - extract_user, - int_to_alpha, -) from time import time -from pyrogram import filters, enums -from pyrogram.errors import FloodWait, ChatAdminRequired + +from pyrogram import enums, filters +from pyrogram.errors import ChatAdminRequired, FloodWait from pyrogram.types import ChatPermissions -from misskaty.core.decorator.permissions import ( - adminsOnly, - admins_in_chat, - list_admins, - member_permissions, -) + +from database.warn_db import add_warn, get_warn, remove_warns +from misskaty import app from misskaty.core.decorator.errors import capture_err +from misskaty.core.decorator.permissions import admins_in_chat, adminsOnly, list_admins, member_permissions from misskaty.core.keyboard import ikb -from misskaty.vars import SUDO, COMMAND_HANDLER -from database.warn_db import get_warn, remove_warns, add_warn +from misskaty.helper.functions import extract_user, extract_user_and_reason, int_to_alpha, time_converter +from misskaty.vars import COMMAND_HANDLER, SUDO LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/afk.py b/misskaty/plugins/afk.py index 5c7b9eee..3287bef5 100644 --- a/misskaty/plugins/afk.py +++ b/misskaty/plugins/afk.py @@ -10,20 +10,14 @@ # Modified plugin by me from https://github.com/TeamYukki/YukkiAFKBot to make compatible with pyrogram v2 import time -from misskaty import app -from utils import put_cleanmode from pyrogram import filters -from misskaty.vars import COMMAND_HANDLER -from database.afk_db import ( - remove_afk, - is_afk, - add_afk, - cleanmode_off, - cleanmode_on, -) -from misskaty.helper.human_read import get_readable_time2 +from database.afk_db import add_afk, cleanmode_off, cleanmode_on, is_afk, remove_afk +from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.core.decorator.permissions import adminsOnly +from misskaty.helper.human_read import get_readable_time2 +from misskaty.vars import COMMAND_HANDLER +from utils import put_cleanmode __MODULE__ = "AFK" __HELP__ = """/afk [Reason > Optional] - Tell others that you are AFK (Away From Keyboard), so that your boyfriend or girlfriend won't look for you 💔. diff --git a/misskaty/plugins/auto_approve.py b/misskaty/plugins/auto_approve.py index a55c5d3f..51a4e76e 100644 --- a/misskaty/plugins/auto_approve.py +++ b/misskaty/plugins/auto_approve.py @@ -5,10 +5,11 @@ * @projectName MissKatyPyro * Copyright @YasirPedia All rights reserved """ -from misskaty import app from pyrogram import filters +from pyrogram.errors import UserAlreadyParticipant, UserIsBlocked from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from pyrogram.errors import UserIsBlocked, UserAlreadyParticipant + +from misskaty import app from misskaty.core.decorator.errors import capture_err diff --git a/misskaty/plugins/auto_forwarder.py b/misskaty/plugins/auto_forwarder.py index dcbc3ff1..b170c1c5 100644 --- a/misskaty/plugins/auto_forwarder.py +++ b/misskaty/plugins/auto_forwarder.py @@ -1,18 +1,13 @@ # Code copy from https://github.com/AbirHasan2005/Forward-Client -from misskaty import user -from logging import getLogger -from pyrogram import filters from asyncio import sleep -from pyrogram.types import Message +from logging import getLogger + +from pyrogram import filters from pyrogram.errors import FloodWait -from misskaty.vars import ( - FORWARD_FILTERS, - BLOCK_FILES_WITHOUT_EXTENSIONS, - BLOCKED_EXTENSIONS, - FORWARD_FROM_CHAT_ID, - FORWARD_TO_CHAT_ID, - MINIMUM_FILE_SIZE, -) +from pyrogram.types import Message + +from misskaty import user +from misskaty.vars import BLOCK_FILES_WITHOUT_EXTENSIONS, BLOCKED_EXTENSIONS, FORWARD_FILTERS, FORWARD_FROM_CHAT_ID, FORWARD_TO_CHAT_ID, MINIMUM_FILE_SIZE LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/banned.py b/misskaty/plugins/banned.py index 34a09efd..ea2f9d9a 100644 --- a/misskaty/plugins/banned.py +++ b/misskaty/plugins/banned.py @@ -1,10 +1,10 @@ from pyrogram import filters -from utils import temp -from pyrogram.types import Message +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message + from database.users_chats_db import db -from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from misskaty.vars import SUPPORT_CHAT from misskaty import app +from misskaty.vars import SUPPORT_CHAT +from utils import temp async def banned_users(_, client, message: Message): diff --git a/misskaty/plugins/broadcast.py b/misskaty/plugins/broadcast.py index 626f3d77..c411ec60 100644 --- a/misskaty/plugins/broadcast.py +++ b/misskaty/plugins/broadcast.py @@ -1,11 +1,12 @@ -from pyrogram import filters +import asyncio import datetime import time + +from pyrogram import filters from database.users_chats_db import db +from misskaty import app from misskaty.vars import SUDO from utils import broadcast_messages -import asyncio -from misskaty import app @app.on_message(filters.command("broadcast") & filters.user(SUDO) & filters.reply) diff --git a/misskaty/plugins/bypass.py b/misskaty/plugins/bypass.py index 0ae32a9e..646afcad 100644 --- a/misskaty/plugins/bypass.py +++ b/misskaty/plugins/bypass.py @@ -5,18 +5,21 @@ * @projectName MissKatyPyro * Copyright @YasirPedia All rights reserved """ -import re, requests +import re import urllib.parse -from misskaty.helper.http import http -from misskaty import app -from pyrogram import filters -from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from pyrogram.errors import MessageTooLong, EntitiesTooLong -from misskaty.vars import COMMAND_HANDLER -from misskaty.helper.tools import rentry from urllib.parse import unquote + +import requests +from pyrogram import filters +from pyrogram.errors import EntitiesTooLong, MessageTooLong +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + +from misskaty import app from misskaty.core.decorator.errors import capture_err +from misskaty.helper.http import http from misskaty.helper.human_read import get_readable_file_size +from misskaty.helper.tools import rentry +from misskaty.vars import COMMAND_HANDLER LIST_LINK = """ - Pling and all aliases. diff --git a/misskaty/plugins/chatbot.py b/misskaty/plugins/chatbot.py index 8471eee5..00a410d2 100644 --- a/misskaty/plugins/chatbot.py +++ b/misskaty/plugins/chatbot.py @@ -1,8 +1,9 @@ -from misskaty import app -from misskaty.vars import COMMAND_HANDLER, OPENAI_API from pyrogram import filters from pyrogram.errors import MessageNotModified + +from misskaty import app from misskaty.helper.http import http +from misskaty.vars import COMMAND_HANDLER, OPENAI_API @app.on_message(filters.command("ask", COMMAND_HANDLER)) diff --git a/misskaty/plugins/code_tester.py b/misskaty/plugins/code_tester.py index 5038eee0..53a845c9 100644 --- a/misskaty/plugins/code_tester.py +++ b/misskaty/plugins/code_tester.py @@ -1,6 +1,7 @@ import aiohttp from pyrogram import enums, filters from pyrogram.errors import MessageTooLong + from misskaty import app from misskaty.helper.tools import rentry from misskaty.vars import COMMAND_HANDLER diff --git a/misskaty/plugins/copy_forward.py b/misskaty/plugins/copy_forward.py index 7c3f8041..16c5981d 100644 --- a/misskaty/plugins/copy_forward.py +++ b/misskaty/plugins/copy_forward.py @@ -1,9 +1,10 @@ -from pyrogram import filters, enums +from pyrogram import enums, filters from pyrogram.errors import UserIsBlocked, UserNotParticipant -from misskaty.vars import COMMAND_HANDLER from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + +from misskaty import BOT_USERNAME, app from misskaty.core.decorator.errors import capture_err -from misskaty import app, BOT_USERNAME +from misskaty.vars import COMMAND_HANDLER @app.on_message(filters.command(["copy"], COMMAND_HANDLER)) diff --git a/misskaty/plugins/detect_afk.py b/misskaty/plugins/detect_afk.py index e2b08126..ce93a984 100644 --- a/misskaty/plugins/detect_afk.py +++ b/misskaty/plugins/detect_afk.py @@ -11,11 +11,14 @@ # Modified plugin by me from https://github.com/TeamYukki/YukkiAFKBot to make compatible with pyrogram v2 import re import time -from utils import put_cleanmode -from misskaty import app, BOT_USERNAME -from pyrogram import filters, enums -from database.afk_db import remove_afk, is_afk + +from pyrogram import enums, filters + +from database.afk_db import is_afk, remove_afk +from misskaty import BOT_USERNAME, app from misskaty.helper.human_read import get_readable_time2 +from utils import put_cleanmode + # Detect user that AFK based on Yukki Repo @app.on_message( diff --git a/misskaty/plugins/dev.py b/misskaty/plugins/dev.py index 3c1309c1..3dcc8896 100644 --- a/misskaty/plugins/dev.py +++ b/misskaty/plugins/dev.py @@ -1,10 +1,12 @@ -import io -import sys -import os -import traceback import asyncio -from pyrogram import filters, enums -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton +import io +import os +import sys +import traceback + +from pyrogram import enums, filters +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + from misskaty import app from misskaty.vars import COMMAND_HANDLER, SUDO diff --git a/misskaty/plugins/download_upload.py b/misskaty/plugins/download_upload.py index 8f7f8ddb..5ecc5909 100644 --- a/misskaty/plugins/download_upload.py +++ b/misskaty/plugins/download_upload.py @@ -1,20 +1,19 @@ -import time import asyncio import math import os -from misskaty.helper.http import http -from logging import getLogger -from misskaty import app -from pySmartDL import SmartDL +import time from datetime import datetime -from misskaty.core.decorator.errors import capture_err -from misskaty.vars import COMMAND_HANDLER, SUDO +from logging import getLogger + from pyrogram import filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton -from misskaty.helper.pyro_progress import ( - progress_for_pyrogram, - humanbytes, -) +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup +from pySmartDL import SmartDL + +from misskaty import app +from misskaty.core.decorator.errors import capture_err +from misskaty.helper.http import http +from misskaty.helper.pyro_progress import humanbytes, progress_for_pyrogram +from misskaty.vars import COMMAND_HANDLER, SUDO LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/filter_request.py b/misskaty/plugins/filter_request.py index 11c4dedd..00e898f1 100644 --- a/misskaty/plugins/filter_request.py +++ b/misskaty/plugins/filter_request.py @@ -1,10 +1,12 @@ -import re import random -from misskaty import app -from pyrogram import enums, filters +import re + from apscheduler.schedulers.asyncio import AsyncIOScheduler +from pyrogram import enums, filters +from pyrogram.errors import PeerIdInvalid, UserNotParticipant from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from pyrogram.errors import UserNotParticipant, PeerIdInvalid + +from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.helper.time_gap import check_time_gap diff --git a/misskaty/plugins/filters.py b/misskaty/plugins/filters.py index 0c8eaf9f..49f5c91d 100644 --- a/misskaty/plugins/filters.py +++ b/misskaty/plugins/filters.py @@ -22,17 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ import re + from pyrogram import filters + +from database.filters_db import delete_filter, get_filter, get_filters_names, save_filter from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.core.decorator.permissions import adminsOnly from misskaty.core.keyboard import ikb -from database.filters_db import ( - delete_filter, - get_filter, - get_filters_names, - save_filter, -) from misskaty.helper.functions import extract_text_and_keyb __MODULE__ = "Filters" diff --git a/misskaty/plugins/genss.py b/misskaty/plugins/genss.py index a8295a6a..a244dab3 100644 --- a/misskaty/plugins/genss.py +++ b/misskaty/plugins/genss.py @@ -5,17 +5,21 @@ * @projectName MissKatyPyro * Copyright @YasirPedia All rights reserved """ -import os, time, traceback -from asyncio import sleep, gather -from shutil import rmtree +import os +import time +import traceback +from asyncio import gather, sleep from logging import getLogger -from pyrogram import filters, enums +from shutil import rmtree + +from pyrogram import enums, filters from pyrogram.errors import FloodWait -from misskaty import app, BOT_USERNAME -from misskaty.helper.ffmpeg_helper import take_ss, genss_link -from misskaty.vars import COMMAND_HANDLER + +from misskaty import BOT_USERNAME, app from misskaty.core.decorator.errors import capture_err +from misskaty.helper.ffmpeg_helper import genss_link, take_ss from misskaty.helper.pyro_progress import progress_for_pyrogram +from misskaty.vars import COMMAND_HANDLER LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/grup_tools.py b/misskaty/plugins/grup_tools.py index b5dc71b5..65e37dd5 100644 --- a/misskaty/plugins/grup_tools.py +++ b/misskaty/plugins/grup_tools.py @@ -1,24 +1,20 @@ -from datetime import datetime, timedelta -import time import os -from logging import getLogger -from misskaty.helper.http import http -from pyrogram import enums, filters -from pyrogram.types import ChatMemberUpdated, InlineKeyboardButton, InlineKeyboardMarkup -from pyrogram.errors import ( - ChatSendMediaForbidden, - MessageTooLong, - RPCError, - SlowmodeWait, -) -from misskaty import app, BOT_USERNAME -from misskaty.core.decorator.errors import capture_err, asyncify -from PIL import Image, ImageChops, ImageDraw, ImageFont import textwrap +import time +from datetime import datetime, timedelta +from logging import getLogger + +from PIL import Image, ImageChops, ImageDraw, ImageFont +from pyrogram import enums, filters +from pyrogram.errors import ChatAdminRequired, ChatSendMediaForbidden, MessageTooLong, RPCError, SlowmodeWait +from pyrogram.types import ChatMemberUpdated, InlineKeyboardButton, InlineKeyboardMarkup + from database.users_chats_db import db +from misskaty import BOT_USERNAME, app +from misskaty.core.decorator.errors import asyncify, capture_err +from misskaty.helper.http import http +from misskaty.vars import COMMAND_HANDLER, LOG_CHANNEL, SUDO, SUPPORT_CHAT from utils import temp -from pyrogram.errors import ChatAdminRequired -from misskaty.vars import SUDO, LOG_CHANNEL, SUPPORT_CHAT, COMMAND_HANDLER LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/imdb_search.py b/misskaty/plugins/imdb_search.py index 175a88a5..2383abff 100644 --- a/misskaty/plugins/imdb_search.py +++ b/misskaty/plugins/imdb_search.py @@ -1,19 +1,14 @@ import json import logging -from utils import demoji -from pykeyboard import InlineKeyboard, InlineButton -from pyrogram.types import ( - InlineKeyboardMarkup, - InlineKeyboardButton, - CallbackQuery, - InputMediaPhoto, -) -from pyrogram.errors import MessageNotModified, MediaEmpty, PhotoInvalidDimensions, WebpageMediaEmpty +import re + +from bs4 import BeautifulSoup from deep_translator import GoogleTranslator from pykeyboard import InlineButton, InlineKeyboard from pyrogram import filters from pyrogram.errors import MediaEmpty, MessageNotModified, PhotoInvalidDimensions, WebpageMediaEmpty from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, InputMediaPhoto + from misskaty import BOT_USERNAME, app from misskaty.core.decorator.errors import capture_err from misskaty.helper.http import http @@ -321,8 +316,7 @@ async def imdb_id_callback(bot, query): await query.message.edit_caption(res_str, reply_markup=markup) except MessageNotModified: pass - except Exception: - exc = traceback.format_exc() + except Exception as exc: await query.message.edit_caption(f"ERROR:\n{exc}") @@ -502,6 +496,5 @@ async def imdb_en_callback(bot, query): await query.message.edit_caption(res_str, reply_markup=markup) else: await query.message.edit_caption(res_str, reply_markup=markup) - except Exception: - exc = traceback.format_exc() + except Exception as exc: await query.message.edit_caption(f"ERROR:\n{exc}") diff --git a/misskaty/plugins/inkick_user.py b/misskaty/plugins/inkick_user.py index 638ad041..e86e7963 100644 --- a/misskaty/plugins/inkick_user.py +++ b/misskaty/plugins/inkick_user.py @@ -1,14 +1,13 @@ import time from asyncio import sleep -from misskaty import app -from misskaty.vars import COMMAND_HANDLER + from pyrogram import enums, filters from pyrogram.errors import FloodWait +from pyrogram.errors.exceptions.bad_request_400 import ChatAdminRequired, UserAdminInvalid from pyrogram.errors.exceptions.forbidden_403 import ChatWriteForbidden -from pyrogram.errors.exceptions.bad_request_400 import ( - ChatAdminRequired, - UserAdminInvalid, -) + +from misskaty import app +from misskaty.vars import COMMAND_HANDLER __MODULE__ = "Inkick" __HELP__ = """" diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py index f1778041..9c2378e0 100644 --- a/misskaty/plugins/inline_search.py +++ b/misskaty/plugins/inline_search.py @@ -1,24 +1,21 @@ -import json, traceback -from sys import version as pyver, platform -from misskaty import app, user, BOT_USERNAME +import json +import traceback +from sys import platform +from sys import version as pyver + +from bs4 import BeautifulSoup +from deep_translator import GoogleTranslator from motor import version as mongover -from misskaty.plugins.misc_tools import get_content +from pykeyboard import InlineKeyboard from pyrogram import __version__ as pyrover +from pyrogram import enums, filters +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, InlineQuery, InlineQueryResultArticle, InlineQueryResultPhoto, InputTextMessageContent + +from misskaty import BOT_USERNAME, app, user from misskaty.helper.http import http from misskaty.helper.tools import GENRES_EMOJI -from pyrogram import filters, enums -from bs4 import BeautifulSoup +from misskaty.plugins.misc_tools import get_content from utils import demoji -from pykeyboard import InlineKeyboard -from deep_translator import GoogleTranslator -from pyrogram.types import ( - InlineKeyboardButton, - InlineKeyboardMarkup, - InlineQuery, - InlineQueryResultArticle, - InputTextMessageContent, - InlineQueryResultPhoto, -) __MODULE__ = "InlineFeature" __HELP__ = """ diff --git a/misskaty/plugins/json.py b/misskaty/plugins/json.py index bc3086b4..1b29919c 100644 --- a/misskaty/plugins/json.py +++ b/misskaty/plugins/json.py @@ -7,8 +7,10 @@ """ import os + from pyrogram import filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + from misskaty import app from misskaty.vars import COMMAND_HANDLER diff --git a/misskaty/plugins/karma.py b/misskaty/plugins/karma.py index 20bb08fb..06657e59 100644 --- a/misskaty/plugins/karma.py +++ b/misskaty/plugins/karma.py @@ -1,17 +1,12 @@ import re + from pyrogram import filters + +from database.karma_db import get_karma, get_karmas, is_karma_on, karma_off, karma_on, update_karma from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.core.decorator.permissions import adminsOnly from misskaty.helper.functions import alpha_to_int, int_to_alpha -from database.karma_db import ( - get_karma, - get_karmas, - is_karma_on, - karma_off, - karma_on, - update_karma, -) __MODULE__ = "Karma" __HELP__ = """ diff --git a/misskaty/plugins/memify.py b/misskaty/plugins/memify.py index 819e574b..21534698 100644 --- a/misskaty/plugins/memify.py +++ b/misskaty/plugins/memify.py @@ -1,10 +1,12 @@ import textwrap from os import remove as hapus -from misskaty.core.decorator.errors import capture_err -from misskaty import app + +from PIL import Image, ImageDraw, ImageFont from pyrogram import filters + +from misskaty import app +from misskaty.core.decorator.errors import capture_err from misskaty.vars import COMMAND_HANDLER -from PIL import Image, ImageFont, ImageDraw async def draw_meme_text(image_path, text): diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py index 425e4453..d3965916 100644 --- a/misskaty/plugins/misc_tools.py +++ b/misskaty/plugins/misc_tools.py @@ -6,32 +6,28 @@ * Copyright @YasirPedia All rights reserved """ -import os -import aiohttp -from bs4 import BeautifulSoup import json -import traceback -from pyrogram import Client, filters -from deep_translator import GoogleTranslator -from gtts import gTTS -from pyrogram.errors import ( - UserNotParticipant, - MessageTooLong, -) -from utils import extract_user, get_file_id +import os import time +import traceback from datetime import datetime from logging import getLogger -from pyrogram.types import ( - InlineKeyboardMarkup, - InlineKeyboardButton, - CallbackQuery, -) + +import aiohttp +from bs4 import BeautifulSoup +from deep_translator import GoogleTranslator +from gtts import gTTS +from pyrogram import Client, filters +from pyrogram.errors import MessageTooLong, UserNotParticipant +from pyrogram.types import (CallbackQuery, InlineKeyboardButton, + InlineKeyboardMarkup) + +from misskaty import BOT_USERNAME, app from misskaty.core.decorator.errors import capture_err +from misskaty.helper.http import http from misskaty.helper.tools import rentry from misskaty.vars import COMMAND_HANDLER -from misskaty.helper.http import http -from misskaty import app, BOT_USERNAME +from utils import extract_user, get_file_id LOGGER = getLogger(__name__) @@ -141,7 +137,7 @@ async def translate(client, message): result = my_translator.translate(text=text) await msg.edit(f"Translation using source = {my_translator.source} and target = {my_translator.target}\n\n-> {result}") except MessageTooLong: - url = await rentry(tekstr.text) + url = await rentry(result) await msg.edit(f"Your translated text pasted to rentry because has long text:\n{url}") except Exception as err: await msg.edit(f"Error: {str(err)}") diff --git a/misskaty/plugins/nightmode.py b/misskaty/plugins/nightmode.py index f3d00afd..e0c95a2d 100644 --- a/misskaty/plugins/nightmode.py +++ b/misskaty/plugins/nightmode.py @@ -1,12 +1,13 @@ # Auto Close and Open Group, I dont have time to add Database Support -from pyrogram.types import ChatPermissions -from pyrogram import Client, __version__, filters -from apscheduler.schedulers.asyncio import AsyncIOScheduler -import pytz import traceback -from misskaty import app, BOT_USERNAME from datetime import datetime -from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, CallbackQuery + +import pytz +from apscheduler.schedulers.asyncio import AsyncIOScheduler +from pyrogram import Client, __version__, filters +from pyrogram.types import CallbackQuery, ChatPermissions, InlineKeyboardButton, InlineKeyboardMarkup + +from misskaty import BOT_USERNAME, app from misskaty.vars import LOG_CHANNEL, NIGHTMODE diff --git a/misskaty/plugins/notes.py b/misskaty/plugins/notes.py index 2095d6ae..09ea7226 100644 --- a/misskaty/plugins/notes.py +++ b/misskaty/plugins/notes.py @@ -22,17 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ from re import findall + from pyrogram import filters + +from database.notes_db import delete_note, get_note, get_note_names, save_note from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.core.decorator.permissions import adminsOnly from misskaty.core.keyboard import ikb -from database.notes_db import ( - delete_note, - get_note, - get_note_names, - save_note, -) from misskaty.helper.functions import extract_text_and_keyb __MODULE__ = "Notes" diff --git a/misskaty/plugins/ocr.py b/misskaty/plugins/ocr.py index f0d5b3f6..477c7694 100644 --- a/misskaty/plugins/ocr.py +++ b/misskaty/plugins/ocr.py @@ -6,12 +6,14 @@ * Copyright @YasirPedia All rights reserved """ import os + from pyrogram import filters from telegraph import upload_file -from misskaty.vars import COMMAND_HANDLER + from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.helper.http import http +from misskaty.vars import COMMAND_HANDLER __MODULE__ = "OCR" __HELP__ = "/ocr [reply to photo] - Read Text From Image" diff --git a/misskaty/plugins/paste.py b/misskaty/plugins/paste.py index 94f723fe..8d873e74 100644 --- a/misskaty/plugins/paste.py +++ b/misskaty/plugins/paste.py @@ -5,15 +5,17 @@ * @projectName MissKatyPyro * Copyright @YasirPedia All rights reserved """ +from json import loads as json_loads from os import remove from re import compile as compiles -from misskaty.helper.http import http + from pyrogram import filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton -from json import loads as json_loads +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + from misskaty import app -from misskaty.vars import COMMAND_HANDLER +from misskaty.helper.http import http from misskaty.helper.tools import rentry +from misskaty.vars import COMMAND_HANDLER __MODULE__ = "Paste" __HELP__ = """ diff --git a/misskaty/plugins/ping.py b/misskaty/plugins/ping.py index 3b06315c..08acd06b 100644 --- a/misskaty/plugins/ping.py +++ b/misskaty/plugins/ping.py @@ -6,13 +6,15 @@ * Copyright @YasirPedia All rights reserved """ import time -from re import findall, MULTILINE from asyncio import Lock +from re import MULTILINE, findall +from subprocess import run as srun + from pyrogram import filters -from misskaty.vars import COMMAND_HANDLER + from misskaty import app, botStartTime from misskaty.helper.human_read import get_readable_time -from subprocess import run as srun +from misskaty.vars import COMMAND_HANDLER @app.on_message(filters.command(["ping"], COMMAND_HANDLER)) diff --git a/misskaty/plugins/quotly.py b/misskaty/plugins/quotly.py index 2894310d..5cca75e4 100644 --- a/misskaty/plugins/quotly.py +++ b/misskaty/plugins/quotly.py @@ -1,8 +1,10 @@ +from io import BytesIO + from pyrogram import Client, filters from pyrogram.types import Message + from misskaty import app from misskaty.helper.http import http -from io import BytesIO __MODULE__ = "Fun" __HELP__ = """ diff --git a/misskaty/plugins/scrapwebsite.py b/misskaty/plugins/scrapwebsite.py index 4586bb48..ab27f504 100644 --- a/misskaty/plugins/scrapwebsite.py +++ b/misskaty/plugins/scrapwebsite.py @@ -6,17 +6,18 @@ * Copyright @YasirPedia All rights reserved """ -# This plugin to scrape from melongmovie, lk21, pahe and many more -from bs4 import BeautifulSoup -import re import asyncio +import re from logging import getLogger -from misskaty import app + +from bs4 import BeautifulSoup from pyrogram import filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton -from misskaty.vars import COMMAND_HANDLER +from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup + +from misskaty import app from misskaty.core.decorator.errors import capture_err from misskaty.helper.http import http +from misskaty.vars import COMMAND_HANDLER __MODULE__ = "WebScraper" __HELP__ = """ diff --git a/misskaty/plugins/sed.py b/misskaty/plugins/sed.py index b6124360..92015ed7 100644 --- a/misskaty/plugins/sed.py +++ b/misskaty/plugins/sed.py @@ -2,11 +2,10 @@ # Copyright (c) 2018-2022 Amano Team import html - import regex from pyrogram import filters -from pyrogram.types import Message from pyrogram.errors import MessageEmpty +from pyrogram.types import Message from misskaty import app diff --git a/misskaty/plugins/stickers.py b/misskaty/plugins/stickers.py index 7b7f2618..b70b6c6d 100644 --- a/misskaty/plugins/stickers.py +++ b/misskaty/plugins/stickers.py @@ -1,29 +1,20 @@ +import asyncio import os +import re import shutil import tempfile -import asyncio -import re from PIL import Image -from misskaty.helper.http import http from pyrogram import emoji, filters +from pyrogram.errors import BadRequest, PeerIdInvalid, StickersetInvalid from pyrogram.file_id import FileId -from pyrogram.errors import PeerIdInvalid, StickersetInvalid, BadRequest from pyrogram.raw.functions.messages import GetStickerSet, SendMedia -from pyrogram.raw.functions.stickers import ( - AddStickerToSet, - CreateStickerSet, - RemoveStickerFromSet, -) +from pyrogram.raw.functions.stickers import AddStickerToSet, CreateStickerSet, RemoveStickerFromSet +from pyrogram.raw.types import DocumentAttributeFilename, InputDocument, InputMediaUploadedDocument, InputStickerSetItem, InputStickerSetShortName from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from pyrogram.raw.types import ( - DocumentAttributeFilename, - InputDocument, - InputMediaUploadedDocument, - InputStickerSetItem, - InputStickerSetShortName, -) -from misskaty import app, BOT_USERNAME + +from misskaty import BOT_USERNAME, app +from misskaty.helper.http import http from misskaty.vars import COMMAND_HANDLER, LOG_CHANNEL __MODULE__ = "Stickers" diff --git a/misskaty/plugins/sub_extractor.py b/misskaty/plugins/sub_extractor.py index b59bb73e..045e638a 100644 --- a/misskaty/plugins/sub_extractor.py +++ b/misskaty/plugins/sub_extractor.py @@ -4,19 +4,24 @@ * @projectName MissKatyPyro * Copyright @YasirPedia All rights reserved """ -from misskaty import app +import json +import os +import traceback from logging import getLogger +from re import I +from re import split as ngesplit +from time import perf_counter, time +from urllib.parse import unquote + from pyrogram import filters from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from misskaty.vars import COMMAND_HANDLER + +from misskaty import app from misskaty.core.decorator.errors import capture_err -from misskaty.plugins.dev import shell_exec -import json, os, traceback -from time import perf_counter, time -from re import split as ngesplit, I -from urllib.parse import unquote -from misskaty.helper.tools import get_random_string from misskaty.helper.pyro_progress import progress_for_pyrogram +from misskaty.helper.tools import get_random_string +from misskaty.plugins.dev import shell_exec +from misskaty.vars import COMMAND_HANDLER LOGGER = getLogger(__name__) diff --git a/misskaty/plugins/tes_session.py b/misskaty/plugins/tes_session.py index aa44d109..fc1ea021 100644 --- a/misskaty/plugins/tes_session.py +++ b/misskaty/plugins/tes_session.py @@ -1,7 +1,8 @@ # This plugin to learn session using pyrogram +from pyrogram import filters + from misskaty import app from misskaty.vars import COMMAND_HANDLER -from pyrogram import filters @app.on_message(filters.command(["session"], COMMAND_HANDLER)) diff --git a/misskaty/plugins/ubot_plugin.py b/misskaty/plugins/ubot_plugin.py index 381478af..d2a07b21 100644 --- a/misskaty/plugins/ubot_plugin.py +++ b/misskaty/plugins/ubot_plugin.py @@ -7,17 +7,14 @@ """ # Code in this plugin to learn basic userbot in pyrogram import os -from pyrogram import enums, filters -from pyrogram.types import ( - Message, - InlineKeyboardMarkup, - InlineKeyboardButton, - ChatEventFilter, -) -from pyrogram.raw import functions -from misskaty import user, app from datetime import datetime +from pyrogram import enums, filters +from pyrogram.raw import functions +from pyrogram.types import ChatEventFilter, InlineKeyboardButton, InlineKeyboardMarkup, Message + +from misskaty import app, user + f = filters.chat([]) diff --git a/misskaty/plugins/webss.py b/misskaty/plugins/webss.py index 74f5fd38..158518fe 100644 --- a/misskaty/plugins/webss.py +++ b/misskaty/plugins/webss.py @@ -2,12 +2,14 @@ import base64 import os from asyncio import gather from io import BytesIO -from pyrogram import filters + from PIL import Image +from pyrogram import filters + from misskaty import app +from misskaty.core.decorator.errors import capture_err from misskaty.helper.http import http from misskaty.vars import COMMAND_HANDLER -from misskaty.core.decorator.errors import capture_err __MODULE__ = "WebSS" __HELP__ = """ diff --git a/misskaty/plugins/ytdl_download_new.py b/misskaty/plugins/ytdl_download_new.py index 1e0e1cab..cf1a20ab 100644 --- a/misskaty/plugins/ytdl_download_new.py +++ b/misskaty/plugins/ytdl_download_new.py @@ -1,18 +1,15 @@ -from re import compile as recompile from logging import getLogger +from re import compile as recompile +from uuid import uuid4 + +from iytdl import iYTDL, main +from pyrogram import filters +from pyrogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, InputMediaPhoto + from misskaty import app -from misskaty.vars import COMMAND_HANDLER, LOG_CHANNEL from misskaty.core.decorator.errors import capture_err from misskaty.helper.http import http -from pyrogram import filters -from pyrogram.types import ( - InlineKeyboardButton, - InlineKeyboardMarkup, - CallbackQuery, - InputMediaPhoto, -) -from iytdl import iYTDL, main -from uuid import uuid4 +from misskaty.vars import COMMAND_HANDLER, LOG_CHANNEL LOGGER = getLogger(__name__) regex = recompile(r"(https?://)?(www\.)?(youtube|youtu|youtube-nocookie)\.(com|be)/(watch\?v=|embed/|v/|.+\?v=)?(?P[A-Za-z0-9\-=_]{11})")