Merge Beta with Stable releases #1

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

View File

@ -4,7 +4,6 @@ from traceback import print_exc
from app import app, isAnAdmin from app import app, isAnAdmin
from typing import Any, List, Literal, Union from typing import Any, List, Literal, Union
from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message, Photo, Video, Document, Animation, Voice, ForceReply, ReplyKeyboardMarkup from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message, Photo, Video, Document, Animation, Voice, ForceReply, ReplyKeyboardMarkup
from pyrogram.client import Client
from pyrogram.errors import bad_request_400 from pyrogram.errors import bad_request_400
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from modules.database import col_tmp, col_users, col_context, col_warnings, col_applications, col_sponsorships, col_messages from modules.database import col_tmp, col_users, col_context, col_warnings, col_applications, col_sponsorships, col_messages
@ -214,7 +213,7 @@ class HoloUser():
"""Set label in destination group """Set label in destination group
### Args: ### Args:
* app (`Client`): Pyrogram client * chat (`Chat`): Telegram chat
* label (`str`): Label you want to set * label (`str`): Label you want to set
""" """
self.label = label self.label = label
@ -227,7 +226,7 @@ class HoloUser():
"""Reset label in destination group """Reset label in destination group
### Args: ### Args:
* app (`Client`): Pyrogram client * chat (`Chat`): Telegram chat
""" """
self.label = "" self.label = ""
self.set("label", "") self.set("label", "")

View File

@ -1,11 +1,9 @@
from datetime import datetime from datetime import datetime
from os import sep
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 classes.holo_user import HoloUser
from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite from modules.utils import configGet, 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 from modules.database import col_tmp, col_applications

View File

@ -1,6 +1,5 @@
from app import app, isAnAdmin from app import app, isAnAdmin
from pyrogram import filters from pyrogram import filters
from pyrogram.types import ChatPrivileges
from modules.utils import should_quote, find_user, configGet from modules.utils import should_quote, find_user, configGet
from classes.holo_user import HoloUser from classes.holo_user import HoloUser

View File

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

View File

@ -1,5 +1,4 @@
from app import app from app import app
from os import sep
from pyrogram import filters from pyrogram import filters
from pyrogram.types import ReplyKeyboardMarkup from pyrogram.types import ReplyKeyboardMarkup
from modules.utils import locale, logWrite from modules.utils import locale, logWrite

View File

@ -1,11 +1,9 @@
from datetime import datetime
from os import sep
from app import app, isAnAdmin from app import app, isAnAdmin
import asyncio import asyncio
from pyrogram import filters from pyrogram import filters
from pyrogram.types import ForceReply, ReplyKeyboardMarkup, Message from pyrogram.types import Message
from classes.holo_user import HoloUser from classes.holo_user import HoloUser
from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite, should_quote from modules.utils import configGet, logWrite
from modules.database import col_messages from modules.database import col_messages
async def message_involved(msg: Message) -> bool: async def message_involved(msg: Message) -> bool:

View File

@ -1,8 +1,7 @@
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from datetime import datetime from datetime import datetime
from os import fsdecode, listdir, sep
from app import app from app import app
from modules.utils import configGet, jsonLoad, locale, logWrite from modules.utils import configGet, locale, logWrite
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from modules.database import col_applications from modules.database import col_applications