Don't check whether User is channel, add peer property to User
This commit is contained in:
@@ -572,7 +572,7 @@ class Portal(DBPortal, BasePortal):
|
|||||||
async def handle_matrix_invite(
|
async def handle_matrix_invite(
|
||||||
self, invited_by: u.User, puppet: p.Puppet | au.AbstractUser
|
self, invited_by: u.User, puppet: p.Puppet | au.AbstractUser
|
||||||
) -> None:
|
) -> None:
|
||||||
if puppet.is_channel:
|
if isinstance(puppet, p.Puppet) and puppet.is_channel:
|
||||||
raise ValueError("Can't invite channels to chats")
|
raise ValueError("Can't invite channels to chats")
|
||||||
try:
|
try:
|
||||||
if self.peer_type == "chat":
|
if self.peer_type == "chat":
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ from telethon.tl.types import (
|
|||||||
ChatForbidden,
|
ChatForbidden,
|
||||||
InputUserSelf,
|
InputUserSelf,
|
||||||
NotifyPeer,
|
NotifyPeer,
|
||||||
|
PeerUser,
|
||||||
TypeUpdate,
|
TypeUpdate,
|
||||||
UpdateFolderPeers,
|
UpdateFolderPeers,
|
||||||
UpdateNewChannelMessage,
|
UpdateNewChannelMessage,
|
||||||
@@ -130,6 +131,10 @@ class User(DBUser, AbstractUser, BaseUser):
|
|||||||
def human_tg_id(self) -> str:
|
def human_tg_id(self) -> str:
|
||||||
return f"@{self.tg_username}" if self.tg_username else f"+{self.tg_phone}" or None
|
return f"@{self.tg_username}" if self.tg_username else f"+{self.tg_phone}" or None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def peer(self) -> PeerUser | None:
|
||||||
|
return PeerUser(user_id=self.tgid) if self.tgid else None
|
||||||
|
|
||||||
# TODO replace with proper displayname getting everywhere
|
# TODO replace with proper displayname getting everywhere
|
||||||
@property
|
@property
|
||||||
def displayname(self) -> str:
|
def displayname(self) -> str:
|
||||||
|
|||||||
Reference in New Issue
Block a user