Merge Beta with Stable releases #1
@ -1,80 +1,73 @@
|
|||||||
|
from datetime import datetime
|
||||||
from os import sep
|
from os import sep
|
||||||
from time import time
|
from time import time
|
||||||
from app import app
|
from app import app
|
||||||
from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardRemove
|
from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardRemove
|
||||||
from pyrogram import filters
|
from pyrogram import filters
|
||||||
|
from classes.holo_user import HoloUser
|
||||||
from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite
|
from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite
|
||||||
from modules.handlers.confirmation import confirm_yes
|
from modules.handlers.confirmation import confirm_yes
|
||||||
from modules.handlers.welcome import welcome_pass
|
from modules.handlers.welcome import welcome_pass
|
||||||
|
from modules.database import col_tmp, col_applications
|
||||||
|
|
||||||
# Callbacks reapply ============================================================================================================
|
# Callbacks reapply ============================================================================================================
|
||||||
@app.on_callback_query(filters.regex("reapply_yes_[\s\S]*"))
|
@app.on_callback_query(filters.regex("reapply_yes_[\s\S]*"))
|
||||||
async def callback_reapply_query_accept(app, clb):
|
async def callback_reapply_query_accept(app, clb):
|
||||||
|
|
||||||
fullclb = clb.data.split("_")
|
fullclb = clb.data.split("_")
|
||||||
|
holo_user = HoloUser(int(fullclb[2]))
|
||||||
|
|
||||||
await app.send_message(configGet("admin_group"), locale("approved_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True)
|
await app.send_message(configGet("admin_group"), locale("approved_by", "message").format(clb.from_user.first_name, holo_user.id), disable_notification=True)
|
||||||
logWrite(f"User {fullclb[2]} got their reapplication approved by {clb.from_user.id}")
|
logWrite(f"User {holo_user.id} got their reapplication approved by {clb.from_user.id}")
|
||||||
|
|
||||||
await app.send_message(int(fullclb[2]), locale("approved_joined", "message"))
|
await app.send_message(holo_user.id, locale("approved_joined", "message"))
|
||||||
|
|
||||||
configSet(["approved"], True, file=fullclb[2])
|
col_applications.delete_one({"user": {"$eq": holo_user.id}})
|
||||||
configSet(["sent"], False, file=fullclb[2])
|
col_applications.insert_one({"user": holo_user.id, "date": datetime.now(), "admin": clb.from_user.id, "application": col_tmp.find_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}})["application"]})
|
||||||
|
col_tmp.update_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}}, {"$set": {"state": "approved", "sent": False}})
|
||||||
application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
|
|
||||||
application[fullclb[2]]["approved"] = True
|
|
||||||
application[fullclb[2]]["approved_by"] = clb.from_user.id
|
|
||||||
application[fullclb[2]]["approval_date"] = int(time())
|
|
||||||
jsonSave(application, f"{configGet('data', 'locations')}{sep}applications.json")
|
|
||||||
|
|
||||||
edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
|
edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
|
||||||
|
|
||||||
await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
|
await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
|
||||||
await clb.answer(text=locale("sub_accepted", "callback").format(fullclb[2]), show_alert=True)
|
await clb.answer(text=locale("sub_accepted", "callback").format(holo_user.id), show_alert=True)
|
||||||
|
|
||||||
need_link = True
|
need_link = True
|
||||||
|
|
||||||
async for member in app.get_chat_members(configGet("destination_group")):
|
async for member in app.get_chat_members(configGet("destination_group")):
|
||||||
if member.user.id == int(fullclb[2]):
|
if member.user.id == holo_user.id:
|
||||||
need_link = False
|
need_link = False
|
||||||
|
|
||||||
if need_link:
|
if need_link:
|
||||||
link = await app.create_chat_invite_link(configGet("destination_group"), name=f"Invite for {fullclb[2]}", member_limit=1) #, expire_date=datetime.now()+timedelta(days=1))
|
link = await app.create_chat_invite_link(configGet("destination_group"), name=f"Invite for {holo_user.id}", member_limit=1) #, expire_date=datetime.now()+timedelta(days=1))
|
||||||
|
|
||||||
await app.send_message(int(fullclb[2]), locale("read_rules", "message"))
|
await app.send_message(holo_user.id, locale("read_rules", "message"))
|
||||||
|
|
||||||
for rule_msg in locale("rules"):
|
for rule_msg in locale("rules"):
|
||||||
await app.send_message(int(fullclb[2]), rule_msg)
|
await app.send_message(holo_user.id, rule_msg)
|
||||||
|
|
||||||
await app.send_message(int(fullclb[2]), locale("approved", "message"), reply_markup=InlineKeyboardMarkup(
|
await app.send_message(holo_user.id, locale("approved", "message"), reply_markup=InlineKeyboardMarkup(
|
||||||
[[
|
[[
|
||||||
InlineKeyboardButton(str(locale("join", "button")), url=link.invite_link)
|
InlineKeyboardButton(str(locale("join", "button")), url=link.invite_link)
|
||||||
]]
|
]]
|
||||||
))
|
))
|
||||||
|
|
||||||
configSet(["link"], link.invite_link, file=fullclb[2])
|
holo_user.set("link", link.invite_link)
|
||||||
logWrite(f"User {fullclb[2]} got an invite link {link.invite_link}")
|
logWrite(f"User {holo_user.id} got an invite link {link.invite_link}")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
await app.send_message(int(fullclb[2]), locale("approved_joined", "message"))
|
await app.send_message(holo_user.id, locale("approved_joined", "message"))
|
||||||
|
|
||||||
@app.on_callback_query(filters.regex("reapply_no_[\s\S]*"))
|
@app.on_callback_query(filters.regex("reapply_no_[\s\S]*"))
|
||||||
async def callback_query_reapply_refuse(app, clb):
|
async def callback_query_reapply_refuse(app, clb):
|
||||||
|
|
||||||
fullclb = clb.data.split("_")
|
fullclb = clb.data.split("_")
|
||||||
|
holo_user = HoloUser(int(fullclb[2]))
|
||||||
|
|
||||||
await app.send_message(configGet("admin_group"), locale("refused_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True)
|
await app.send_message(configGet("admin_group"), locale("refused_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True)
|
||||||
await app.send_message(int(fullclb[2]), locale("refused", "message"))
|
await app.send_message(holo_user.id, locale("refused", "message"))
|
||||||
logWrite(f"User {fullclb[2]} got their reapplication refused by {clb.from_user.id}")
|
logWrite(f"User {fullclb[2]} got their reapplication refused by {clb.from_user.id}")
|
||||||
|
|
||||||
configSet(["refused"], True, file=fullclb[2])
|
col_tmp.update_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}}, {"$set": {"state": "rejected", "sent": False}})
|
||||||
configSet(["sent"], False, file=fullclb[2])
|
|
||||||
|
|
||||||
application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
|
|
||||||
application[fullclb[2]]["refused"] = True
|
|
||||||
application[fullclb[2]]["refused_by"] = clb.from_user.id
|
|
||||||
application[fullclb[2]]["refusal_date"] = int(time())
|
|
||||||
jsonSave(application, f"{configGet('data', 'locations')}{sep}applications.json")
|
|
||||||
|
|
||||||
edited_markup = [[InlineKeyboardButton(text=str(locale("declined", "button")), callback_data="nothing")]]
|
edited_markup = [[InlineKeyboardButton(text=str(locale("declined", "button")), callback_data="nothing")]]
|
||||||
|
|
||||||
@ -86,8 +79,6 @@ async def callback_query_reapply_refuse(app, clb):
|
|||||||
async def callback_query_reapply_old(app, clb):
|
async def callback_query_reapply_old(app, clb):
|
||||||
fullclb = clb.data.split("_")
|
fullclb = clb.data.split("_")
|
||||||
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
||||||
configSet(["approved"], False, file=str(clb.from_user.id))
|
|
||||||
configSet(["refused"], False, file=str(clb.from_user.id))
|
|
||||||
await confirm_yes(app, message)
|
await confirm_yes(app, message)
|
||||||
await clb.message.edit(clb.message.text, reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton(locale("done", "button"), "nothing")]]))
|
await clb.message.edit(clb.message.text, reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton(locale("done", "button"), "nothing")]]))
|
||||||
|
|
||||||
@ -97,11 +88,6 @@ async def callback_query_reapply_new(app, clb):
|
|||||||
|
|
||||||
fullclb = clb.data.split("_")
|
fullclb = clb.data.split("_")
|
||||||
|
|
||||||
jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{clb.from_user.id}.json")
|
|
||||||
configSet(["telegram_id"], str(clb.from_user.username), file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_name"], f"{clb.from_user.first_name} {clb.from_user.last_name}", file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_phone"], str(clb.from_user.phone_number), file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_locale"], str(clb.from_user.language_code), file=str(clb.from_user.id))
|
|
||||||
await clb.answer(locale("reapply_stopped", "callback"))
|
await clb.answer(locale("reapply_stopped", "callback"))
|
||||||
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
||||||
await welcome_pass(app, message, once_again=True)
|
await welcome_pass(app, message, once_again=True)
|
||||||
@ -113,12 +99,9 @@ async def callback_query_reapply_new(app, clb):
|
|||||||
async def callback_query_reapply_stop(app, clb):
|
async def callback_query_reapply_stop(app, clb):
|
||||||
|
|
||||||
fullclb = clb.data.split("_")
|
fullclb = clb.data.split("_")
|
||||||
|
holo_user = HoloUser(clb.from_user)
|
||||||
|
|
||||||
jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{clb.from_user.id}.json")
|
holo_user.application_restart()
|
||||||
configSet(["telegram_id"], str(clb.from_user.username), file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_name"], f"{clb.from_user.first_name} {clb.from_user.last_name}", file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_phone"], str(clb.from_user.phone_number), file=str(clb.from_user.id))
|
|
||||||
configSet(["telegram_locale"], str(clb.from_user.language_code), file=str(clb.from_user.id))
|
|
||||||
await clb.answer(locale("reapply_stopped", "callback"))
|
await clb.answer(locale("reapply_stopped", "callback"))
|
||||||
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
|
||||||
await welcome_pass(app, message, once_again=True)
|
await welcome_pass(app, message, once_again=True)
|
||||||
|
Reference in New Issue
Block a user