Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions userbot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ async def on_plug_in_callback_query_handler(event):
current_page_number = int(looters)
buttons = paginate_help(current_page_number, dugmeler, "helpme")
text = f"**GeezProjects Inline Menu**\n\n🔸 **Owner** [{user.first_name}](tg://user?id={user.id})\n• **Jumlah** `{len(dugmeler)}` Module"
await event.edit(
await edit_or_reply(
text,
file=logogeez,
buttons=buttons,
Expand All @@ -595,7 +595,7 @@ async def on_plug_in_callback_query_handler(event):
if event.query.user_id == uid or event.query.user_id in SUDO_USERS:
current_page_number = int(event.data_match.group(1).decode("UTF-8"))
buttons = paginate_help(current_page_number + 1, dugmeler, "helpme")
await event.edit(buttons=buttons)
await edit_or_reply(buttons=buttons)
else:
reply_pop_up_alert = (
f"Kamu Tidak diizinkan, ini Userbot Milik {ALIVE_NAME}"
Expand All @@ -606,7 +606,7 @@ async def on_plug_in_callback_query_handler(event):
async def on_plug_in_callback_query_handler(event):
if event.query.user_id == uid or event.query.user_id in DEVS and SUDO_USERS:
openlagi = custom.Button.inline("• Re-Open Menu •", data="reopen")
await event.edit(
await edit_or_reply(
"❌ **Help Mode Button Ditutup!** ❌", buttons=openlagi
)
else:
Expand All @@ -622,7 +622,7 @@ async def on_plug_in_callback_query_handler(event):
if event.query.user_id == uid or event.query.user_id in SUDO_USERS:
current_page_number = int(event.data_match.group(1).decode("UTF-8"))
buttons = paginate_help(current_page_number - 1, dugmeler, "helpme")
await event.edit(buttons=buttons)
await edit_or_reply(buttons=buttons)
else:
reply_pop_up_alert = f"Kamu Tidak diizinkan, ini Userbot Milik {owner}"
await event.answer(reply_pop_up_alert, cache_time=0, alert=True)
Expand Down
6 changes: 3 additions & 3 deletions userbot/modules/aeshtetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from telethon import events

from userbot import CMD_HANDLER as cmd
from userbot import CMD_HELP, bot
from userbot import CMD_HELP
from userbot.events import geez_cmd

PRINTABLE_ASCII = range(0x21, 0x7F)
Expand All @@ -24,13 +24,13 @@ def aesthetify(string):
yield chr(c)


@bot.on(geez_cmd(outgoing=True, pattern="ae(?: |$)(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern="ae(?: |$)(.*)"))
async def _(event):
if event.fwd_from:
return
text = event.pattern_match.group(1)
text = "".join(aesthetify(text))
await event.edit(text=text, parse_mode=None, link_preview=False)
await edit_or_reply(text=text, parse_mode=None, link_preview=False)
raise events.StopPropagation


Expand Down
8 changes: 4 additions & 4 deletions userbot/modules/afk.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
afk_start = {}


@bot.on(events.NewMessage(outgoing=True))
@bot.on(events.MessageEdited(outgoing=True))
@geez_cmd(events.NewMessage(outgoing=True))
@geez_cmd(events.MessageEdited(outgoing=True))
async def set_not_afk(event):
global USER_AFK
global afk_time
Expand Down Expand Up @@ -72,7 +72,7 @@ async def set_not_afk(event):
await bash("rm -rf *.jpg")


@bot.on(
@geez_cmd(
events.NewMessage(incoming=True, func=lambda e: bool(e.mentioned or e.is_private))
)
async def on_afk(event):
Expand Down Expand Up @@ -125,7 +125,7 @@ async def on_afk(event):
pass


@bot.on(geez_cmd(outgoing=True, pattern="afk(?: |$)(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern="afk(?: |$)(.*)"))
async def _(event):
if event.fwd_from:
return
Expand Down
4 changes: 2 additions & 2 deletions userbot/modules/amongus.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
from requests import get

from userbot import CMD_HANDLER as cmd
from userbot import CMD_HELP, bot
from userbot import CMD_HELP
from userbot.events import geez_cmd


@bot.on(geez_cmd(outgoing=True, pattern=r"imp (.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"imp (.*)"))
async def f_load(message):
clrs = {
"red": 1,
Expand Down
14 changes: 7 additions & 7 deletions userbot/modules/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from requests import get

from userbot import CMD_HANDLER as cmd
from userbot import CMD_HELP, TEMP_DOWNLOAD_DIRECTORY, bot
from userbot import CMD_HELP, TEMP_DOWNLOAD_DIRECTORY
from userbot.events import geez_cmd
from userbot.utils import chrome, human_to_bytes, humanbytes, md5, time_formatter

Expand All @@ -27,7 +27,7 @@
)


@bot.on(geez_cmd(outgoing=True, pattern="magisk$"))
@geez_cmd(geez_cmd(outgoing=True, pattern="magisk$"))
async def magisk(request):
"""magisk latest releases"""
magisk_dict = {
Expand All @@ -51,7 +51,7 @@ async def magisk(request):
await request.edit(releases)


@bot.on(geez_cmd(outgoing=True, pattern=r"device(?: |$)(\S*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"device(?: |$)(\S*)"))
async def device_info(request):
"""get android device basic info from its codename"""
textx = await request.get_reply_message()
Expand Down Expand Up @@ -81,7 +81,7 @@ async def device_info(request):
await request.edit(reply)


@bot.on(geez_cmd(outgoing=True, pattern=r"codename(?: |)([\S]*)(?: |)([\s\S]*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"codename(?: |)([\S]*)(?: |)([\s\S]*)"))
async def codename_info(request):
"""search for android codename"""
textx = await request.get_reply_message()
Expand Down Expand Up @@ -118,7 +118,7 @@ async def codename_info(request):
await request.edit(reply)


@bot.on(geez_cmd(outgoing=True, pattern="pixeldl(?: |$)(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern="pixeldl(?: |$)(.*)"))
async def download_api(dl):
await dl.edit("`Collecting information...`")
URL = dl.pattern_match.group(1)
Expand Down Expand Up @@ -222,7 +222,7 @@ async def download_api(dl):
return


@bot.on(geez_cmd(outgoing=True, pattern=r"specs(?: |)([\S]*)(?: |)([\s\S]*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"specs(?: |)([\S]*)(?: |)([\s\S]*)"))
async def devices_specifications(request):
"""Mobile devices specifications"""
textx = await request.get_reply_message()
Expand Down Expand Up @@ -281,7 +281,7 @@ async def devices_specifications(request):
await request.edit(reply)


@bot.on(geez_cmd(outgoing=True, pattern=r"twrp(?: |$)(\S*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"twrp(?: |$)(\S*)"))
async def twrp(request):
"""get android device twrp"""
textx = await request.get_reply_message()
Expand Down
22 changes: 11 additions & 11 deletions userbot/modules/anilist.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ async def formatJSON(outData):
url = "https://graphql.anilist.co"


@bot.on(geez_cmd(outgoing=True, pattern=r"anichar ?(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"anichar ?(.*)"))
async def anilist(event):
search = event.pattern_match.group(1)
reply_to_id = event.message.id
Expand All @@ -221,12 +221,12 @@ async def anilist(event):
event.chat_id, image, caption=msg, parse_mode="md", reply_to=reply_to_id
)
else:
await event.edit(msg)
await edit_or_reply(msg)
else:
await event.edit("Sorry, No such results")
await edit_or_reply("Sorry, No such results")


@bot.on(geez_cmd(outgoing=True, pattern=r"airing ?(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"airing ?(.*)"))
async def anilist(event):
search = event.pattern_match.group(1)
variables = {"search": search}
Expand All @@ -240,10 +240,10 @@ async def anilist(event):
ms_g += f"\n**Episode**: `{response['nextAiringEpisode']['episode']}`\n**Airing In**: `{airing_time_final}`"
else:
ms_g += f"\n**Episode**:{response['episodes']}\n**Status**: `N/A`"
await event.edit(ms_g)
await edit_or_reply(ms_g)


@bot.on(geez_cmd(outgoing=True, pattern=r"animanga ?(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"animanga ?(.*)"))
async def anilist(event):
search = event.pattern_match.group(1)
reply_to_id = event.message.id
Expand Down Expand Up @@ -299,15 +299,15 @@ async def anilist(event):
await event.delete()
except BaseException:
ms_g += f" [〽️]({image})"
await event.edit(ms_g)
await edit_or_reply(ms_g)
else:
await event.edit(ms_g)
await edit_or_reply(ms_g)


@bot.on(geez_cmd(outgoing=True, pattern=r"anilist ?(.*)"))
@geez_cmd(geez_cmd(outgoing=True, pattern=r"anilist ?(.*)"))
async def anilist(event):
input_str = event.pattern_match.group(1)
event = await event.edit("Searching...")
event = await edit_or_reply("Searching...")
result = await callAPI(input_str)
msg = await formatJSON(result)
await event.edit(msg, link_preview=True)
await edit_or_reply(msg, link_preview=True)
14 changes: 7 additions & 7 deletions userbot/modules/animals.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
import requests

from userbot import CMD_HANDLER as cmd
from userbot import CMD_HELP, bot
from userbot import CMD_HELP
from userbot.events import geez_cmd


@bot.on(geez_cmd(outgoing=True, pattern="shibe$"))
@geez_cmd(geez_cmd(outgoing=True, pattern="shibe$"))
async def shibe(event):
await event.edit("`Processing...`")
await edit_or_reply("`Processing...`")
response = requests.get("https://shibe.online/api/shibes").json()
if not response:
await event.edit("**Tidak bisa menemukan Anjing.**")
await edit_or_reply("**Tidak bisa menemukan Anjing.**")
return
await event.client.send_message(entity=event.chat_id, file=response[0])
await event.delete()


@bot.on(geez_cmd(outgoing=True, pattern="cat$"))
@geez_cmd(geez_cmd(outgoing=True, pattern="cat$"))
async def cats(event):
await event.edit("`Processing...`")
await edit_or_reply("`Processing...`")
response = requests.get("https://shibe.online/api/cats").json()
if not response:
await event.edit("**Tidak bisa menemukan kucing.**")
await edit_or_reply("**Tidak bisa menemukan kucing.**")
return
await event.client.send_message(entity=event.chat_id, file=response[0])
await event.delete()
Expand Down
Loading