Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert the synapse.notifier module to async/await. (#7395)

This commit is contained in:
Patrick Cloke 2020-05-01 15:14:49 -04:00 committed by GitHub
parent 97ef1471c6
commit b0cbc57375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7395.misc Normal file
View File

@ -0,0 +1 @@
Convert synapse.notifier to async/await.

17
synapse/notifier.py
View File

@ -273,10 +273,9 @@ class Notifier(object):
"room_key", room_stream_id, users=extra_users, rooms=[event.room_id] "room_key", room_stream_id, users=extra_users, rooms=[event.room_id]
) )
@defer.inlineCallbacks async def _notify_app_services(self, room_stream_id):
def _notify_app_services(self, room_stream_id):
try: try:
yield self.appservice_handler.notify_interested_services(room_stream_id) await self.appservice_handler.notify_interested_services(room_stream_id)
except Exception: except Exception:
logger.exception("Error notifying application services of event") logger.exception("Error notifying application services of event")
@ -475,20 +474,18 @@ class Notifier(object):
return result return result
@defer.inlineCallbacks async def _get_room_ids(self, user, explicit_room_id):
def _get_room_ids(self, user, explicit_room_id): joined_room_ids = await self.store.get_rooms_for_user(user.to_string())
joined_room_ids = yield self.store.get_rooms_for_user(user.to_string())
if explicit_room_id: if explicit_room_id:
if explicit_room_id in joined_room_ids: if explicit_room_id in joined_room_ids:
return [explicit_room_id], True return [explicit_room_id], True
if (yield self._is_world_readable(explicit_room_id)): if await self._is_world_readable(explicit_room_id):
return [explicit_room_id], False return [explicit_room_id], False
raise AuthError(403, "Non-joined access not allowed") raise AuthError(403, "Non-joined access not allowed")
return joined_room_ids, True return joined_room_ids, True
@defer.inlineCallbacks async def _is_world_readable(self, room_id):
def _is_world_readable(self, room_id): state = await self.state_handler.get_current_state(
state = yield self.state_handler.get_current_state(
room_id, EventTypes.RoomHistoryVisibility, "" room_id, EventTypes.RoomHistoryVisibility, ""
) )
if state and "history_visibility" in state.content: if state and "history_visibility" in state.content: