webmaster/maubot
1
0
Fork 0
mirror of https://github.com/maubot/maubot synced 2025-08-29 11:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b0bd20ea7f into b771b79b91

Browse source
This commit is contained in:
Joe Groocock 2025-08-29 00:23:12 +02:00 • committed by GitHub
commit c2953ff5a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
maubot/client.py
View file

@ -105,8 +105,8 @@ class Client(DBClient):
sync=bool(sync),
autojoin=bool(autojoin),
online=bool(online),
displayname=displayname,
avatar_url=avatar_url,
displayname=(displayname if displayname != "" else None),
avatar_url=(avatar_url if avatar_url != "" else None),
)
self._postinited = False
@ -287,9 +287,9 @@ class Client(DBClient):
)
)
await self.update()
if self.displayname != "disable":
if self.displayname not in ("disable", None):
await self.client.set_displayname(self.displayname)
if self.avatar_url != "disable":
if self.avatar_url not in ("disable", None):
await self.client.set_avatar_url(self.avatar_url)
if self.crypto:
await self._start_crypto()
@ -406,7 +406,7 @@ class Client(DBClient):
await self.update()
async def update_displayname(self, displayname: str | None, save: bool = True) -> None:
if displayname is None or displayname == self.displayname:
if displayname == self.displayname:
return
self.displayname = displayname
if self.displayname != "disable":
@ -417,7 +417,7 @@ class Client(DBClient):
await self.update()
async def update_avatar_url(self, avatar_url: ContentURI, save: bool = True) -> None:
if avatar_url is None or avatar_url == self.avatar_url:
if avatar_url == self.avatar_url:
return
self.avatar_url = avatar_url
if self.avatar_url != "disable":

8
maubot/db/client.py
View file

@ -44,8 +44,8 @@ class Client(SyncStore):
autojoin: bool
online: bool
displayname: str
avatar_url: ContentURI
displayname: str | None
avatar_url: ContentURI | None
@classmethod
def _from_row(cls, row: Record | None) -> Client | None:
@ -71,8 +71,8 @@ class Client(SyncStore):
self.sync,
self.autojoin,
self.online,
self.displayname,
self.avatar_url,
self.displayname or "",
self.avatar_url or "",
)
@classmethod