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

Don't await Matrix room updating. Fixes #82

Browse Source
This commit is contained in:
Tulir Asokan
2018-02-25 22:07:59 +02:00
parent f37ea89e98
commit da3e37ccc0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal.py
+9 -4
View File
@@ -44,6 +44,7 @@ class Portal:
db = None db = None
az = None az = None
bot = None bot = None
loop = None
bridge_notices = False bridge_notices = False
alias_template = None alias_template = None
mx_alias_regex = None mx_alias_regex = None
@@ -195,7 +196,9 @@ class Portal:
if update_if_exists: if update_if_exists:
if not entity: if not entity:
entity = await user.client.get_entity(self.peer) entity = await user.client.get_entity(self.peer)
await self.update_matrix_room(user, entity, self.peer_type == "user") asyncio.ensure_future(
self.update_matrix_room(user, entity, self.peer_type == "user"),
loop=self.loop)
await self.invite_to_matrix(invites or []) await self.invite_to_matrix(invites or [])
return self.mxid return self.mxid
async with self._room_create_lock: async with self._room_create_lock:
@@ -255,8 +258,10 @@ class Portal:
self.save() self.save()
self.az.state_store.set_power_levels(self.mxid, power_levels) self.az.state_store.set_power_levels(self.mxid, power_levels)
user.register_portal(self) user.register_portal(self)
await self.update_matrix_room(user, entity, direct, puppet, asyncio.ensure_future(self.update_matrix_room(user, entity, direct, puppet,
levels=power_levels, users=users, participants=participants) levels=power_levels, users=users,
participants=participants),
loop=self.loop)
def _get_base_power_levels(self, levels=None, entity=None): def _get_base_power_levels(self, levels=None, entity=None):
levels = levels or {} levels = levels or {}
@@ -1239,7 +1244,7 @@ class Portal:
def init(context): def init(context):
global config global config
Portal.az, Portal.db, config, _, Portal.bot = context Portal.az, Portal.db, config, Portal.loop, Portal.bot = context
Portal.bridge_notices = config["bridge.bridge_notices"] Portal.bridge_notices = config["bridge.bridge_notices"]
Portal.alias_template = config.get("bridge.alias_template", "telegram_{groupname}") Portal.alias_template = config.get("bridge.alias_template", "telegram_{groupname}")
Portal.hs_domain = config["homeserver"]["domain"] Portal.hs_domain = config["homeserver"]["domain"]