patch 72bb23b64e2392ff01f7e060670e98093cfe0839

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

Date: Mon May 15 21:27:05 CEST 2023

* telegram: As messages are referenced by peer and id (in "get" and future

commands), make the compact IDs more compact with offsets relative to peers

(users or channels)

--- old-irgramd/irc.py 2024-11-22 15:21:25.854547185 +0100

+++ new-irgramd/irc.py 2024-11-22 15:21:25.858547179 +0100

@@ -409,7 +409,7 @@

telegram_id = self.iid_to_tid[tgt]

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

- mid = self.tg.mid.num_to_id_offset(tg_msg.id)

+ mid = self.tg.mid.num_to_id_offset(telegram_id, tg_msg.id)

text = '[{}] {}'.format(mid, message)

self.tg.to_cache(tg_msg.id, mid, text, message, user, chan, media=None)

--- old-irgramd/service.py 2024-11-22 15:21:25.858547179 +0100

+++ new-irgramd/service.py 2024-11-22 15:21:25.858547179 +0100

@@ -118,10 +118,10 @@

async def handle_command_get(self, peer=None, mid=None, help=None):

if not help:

- id = self.tg.mid.id_to_num_offset(mid)

peer_id, reply = self.get_peer_id(peer.lower())

if reply: return reply

+ id = self.tg.mid.id_to_num_offset(peer_id, mid)

msg = await self.tg.telegram_client.get_messages(entity=peer_id, ids=id)

if msg is None:

reply = ('Message not found',)

--- old-irgramd/telegram.py 2024-11-22 15:21:25.858547179 +0100

+++ new-irgramd/telegram.py 2024-11-22 15:21:25.858547179 +0100

@@ -374,7 +374,7 @@

self.logger.debug('Handling Telegram Message Edited: %s', event)

id = event.message.id

- mid = self.mid.num_to_id_offset(id)

+ mid = self.mid.num_to_id_offset(event.message.peer_id, id)

fmid = '[{}]'.format(mid)

message = e.replace_mult(event.message.message, e.emo)

message_rendered = await self.render_text(event.message, mid, upd_to_webpend=None)

@@ -438,8 +438,7 @@

chan = self.cache[deleted_id]['channel']

await self.relay_telegram_message(message=None, user=user, text=text, channel=chan)

else:

- mid = self.mid.num_to_id_offset(deleted_id)

- text = 'Message id {} deleted not in cache'.format(mid)

+ text = 'Message id {} deleted not in cache'.format(deleted_id)

await self.relay_telegram_private_message(self.irc.service_user, text)

async def handle_raw(self, update):

@@ -456,7 +455,7 @@

msg = event.message if event else message

user = self.get_irc_user_from_telegram(msg.sender_id)

- mid = self.mid.num_to_id_offset(msg.id)

+ mid = self.mid.num_to_id_offset(msg.peer_id, msg.id)

text = await self.render_text(msg, mid, upd_to_webpend)

text_send = self.set_history_timestamp(text, history, msg.date)

chan = await self.relay_telegram_message(msg, user, text_send)

@@ -555,7 +554,7 @@

replied = await message.get_reply_message()

replied_msg = replied.message

if not replied_msg:

- replied_msg = '[{}]'.format(self.mid.num_to_id_offset(replied.id))

+ replied_msg = '[{}]'.format(self.mid.num_to_id_offset(replied.peer_id, replied.id))

elif len(replied_msg) > self.quote_len:

replied_msg = replied_msg[:self.quote_len]

trunc = '...'

@@ -738,7 +737,7 @@

self.alpha = alpha

self.base = len(alpha)

self.alphaval = { i:v for v, i in enumerate(alpha) }

- self.mesg_base = None

+ self.mesg_base = {}

def num_to_id(self, num, neg=''):

if num < 0: return self.num_to_id(-num, '-')

@@ -749,10 +748,11 @@

else:

return neg + self.alpha[high] + self.alpha[low]

- def num_to_id_offset(self, num):

- if self.mesg_base is None:

- self.mesg_base = num

- return self.num_to_id(num - self.mesg_base)

+ def num_to_id_offset(self, peer, num):

+ peer_id = self.get_peer_id(peer)

+ if peer_id not in self.mesg_base:

+ self.mesg_base[peer_id] = num

+ return self.num_to_id(num - self.mesg_base[peer_id])

def id_to_num(self, id, n=1):

if id:

@@ -763,10 +763,22 @@

else:

return 0

- def id_to_num_offset(self, mid):

- if self.mesg_base is not None:

+ def id_to_num_offset(self, peer, mid):

+ peer_id = self.get_peer_id(peer)

+ if peer_id in self.mesg_base:

id_rel = self.id_to_num(mid)

- id = id_rel + self.mesg_base

+ id = id_rel + self.mesg_base[peer_id]

else:

id = None

return id

+

+ def get_peer_id(self, peer):

+ if isinstance(peer, tgty.PeerChannel):

+ id = peer.channel_id

+ elif isinstance(peer, tgty.PeerChat):

+ id = peer.chat_id

+ elif isinstance(peer, tgty.PeerUser):

+ id = peer.user_id

+ else:

+ id = peer

+ return id