diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 68b3ad84..078d490d 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -441,14 +441,13 @@ class Portal: del self.by_tgid[self.tgid_full] del self.by_mxid[self.mxid] elif source and source.tgid != user.tgid: - target = await user.get_input_entity(source) if self.peer_type == "chat": - await source.client(DeleteChatUserRequest(chat_id=self.tgid, user_id=target)) + await source.client(DeleteChatUserRequest(chat_id=self.tgid, user_id=user.tgid)) else: channel = await self.get_input_entity(source) rights = ChannelBannedRights(datetime.fromtimestamp(0), True) await source.client(EditBannedRequest(channel=channel, - user_id=target, + user_id=user.tgid, banned_rights=rights)) elif self.peer_type == "chat": await user.client(DeleteChatUserRequest(chat_id=self.tgid, user_id=InputUserSelf())) @@ -664,8 +663,7 @@ class Portal: await source.client( AddChatUserRequest(chat_id=self.tgid, user_id=puppet.tgid, fwd_limit=0)) elif self.peer_type == "channel": - target = await puppet.get_input_entity(source) - await source.client(InviteToChannelRequest(channel=self.peer, users=[target])) + await source.client(InviteToChannelRequest(channel=self.peer, users=[puppet.tgid])) else: raise ValueError("Invalid peer type for Telegram user invite") diff --git a/mautrix_telegram/puppet.py b/mautrix_telegram/puppet.py index c3736994..ad09a7ec 100644 --- a/mautrix_telegram/puppet.py +++ b/mautrix_telegram/puppet.py @@ -51,9 +51,6 @@ class Puppet: def tgid(self): return self.id - def get_input_entity(self, user): - return user.client.get_input_entity(PeerUser(user_id=self.tgid)) - def to_db(self): return self.db.merge( DBPuppet(id=self.id, username=self.username, displayname=self.displayname, diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py index 98969a32..2ad4c183 100644 --- a/mautrix_telegram/user.py +++ b/mautrix_telegram/user.py @@ -99,9 +99,6 @@ class User: else: self.portals = {} - def get_input_entity(self, user): - return user.client.get_input_entity(InputUser(user_id=self.tgid, access_hash=0)) - # region Database conversion def to_db(self):