patch e664cfbb6157d6f9eab1db5d836213317fe1c2e5

Author: E. Bosch <presidev@AT@gmail.com>

Date: Tue Apr 11 09:45:58 CEST 2023

* Add compact message ids in messages sent from IRC that are echoed to IRC,

add those messages to cache

--- old-irgramd/irc.py 2024-10-23 02:30:23.707568233 +0200

+++ new-irgramd/irc.py 2024-10-23 02:30:23.711568227 +0200

@@ -384,22 +384,36 @@

for reply_line in reply:

await self.send_msg(self.service_user, None, reply_line, user)

return

+ defered_send = None

# Echo channel messages from IRC to other IRC connections

# because they won't receive event from Telegram

+ # used defered_send function when id is known

if tgl in self.irc_channels.keys():

- await self.send_msg_others(user, tgl, message)

+ chan = tgl

+ defered_send = self.send_msg_others

+ defered_target = chan

+ else:

+ chan = None

if tgl == user.irc_nick:

tgt = self.tg.tg_username.lower()

# Echo message to the user him/herself in IRC

# because no event will be received from Telegram

- await self.send_msg(user, None, message)

+ # used defered_send function when id is known

+ defered_send = self.send_msg

+ defered_target = None

else:

tgt = tgl

if tgt in self.iid_to_tid:

telegram_id = self.iid_to_tid[tgt]

- await self.tg.telegram_client.send_message(telegram_id, message)

+ tg_msg = await self.tg.telegram_client.send_message(telegram_id, message)

+

+ text = '[{}] {}'.format(self.tg.mid.num_to_id_offset(tg_msg.id), message)

+ self.tg.add_to_cache(tg_msg.id, None, text, user, chan)

+

+ if defered_send:

+ await defered_send(user, defered_target, text)

else:

await self.reply_code(user, 'ERR_NOSUCHNICK', (target,))