From 50acc5843cc62b5304741a23c9db1a850166863a Mon Sep 17 00:00:00 2001 From: blank X Date: Sun, 4 Apr 2021 11:09:00 +0700 Subject: [PATCH] (Try to) force ltr on log_* --- sukuinote/plugins/log_forwards.py | 9 +++++---- sukuinote/plugins/log_reports.py | 15 ++++++++------- sukuinote/plugins/log_user_joins.py | 12 +++++++----- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/sukuinote/plugins/log_forwards.py b/sukuinote/plugins/log_forwards.py index abe75d9..29e1c6b 100644 --- a/sukuinote/plugins/log_forwards.py +++ b/sukuinote/plugins/log_forwards.py @@ -6,6 +6,7 @@ from .. import config, log_errors, app_user_ids, log_ring logged = defaultdict(set) lock = asyncio.Lock() +force_ltr = '\u200E' @Client.on_message(~filters.chat(config['config']['log_chat']) & filters.incoming & filters.forwarded & (filters.group | filters.channel)) @log_errors @@ -33,7 +34,7 @@ async def log_forwards(client, message): chat_text = html.escape(message.chat.title) if message.chat.username: chat_text = f'{chat_text}' - text = f'Forwarded Event\n- Chat: {chat_text} ' + text = f'Forwarded Event\n{force_ltr}- Chat: {chat_text} ' if message.chat.is_verified: chat_text += '[VERIFIED] ' if message.chat.is_support: @@ -72,15 +73,15 @@ async def log_forwards(client, message): user_text += ' [FAKE]' else: user_text = 'Anonymous' - text += f'\n- Forwarder: {user_text}' + text += f'\n{force_ltr}- Forwarder: {user_text}' text += f'\n- Message' mtext = (message.text or message.caption or '').strip() if mtext: text += ':' text += '' if mtext: - text += f' {html.escape(mtext.strip()[:2000])}' - text += '\n- Forwardee: ' + text += f'{force_ltr} {html.escape(mtext.strip()[:2000])}' + text += '\n{force_ltr}- Forwardee: ' user_text = forwardee.first_name if forwardee.last_name: user_text += f' {forwardee.last_name}' diff --git a/sukuinote/plugins/log_reports.py b/sukuinote/plugins/log_reports.py index 625f6ef..c730da6 100644 --- a/sukuinote/plugins/log_reports.py +++ b/sukuinote/plugins/log_reports.py @@ -6,6 +6,7 @@ from .. import config, log_errors, log_ring reported = defaultdict(set) lock = asyncio.Lock() +force_ltr = '\u200E' @Client.on_message(~filters.chat(config['config']['log_chat']) & filters.regex(r'(?:^|\s+)@admins?(?:$|\W+)|^[/!](?:report|admins?)(?:$|\W+)') & filters.group) @log_errors @@ -18,7 +19,7 @@ async def log_reports(client, message): chat_text = html.escape(message.chat.title) if message.chat.username: chat_text = f'{chat_text}' - text = f'Report Event\n- Chat: {chat_text} ' + text = f'Report Event\n{force_ltr}- Chat: {chat_text} ' if message.chat.is_verified: chat_text += '[VERIFIED] ' if message.chat.is_support: @@ -27,7 +28,7 @@ async def log_reports(client, message): chat_text += '[SCAM] ' if getattr(message.chat, 'is_fake', None): chat_text += '[FAKE] ' - text += f'[{message.chat.id}]\n- Reporter: ' + text += f'[{message.chat.id}]\n{force_ltr}- Reporter: ' if message.from_user: user_text = message.from_user.first_name if message.from_user.last_name: @@ -58,16 +59,16 @@ async def log_reports(client, message): user_text = 'Anonymous' text += f'{user_text}\n' start, end = message.matches[0].span() - text += f'- Report Message' + text += f'{force_ltr}- Report Message' mtext = (message.text or message.caption or '').strip() if start or end < len(mtext): text += ':' text += '' if start or end < len(mtext): - text += f' {html.escape(mtext.strip()[:1000])}' + text += f'{force_ltr} {html.escape(mtext.strip()[:1000])}' reply = message.reply_to_message if not getattr(reply, 'empty', True): - text += '\n- Reportee: ' + text += '\n{force_ltr}- Reportee: ' if reply.from_user: user_text = reply.from_user.first_name if reply.from_user.last_name: @@ -96,10 +97,10 @@ async def log_reports(client, message): user_text += ' [FAKE]' else: user_text = 'Anonymous' - text += f'{user_text}\n- Reported Message' + text += f'{user_text}\n{force_ltr}- Reported Message' mtext = reply.text or reply.caption or '' if mtext.strip(): text += ':' - text += f' {html.escape(mtext.strip()[:1000])}' + text += f'{force_ltr} {html.escape(mtext.strip()[:1000])}' log_ring.append(text) reported[message.chat.id].add(message.message_id) diff --git a/sukuinote/plugins/log_user_joins.py b/sukuinote/plugins/log_user_joins.py index eb4e8b7..8e76012 100644 --- a/sukuinote/plugins/log_user_joins.py +++ b/sukuinote/plugins/log_user_joins.py @@ -13,6 +13,8 @@ def sexy_user_name(user): handled = defaultdict(set) lock = asyncio.Lock() +force_ltr = '\u200E' + @Client.on_raw_update() @log_errors async def log_user_joins(client, update, users, chats): @@ -39,7 +41,7 @@ async def log_user_joins(client, update, users, chats): raise ContinuePropagation if not is_join and not config['config']['log_user_adds']: raise ContinuePropagation - text = f"{'User Join Event' if is_join else 'User Add Event'}\n- Chat: " + text = f"{'User Join Event' if is_join else 'User Add Event'}\n{force_ltr}- Chat: " atext = html.escape(chats[chat_id].title) if getattr(chats[chat_id], 'username', None): atext = f'{atext}' @@ -51,13 +53,13 @@ async def log_user_joins(client, update, users, chats): else: adder = 'Anonymous' if is_join: - text += f'- User: {adder}\n' + text += f'{force_ltr}- User: {adder}\n' if isinstance(action, MessageActionChatJoinedByLink): - text += f'- Inviter: {sexy_user_name(users[action.inviter_id])}' + text += f'{force_ltr}- Inviter: {sexy_user_name(users[action.inviter_id])}' else: - text += f'- Adder: {adder}\n- Added Users:\n' + text += f'{force_ltr}- Adder: {adder}\n{force_ltr}- Added Users:\n' for user in action.users: - text += f'--- {sexy_user_name(users[user])}\n' + text += f'{force_ltr}--- {sexy_user_name(users[user])}\n' log_ring.append(text) handled[sexy_chat_id].add(message.id) return