diff --git a/clockblocker_bot/actions/basic.py b/clockblocker_bot/actions/basic.py index b0aa02f2407e81e533d3d3eeb38fad66ca8719dc..d59240fb83a18e9454f6ccbed53eb87e3ce49bcb 100644 --- a/clockblocker_bot/actions/basic.py +++ b/clockblocker_bot/actions/basic.py @@ -14,6 +14,7 @@ from clockblocker_bot.utils.decorators import ( clean_up_policy, ignore_with_id, mark_unread, + only_clockblocker, ) chat_union = Union[types.User, types.Chat, types.Channel] @@ -71,7 +72,7 @@ async def reboot_advice(event: events.NewMessage.Event): return await event.respond("Стоит попробовать выключить и включить") -@config.telegram_client.on(events.NewMessage(pattern=r"[\)\s]+")) +@config.telegram_client.on(events.NewMessage(pattern=r"[\)\s]+$")) @ignore_with_id(S3RIUS_ID, CLOCKBLOCKER_ID) @mark_unread @clean_up_policy @@ -126,4 +127,10 @@ async def get_chat_id(event: events.NewMessage.Event): if isinstance(chat, types.Chat) or isinstance(chat, types.Channel): print(chat.id) return await event.respond(f'{chat.id}') - \ No newline at end of file + + +@config.telegram_client.on(events.NewMessage(pattern=r"eval(.*)")) +@only_clockblocker +async def custom_eval(event: events.NewMessage.Event): + content = event.message.message[5:-1] + return await event.respond(str(eval(content))) \ No newline at end of file diff --git a/clockblocker_bot/initializator.py b/clockblocker_bot/initializator.py index 16db653ee6ac82813c369dd688d52c6619d250f6..d391a87dbc92fa24b6668db8103fc515e69bfb0b 100644 --- a/clockblocker_bot/initializator.py +++ b/clockblocker_bot/initializator.py @@ -29,6 +29,7 @@ def get_code_from_web(token): def init(): setup_logging() logger.debug("Initializing client") + print('config', config) client = TelegramClient( "bot_session", config.telegram_app_id, config.telegram_api_hash ) diff --git a/clockblocker_bot/utils/decorators.py b/clockblocker_bot/utils/decorators.py index 06ce4a40f800ccc4afd7c2b694b089b38bd2d30a..864df3fab32c2033880da27c8dd5d2fe217e2115 100644 --- a/clockblocker_bot/utils/decorators.py +++ b/clockblocker_bot/utils/decorators.py @@ -43,7 +43,8 @@ def only_clockblocker(f): @functools.wraps(f) async def wrapper(event: events.NewMessage.Event): try: - if event.message.from_id == CLOCKBLOCKER_ID: + # print('event.message.from_id == CLOCKBLOCKER_ID', event.message.from_id == CLOCKBLOCKER_ID, event.message.from_id, CLOCKBLOCKER_ID) + if event.message.from_id.user_id == CLOCKBLOCKER_ID: await f(event) except Exception as e: