iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle update_info errors inside entity instead of in user

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-13 14:44:24 +03:00
parent 1ac1bf5b60
commit 2a327cc29e
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal/metadata.py
+14 -11
View File
@@ -521,21 +521,24 @@ class PortalMetadata(BasePortal, ABC):
return return
self.log.debug("Updating info") self.log.debug("Updating info")
if not entity: try:
entity = await self.get_entity(user) if not entity:
self.log.debug(f"Fetched data: {entity}") entity = await self.get_entity(user)
changed = False self.log.debug(f"Fetched data: {entity}")
changed = False
if self.peer_type == "channel": if self.peer_type == "channel":
changed = await self._update_username(entity.username) or changed changed = await self._update_username(entity.username) or changed
if hasattr(entity, "about"): if hasattr(entity, "about"):
changed = self._update_about(entity.about) or changed changed = self._update_about(entity.about) or changed
changed = await self._update_title(entity.title) or changed changed = await self._update_title(entity.title) or changed
if isinstance(entity.photo, ChatPhoto): if isinstance(entity.photo, ChatPhoto):
changed = await self._update_avatar(user, entity.photo) or changed changed = await self._update_avatar(user, entity.photo) or changed
except Exception:
self.log.exception(f"Failed to update info from source {user.tgid}")
if changed: if changed:
self.save() self.save()
mautrix_telegram/puppet.py
+6 -3
View File
@@ -234,9 +234,12 @@ class Puppet(CustomPuppetMixin):
self.username = info.username self.username = info.username
changed = True changed = True
changed = await self.update_displayname(source, info) or changed try:
if isinstance(info.photo, UserProfilePhoto): changed = await self.update_displayname(source, info) or changed
changed = await self.update_avatar(source, info.photo) or changed if isinstance(info.photo, UserProfilePhoto):
changed = await self.update_avatar(source, info.photo) or changed
except Exception:
self.log.exception(f"Failed to update info from source {source.tgid}")
self.is_bot = info.bot self.is_bot = info.bot