patch d4f07b39c63d6cfefbf3f3c7bd91fac6969ce39d
Author: E. Bosch <presidev@AT@gmail.com>
Date: Sun Apr 9 01:07:35 CEST 2023
* telegram: Refactorize relay message functions, this will be necessary for deleted message support
diff -rN -u old-irgramd/telegram.py new-irgramd/telegram.py
--- old-irgramd/telegram.py 2024-10-23 06:31:11.055473752 +0200
+++ new-irgramd/telegram.py 2024-10-23 06:31:11.055473752 +0200
@@ -336,28 +336,36 @@
message = '[{}] {}{}'.format(mid, refwd_text, text)
- if event.message.is_private:
- await self.relay_telegram_private_message(user, message)
- chan = None
- else:
- chan = await self.relay_telegram_channel_message(event, user, message)
+ chan = await self.relay_telegram_message(event, user, message)
self.add_to_cache(event.message.id, mid, message, user, chan)
self.refwd_me = False
+ async def relay_telegram_message(self, event, user, message, channel=None):
+ private = (event and event.message.is_private) or (not event and not channel)
+ if private:
+ await self.relay_telegram_private_message(user, message)
+ chan = None
+ else:
+ chan = await self.relay_telegram_channel_message(event, user, message, channel)
+ return chan
+
async def relay_telegram_private_message(self, user, message):
self.logger.debug('Handling Telegram Private Message: %s, %s', user, message)
await self.irc.send_msg(user, None, message)
- async def relay_telegram_channel_message(self, event, user, message):
+ async def relay_telegram_channel_message(self, event, user, message, channel=None):
self.logger.debug('Handling Telegram Channel Message: %s', event)
- entity = await event.message.get_chat()
- channel = await self.get_irc_channel_from_telegram_id(event.message.chat_id, entity)
- await self.irc.send_msg(user, channel, message)
- return channel
+ if event:
+ entity = await event.message.get_chat()
+ chan = await self.get_irc_channel_from_telegram_id(event.message.chat_id, entity)
+ else:
+ chan = channel
+ await self.irc.send_msg(user, chan, message)
+ return chan
async def handle_telegram_chat_action(self, event):
self.logger.debug('Handling Telegram Chat Action: %s', event)