patch 6161cf3d257e2a0b1497f9dd283b0b8d13903835

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

Date: Tue Feb 2 23:52:41 CET 2021

* Fix mapping Telegram<->IRC for self user

- if nick not in self.iid_to_tid:

+ target = self.tg.tg_username if nick == user.irc_nick else nick

+ tgt = target.lower()

+

+ if tgt not in self.iid_to_tid:

- telegram_id = self.iid_to_tid[nick]

+ telegram_id = self.iid_to_tid[tgt]

+ self.id = None

+ self.tg_username = None

+ tg_user = await self.telegram_client.get_me()

+ self.id = tg_user.id

+ self.tg_username = self.get_telegram_nick(tg_user)

- if not chat.is_self:

- self.set_ircuser_from_telegram(chat)

+ self.set_ircuser_from_telegram(chat)

- irc_user = IRCUser(None, ('Telegram',), tg_nick, user.id, self.get_telegram_display_name(user))

- self.irc.users[tg_nick.lower()] = irc_user

+ tg_ni = tg_nick.lower()

+ if not user.is_self:

+ irc_user = IRCUser(None, ('Telegram',), tg_nick, user.id, self.get_telegram_display_name(user))

+ self.irc.users[tg_ni] = irc_user

- self.irc.iid_to_tid[tg_nick.lower()] = user.id

+ self.irc.iid_to_tid[tg_ni] = user.id

+ if nick == self.tg_username: return None

+ usr = user if user else irc_user

- user.get_irc_mask(), irc_user.irc_nick, message

+ usr.get_irc_mask(), irc_user.irc_nick, message

+ usr = user if user else irc_user

- user.get_irc_mask(), channel, message

+ usr.get_irc_mask(), channel, message