Try fix google cmd and add minor fix

This commit is contained in:
yasirarism 2023-08-26 22:07:29 +07:00 committed by GitHub
parent 7711d032c5
commit 45e38993f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 26 deletions

View file

@ -24,7 +24,7 @@ from misskaty.vars import (
basicConfig( basicConfig(
level=INFO, level=INFO,
format="[%(asctime)s - %(levelname)s] - %(name)s.%(funcName)s - %(message)s", format="[%(levelname)s] - [%(asctime)s - %(name)s - %(message)s] -> [%(module)s:%(lineno)d]",
datefmt="%d-%b-%y %H:%M:%S", datefmt="%d-%b-%y %H:%M:%S",
handlers=[ handlers=[
handlers.RotatingFileHandler("MissKatyLogs.txt", mode="w+", maxBytes=1000000), handlers.RotatingFileHandler("MissKatyLogs.txt", mode="w+", maxBytes=1000000),
@ -41,7 +41,7 @@ MOD_NOLOAD = ["subscene_dl"]
HELPABLE = {} HELPABLE = {}
cleanmode = {} cleanmode = {}
botStartTime = time.time() botStartTime = time.time()
misskaty_version = "v2.10.13 - Stable" misskaty_version = "v2.10.14 - Stable"
# Pyrogram Bot Client # Pyrogram Bot Client
app = Client( app = Client(
@ -50,6 +50,10 @@ app = Client(
api_hash=API_HASH, api_hash=API_HASH,
bot_token=BOT_TOKEN, bot_token=BOT_TOKEN,
mongodb=dict(connection=AsyncClient(DATABASE_URI), remove_peers=False), mongodb=dict(connection=AsyncClient(DATABASE_URI), remove_peers=False),
sleep_threshold=180,
app_version="MissKatyPyro Stable",
max_concurrent_transmissions=5,
workers=50,
) )
# Pyrogram UserBot Client # Pyrogram UserBot Client
@ -57,6 +61,7 @@ user = Client(
"YasirUBot", "YasirUBot",
session_string=USER_SESSION, session_string=USER_SESSION,
mongodb=dict(connection=AsyncClient(DATABASE_URI), remove_peers=False), mongodb=dict(connection=AsyncClient(DATABASE_URI), remove_peers=False),
sleep_threshold=180,
) )
jobstores = { jobstores = {

View file

@ -417,7 +417,7 @@ async def cmd_eval(self: Client, ctx: Message, strings) -> Optional[str]:
"send": send, "send": send,
"stdout": out_buf, "stdout": out_buf,
"traceback": traceback, "traceback": traceback,
"http": fetch, "fetch": fetch,
"replied": ctx.reply_to_message, "replied": ctx.reply_to_message,
"requests": requests, "requests": requests,
"help": _help, "help": _help,
@ -482,7 +482,7 @@ async def cmd_eval(self: Client, ctx: Message, strings) -> Optional[str]:
else: else:
await edit_or_reply( await edit_or_reply(
ctx, ctx,
text=final_output, text=f"<code>{final_output}</code>",
parse_mode=enums.ParseMode.HTML, parse_mode=enums.ParseMode.HTML,
reply_markup=InlineKeyboardMarkup( reply_markup=InlineKeyboardMarkup(
[ [

View file

@ -145,15 +145,15 @@ async def genss(self: Client, ctx: Message, strings):
dc_id = FileId.decode(media.file_id).dc_id dc_id = FileId.decode(media.file_id).dc_id
try: try:
dl = await replied.download( dl = await replied.download(
file_name="/downloads/", file_name="downloads/",
progress=progress_for_pyrogram, progress=progress_for_pyrogram,
progress_args=(strings("dl_progress"), process, c_time, dc_id), progress_args=(strings("dl_progress"), process, c_time, dc_id),
) )
except FileNotFoundError: except FileNotFoundError:
return await process.edit_msg( return await process.edit_msg(
"ERROR: FileNotFound, maybe you're spam bot with same file." "ERROR: FileNotFound."
) )
the_real_download_location = os.path.join("/downloads/", os.path.basename(dl)) the_real_download_location = os.path.join("downloads/", os.path.basename(dl))
if the_real_download_location is not None: if the_real_download_location is not None:
try: try:
await process.edit_msg( await process.edit_msg(

View file

@ -2,6 +2,7 @@
# * @date 2023-06-21 22:12:27 # * @date 2023-06-21 22:12:27
# * @projectName MissKatyPyro # * @projectName MissKatyPyro
# * Copyright ©YasirPedia All rights reserved # * Copyright ©YasirPedia All rights reserved
import html
import json import json
import re import re
import traceback import traceback
@ -228,17 +229,15 @@ async def inline_menu(_, inline_query: InlineQuery):
) )
soup = BeautifulSoup(search_results.text, "lxml") soup = BeautifulSoup(search_results.text, "lxml")
data = [] data = []
for result in soup.find_all("div", class_="kvH3mc BToiNc UK95Uc"): for result in soup.select(".tF2Cxc"):
link = result.find("div", class_="yuRUbf").find("a").get("href") link = result.select_one(".yuRUbf a")["href"]
title = result.find("div", class_="yuRUbf").find("h3").get_text() title = result.select_one(".DKV0Md").text
try: try:
snippet = result.find( snippet = result.select_one("#rso .lyLwlc").text
"div", class_="VwiC3b yXK7lf MUxGbd yDYNvb lyLwlc lEBKkf"
).get_text()
except: except:
snippet = "-" snippet = "-"
message_text = f"<a href='{link}'>{title}</a>\n" message_text = f"<a href='{link}'>{title}</a>\n"
message_text += f"Deskription: {snippet}" message_text += f"Deskription: {html.escape(snippet)}"
data.append( data.append(
InlineQueryResultArticle( InlineQueryResultArticle(
title=f"{title}", title=f"{title}",

View file

@ -46,15 +46,15 @@ async def mediainfo(_, ctx: Message, strings):
dc_id = FileId.decode(file_info.file_id).dc_id dc_id = FileId.decode(file_info.file_id).dc_id
try: try:
dl = await ctx.reply_to_message.download( dl = await ctx.reply_to_message.download(
file_name="/downloads/", file_name="downloads/",
progress=progress_for_pyrogram, progress=progress_for_pyrogram,
progress_args=(strings("dl_args_text"), process, c_time, dc_id), progress_args=(strings("dl_args_text"), process, c_time, dc_id),
) )
except FileNotFoundError: except FileNotFoundError:
return await process.edit_msg( return await process.edit_msg(
"ERROR: FileNotFound, maybe you're spam bot with same file." "ERROR: FileNotFound."
) )
file_path = path.join("/downloads/", path.basename(dl)) file_path = path.join("downloads/", path.basename(dl))
output_ = await runcmd(f'mediainfo "{file_path}"') output_ = await runcmd(f'mediainfo "{file_path}"')
out = output_[0] if len(output_) != 0 else None out = output_[0] if len(output_) != 0 else None
body_text = f""" body_text = f"""

View file

@ -6,6 +6,7 @@
""" """
import asyncio import asyncio
import html
import httpx import httpx
import json import json
import os import os
@ -207,13 +208,11 @@ async def gsearch(_, message):
# collect data # collect data
data = [] data = []
for result in soup.find_all("div", class_="kvH3mc BToiNc UK95Uc"): for result in soup.select(".tF2Cxc"):
link = result.find("div", class_="yuRUbf").find("a").get("href") link = result.select_one(".yuRUbf a")["href"]
title = result.find("div", class_="yuRUbf").find("h3").get_text() title = result.select_one(".DKV0Md").text
try: try:
snippet = result.find( snippet = result.select_one("#rso .lyLwlc").text
"div", class_="VwiC3b yXK7lf MUxGbd yDYNvb lyLwlc lEBKkf"
).get_text()
except: except:
snippet = "-" snippet = "-"
@ -229,7 +228,7 @@ async def gsearch(_, message):
parse = json.loads(arr) parse = json.loads(arr)
total = len(parse) total = len(parse)
res = "".join( res = "".join(
f"<a href='{i['link']}'>{i['title']}</a>\n{i['snippet']}\n\n" for i in parse f"<a href='{i['link']}'>{i['title']}</a>\n{html.escape(i['snippet'])}\n\n" for i in parse
) )
except Exception: except Exception:
exc = traceback.format_exc() exc = traceback.format_exc()

View file

@ -218,7 +218,7 @@ async def ytdl_gendl_callback(self: Client, cq: CallbackQuery, strings):
else: else:
yt_url = True yt_url = True
video_link = f"{YT_VID_URL}{match[1]}" video_link = f"{YT_VID_URL}{match[1]}"
LOGGER.info(f"User {cq.from_user.id} using YTDL -> {video_link}")
media_type = "video" if match[3] == "v" else "audio" media_type = "video" if match[3] == "v" else "audio"
uid, _ = ytdl.get_choice_by_id(match[2], media_type, yt_url=yt_url) uid, _ = ytdl.get_choice_by_id(match[2], media_type, yt_url=yt_url)
key = await ytdl.download( key = await ytdl.download(

View file

@ -12,7 +12,7 @@ if os.path.exists("MissKatyLogs.txt"):
basicConfig( basicConfig(
level=INFO, level=INFO,
format="[%(asctime)s - %(levelname)s] - %(name)s.%(funcName)s - %(message)s", format="[%(levelname)s] - [%(asctime)s - %(name)s - %(message)s] -> [%(module)s:%(lineno)d]",
datefmt="%d-%b-%y %H:%M:%S", datefmt="%d-%b-%y %H:%M:%S",
handlers=[ handlers=[
handlers.RotatingFileHandler("MissKatyLogs.txt", mode="w+", maxBytes=1000000), handlers.RotatingFileHandler("MissKatyLogs.txt", mode="w+", maxBytes=1000000),