Merge Beta with Stable releases #1

Merged
profitroll merged 52 commits from dev into master 2022-12-16 16:14:41 +02:00
6 changed files with 6 additions and 9 deletions
Showing only changes of commit 9d0b66371a - Show all commits

View File

@ -4,7 +4,7 @@ from pyrogram import filters
from pyrogram.enums.parse_mode import ParseMode
from pyrogram.errors import bad_request_400
from classes.holo_user import HoloUser
from modules.utils import configGet, logWrite, locale, should_quote
from modules.utils import logWrite, locale, should_quote
from dateutil.relativedelta import relativedelta
from modules.database import col_applications

View File

@ -3,7 +3,7 @@ from uuid import uuid1
from app import app, isAnAdmin
from pyrogram import filters
from pyrogram.enums.chat_action import ChatAction
from modules.utils import configGet, should_quote, jsonSave
from modules.utils import should_quote, jsonSave
from modules.database import col_applications
# Applications command =========================================================================================================

View File

@ -1,6 +1,6 @@
from app import app, isAnAdmin
from pyrogram import filters
from modules.utils import should_quote, find_user, configGet
from modules.utils import should_quote, find_user
from classes.holo_user import HoloUser
@app.on_message(~ filters.scheduled & filters.private & filters.command(["label"], prefixes=["/"]))

View File

@ -1,7 +1,7 @@
from app import app, isAnAdmin
from pyrogram import filters
from classes.holo_user import HoloUser
from modules.utils import logWrite, locale, configGet, should_quote
from modules.utils import logWrite, locale, should_quote
# Message command ==============================================================================================================
@app.on_message(~ filters.scheduled & filters.command(["message"], prefixes=["/"]))

View File

@ -2,7 +2,7 @@ from app import app, isAnAdmin
from os import getpid
from sys import exit
from pyrogram import filters
from modules.utils import configGet, logWrite, should_quote
from modules.utils import logWrite, should_quote
from modules.scheduled import scheduler
pid = getpid()

View File

@ -1,8 +1,7 @@
from app import app
from pyrogram import filters
from pyrogram.types import ForceReply, ReplyKeyboardMarkup
from classes.holo_user import HoloUser
from modules.utils import configGet, configSet, locale, logWrite
from modules.utils import locale, logWrite
# Welcome check ================================================================================================================
@app.on_message(~ filters.scheduled & filters.private & (filters.regex(locale("welcome", "keyboard")[0][0]) | filters.regex(locale("return", "keyboard")[0][0])))
@ -15,8 +14,6 @@ async def welcome_pass(app, msg, once_again: bool = True) -> None:
* once_again (bool, optional): Set to False if it's the first time as user applies. Defaults to True.
"""
holo_user = HoloUser(msg.from_user)
if not once_again:
await msg.reply_text(locale("privacy_notice", "message"))