Bug fixes and improvements #8

Merged
profitroll merged 23 commits from dev into master 2023-01-11 17:22:34 +02:00
2 changed files with 15 additions and 5 deletions
Showing only changes of commit 64b0562bc4 - Show all commits

View File

@ -114,7 +114,6 @@
"permissions": [ "permissions": [
"users", "users",
"admins", "admins",
"group_users",
"group_admins" "group_admins"
], ],
"modules": [ "modules": [
@ -123,7 +122,7 @@
}, },
"warn": { "warn": {
"permissions": [ "permissions": [
"group_users" "group_users_admins"
], ],
"modules": [ "modules": [
"warnings" "warnings"

View File

@ -6,7 +6,7 @@ from apscheduler.schedulers.asyncio import AsyncIOScheduler
from datetime import datetime, timedelta from datetime import datetime, timedelta
from ujson import dumps from ujson import dumps
from app import app from app import app
from pyrogram.types import BotCommand, BotCommandScopeChat from pyrogram.types import BotCommand, BotCommandScopeChat, BotCommandScopeChatAdministrators
from pyrogram.errors import bad_request_400 from pyrogram.errors import bad_request_400
from pyrogram.enums.chat_members_filter import ChatMembersFilter from pyrogram.enums.chat_members_filter import ChatMembersFilter
from classes.holo_user import HoloUser from classes.holo_user import HoloUser
@ -110,6 +110,7 @@ async def commands_register():
"owner": [], "owner": [],
"group_users": [], "group_users": [],
"group_admins": [], "group_admins": [],
"group_users_admins": [],
"locales": {} "locales": {}
} }
@ -119,6 +120,7 @@ async def commands_register():
"owner": [], "owner": [],
"group_users": [], "group_users": [],
"group_admins": [], "group_admins": [],
"group_users_admins": [],
"locales": {} "locales": {}
} }
@ -133,7 +135,8 @@ async def commands_register():
"admins": [], "admins": [],
"owner": [], "owner": [],
"group_users": [], "group_users": [],
"group_admins": [] "group_admins": [],
"group_users_admins": []
} }
if configGet("debug") is True: if configGet("debug") is True:
commands_raw["locales"][".".join(entry.split(".")[:-1])] = { commands_raw["locales"][".".join(entry.split(".")[:-1])] = {
@ -141,7 +144,8 @@ async def commands_register():
"admins": [], "admins": [],
"owner": [], "owner": [],
"group_users": [], "group_users": [],
"group_admins": [] "group_admins": [],
"group_users_admins": []
} }
config_modules = configGet("features") config_modules = configGet("features")
@ -217,6 +221,13 @@ async def commands_register():
except bad_request_400.ChannelInvalid: except bad_request_400.ChannelInvalid:
logWrite(f"Could not register commands for destination group. Bot is likely not in the group.") logWrite(f"Could not register commands for destination group. Bot is likely not in the group.")
# Registering destination group admin commands
try:
await app.set_bot_commands(commands["group_users_admins"], scope=BotCommandScopeChatAdministrators(chat_id=configGet("users", "groups")))
logWrite("Registered destination group admin commands")
except bad_request_400.ChannelInvalid:
logWrite(f"Could not register admin commands for destination group. Bot is likely not in the group.")
if configGet("debug") is True: if configGet("debug") is True:
print(commands, flush=True) print(commands, flush=True)