mirror of
https://github.com/RYGhub/royalnet.git
synced 2024-11-23 19:44:20 +00:00
Refactor Telegram database table
This commit is contained in:
parent
c625f3c279
commit
e7b82dfa92
1 changed files with 8 additions and 9 deletions
|
@ -13,10 +13,9 @@ class Telegram:
|
||||||
|
|
||||||
royal_id = Column(Integer, ForeignKey("royals.uid"))
|
royal_id = Column(Integer, ForeignKey("royals.uid"))
|
||||||
tg_id = Column(BigInteger, primary_key=True)
|
tg_id = Column(BigInteger, primary_key=True)
|
||||||
tg_first_name = Column(String)
|
first_name = Column(String)
|
||||||
tg_last_name = Column(String)
|
last_name = Column(String)
|
||||||
tg_username = Column(String)
|
username = Column(String)
|
||||||
tg_avatar = Column(LargeBinary)
|
|
||||||
|
|
||||||
royal = relationship("Royal", backref="telegram")
|
royal = relationship("Royal", backref="telegram")
|
||||||
|
|
||||||
|
@ -27,9 +26,9 @@ class Telegram:
|
||||||
return f"[c]telegram:{self.mention()}[/c]"
|
return f"[c]telegram:{self.mention()}[/c]"
|
||||||
|
|
||||||
def mention(self) -> str:
|
def mention(self) -> str:
|
||||||
if self.tg_username is not None:
|
if self.username is not None:
|
||||||
return f"@{self.tg_username}"
|
return f"@{self.username}"
|
||||||
elif self.tg_last_name is not None:
|
elif self.last_name is not None:
|
||||||
return f"{self.tg_first_name} {self.tg_last_name}"
|
return f"{self.first_name} {self.last_name}"
|
||||||
else:
|
else:
|
||||||
return self.tg_first_name
|
return self.first_name
|
||||||
|
|
Loading…
Reference in a new issue