summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-29 13:30:36 +0000
committerGitHub <noreply@github.com>2019-11-29 13:30:36 +0000
commit1c3a61529fa898808ea9cb424bc1587dffdc7353 (patch)
treee33af67e215bd374ec02cc62744b44174b39aeaa /synapse/handlers/federation.py
parentMerge pull request #6436 from matrix-org/babolivier/fix-state-retrieval (diff)
parentNewsfile (diff)
downloadsynapse-1c3a61529fa898808ea9cb424bc1587dffdc7353.tar.xz
Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons
Implement MSC 2367 - Membership Reasons
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index a5ae7b77d1..d3267734f7 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1428,9 +1428,9 @@ class FederationHandler(BaseHandler):
         return event
 
     @defer.inlineCallbacks
-    def do_remotely_reject_invite(self, target_hosts, room_id, user_id):
+    def do_remotely_reject_invite(self, target_hosts, room_id, user_id, content):
         origin, event, event_format_version = yield self._make_and_verify_event(
-            target_hosts, room_id, user_id, "leave"
+            target_hosts, room_id, user_id, "leave", content=content,
         )
         # Mark as outlier as we don't have any state for this event; we're not
         # even in the room.