mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 21:22:02 +00:00
Merge pull request #6837 from matrix-org/rav/federation_async
Port much of `synapse.handlers.federation` to async/await.
This commit is contained in:
commit
c7d6d5c69e
1
changelog.d/6837.misc
Normal file
1
changelog.d/6837.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Port much of `synapse.handlers.federation` to async/await.
|
File diff suppressed because it is too large
Load Diff
@ -932,10 +932,9 @@ class EventCreationHandler(object):
|
|||||||
# way? If we have been invited by a remote server, we need
|
# way? If we have been invited by a remote server, we need
|
||||||
# to get them to sign the event.
|
# to get them to sign the event.
|
||||||
|
|
||||||
returned_invite = yield federation_handler.send_invite(
|
returned_invite = yield defer.ensureDeferred(
|
||||||
invitee.domain, event
|
federation_handler.send_invite(invitee.domain, event)
|
||||||
)
|
)
|
||||||
|
|
||||||
event.unsigned.pop("room_state", None)
|
event.unsigned.pop("room_state", None)
|
||||||
|
|
||||||
# TODO: Make sure the signatures actually are correct.
|
# TODO: Make sure the signatures actually are correct.
|
||||||
|
@ -944,8 +944,10 @@ class RoomMemberMasterHandler(RoomMemberHandler):
|
|||||||
# join dance for now, since we're kinda implicitly checking
|
# join dance for now, since we're kinda implicitly checking
|
||||||
# that we are allowed to join when we decide whether or not we
|
# that we are allowed to join when we decide whether or not we
|
||||||
# need to do the invite/join dance.
|
# need to do the invite/join dance.
|
||||||
yield self.federation_handler.do_invite_join(
|
yield defer.ensureDeferred(
|
||||||
remote_room_hosts, room_id, user.to_string(), content
|
self.federation_handler.do_invite_join(
|
||||||
|
remote_room_hosts, room_id, user.to_string(), content
|
||||||
|
)
|
||||||
)
|
)
|
||||||
yield self._user_joined_room(user, room_id)
|
yield self._user_joined_room(user, room_id)
|
||||||
|
|
||||||
@ -982,8 +984,10 @@ class RoomMemberMasterHandler(RoomMemberHandler):
|
|||||||
"""
|
"""
|
||||||
fed_handler = self.federation_handler
|
fed_handler = self.federation_handler
|
||||||
try:
|
try:
|
||||||
ret = yield fed_handler.do_remotely_reject_invite(
|
ret = yield defer.ensureDeferred(
|
||||||
remote_room_hosts, room_id, target.to_string(), content=content,
|
fed_handler.do_remotely_reject_invite(
|
||||||
|
remote_room_hosts, room_id, target.to_string(), content=content,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
return ret
|
return ret
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user