mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-12 11:24:19 -05:00
Convert the synapse.notifier module to async/await. (#7395)
This commit is contained in:
parent
97ef1471c6
commit
b0cbc57375
1
changelog.d/7395.misc
Normal file
1
changelog.d/7395.misc
Normal file
@ -0,0 +1 @@
|
||||
Convert synapse.notifier to async/await.
|
@ -273,10 +273,9 @@ class Notifier(object):
|
||||
"room_key", room_stream_id, users=extra_users, rooms=[event.room_id]
|
||||
)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _notify_app_services(self, room_stream_id):
|
||||
async def _notify_app_services(self, room_stream_id):
|
||||
try:
|
||||
yield self.appservice_handler.notify_interested_services(room_stream_id)
|
||||
await self.appservice_handler.notify_interested_services(room_stream_id)
|
||||
except Exception:
|
||||
logger.exception("Error notifying application services of event")
|
||||
|
||||
@ -475,20 +474,18 @@ class Notifier(object):
|
||||
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _get_room_ids(self, user, explicit_room_id):
|
||||
joined_room_ids = yield self.store.get_rooms_for_user(user.to_string())
|
||||
async def _get_room_ids(self, user, explicit_room_id):
|
||||
joined_room_ids = await self.store.get_rooms_for_user(user.to_string())
|
||||
if explicit_room_id:
|
||||
if explicit_room_id in joined_room_ids:
|
||||
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
|
||||
raise AuthError(403, "Non-joined access not allowed")
|
||||
return joined_room_ids, True
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _is_world_readable(self, room_id):
|
||||
state = yield self.state_handler.get_current_state(
|
||||
async def _is_world_readable(self, room_id):
|
||||
state = await self.state_handler.get_current_state(
|
||||
room_id, EventTypes.RoomHistoryVisibility, ""
|
||||
)
|
||||
if state and "history_visibility" in state.content:
|
||||
|
Loading…
Reference in New Issue
Block a user