diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index a4b771049c..453d393ce1 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1061,7 +1061,7 @@ class FederationHandler(BaseHandler):
"""
logger.debug("Joining %s to %s", joinee, room_id)
- origin, event, event_format_version = yield self._make_and_verify_event(
+ origin, event = yield self._make_and_verify_event(
target_hosts,
room_id,
joinee,
@@ -1091,9 +1091,7 @@ class FederationHandler(BaseHandler):
target_hosts.insert(0, origin)
except ValueError:
pass
- ret = yield self.federation_client.send_join(
- target_hosts, event, event_format_version,
- )
+ ret = yield self.federation_client.send_join(target_hosts, event)
origin = ret["origin"]
state = ret["state"]
@@ -1166,18 +1164,13 @@ class FederationHandler(BaseHandler):
"""
event_content = {"membership": Membership.JOIN}
- room_version = yield self.store.get_room_version(room_id)
-
- builder = self.event_builder_factory.new(
- room_version,
- {
- "type": EventTypes.Member,
- "content": event_content,
- "room_id": room_id,
- "sender": user_id,
- "state_key": user_id,
- }
- )
+ builder = self.event_builder_factory.new({
+ "type": EventTypes.Member,
+ "content": event_content,
+ "room_id": room_id,
+ "sender": user_id,
+ "state_key": user_id,
+ })
try:
event, context = yield self.event_creation_handler.create_new_client_event(
@@ -1311,7 +1304,7 @@ class FederationHandler(BaseHandler):
@defer.inlineCallbacks
def do_remotely_reject_invite(self, target_hosts, room_id, user_id):
- origin, event, event_format_version = yield self._make_and_verify_event(
+ origin, event = yield self._make_and_verify_event(
target_hosts,
room_id,
user_id,
@@ -1343,7 +1336,7 @@ class FederationHandler(BaseHandler):
@defer.inlineCallbacks
def _make_and_verify_event(self, target_hosts, room_id, user_id, membership,
content={}, params=None):
- origin, event, format_ver = yield self.federation_client.make_membership_event(
+ origin, pdu = yield self.federation_client.make_membership_event(
target_hosts,
room_id,
user_id,
@@ -1352,7 +1345,9 @@ class FederationHandler(BaseHandler):
params=params,
)
- logger.debug("Got response to make_%s: %s", membership, event)
+ logger.debug("Got response to make_%s: %s", membership, pdu)
+
+ event = pdu
# We should assert some things.
# FIXME: Do this in a nicer way
@@ -1360,7 +1355,7 @@ class FederationHandler(BaseHandler):
assert(event.user_id == user_id)
assert(event.state_key == user_id)
assert(event.room_id == room_id)
- defer.returnValue((origin, event, format_ver))
+ defer.returnValue((origin, event))
@defer.inlineCallbacks
@log_function
@@ -1369,17 +1364,13 @@ class FederationHandler(BaseHandler):
leave event for the room and return that. We do *not* persist or
process it until the other server has signed it and sent it back.
"""
- room_version = yield self.store.get_room_version(room_id)
- builder = self.event_builder_factory.new(
- room_version,
- {
- "type": EventTypes.Member,
- "content": {"membership": Membership.LEAVE},
- "room_id": room_id,
- "sender": user_id,
- "state_key": user_id,
- }
- )
+ builder = self.event_builder_factory.new({
+ "type": EventTypes.Member,
+ "content": {"membership": Membership.LEAVE},
+ "room_id": room_id,
+ "sender": user_id,
+ "state_key": user_id,
+ })
event, context = yield self.event_creation_handler.create_new_client_event(
builder=builder,
@@ -2275,16 +2266,14 @@ class FederationHandler(BaseHandler):
}
if (yield self.auth.check_host_in_room(room_id, self.hs.hostname)):
- room_version = yield self.store.get_room_version(room_id)
- builder = self.event_builder_factory.new(room_version, event_dict)
-
+ builder = self.event_builder_factory.new(event_dict)
EventValidator().validate_new(builder)
event, context = yield self.event_creation_handler.create_new_client_event(
builder=builder
)
event, context = yield self.add_display_name_to_third_party_invite(
- room_version, event_dict, event, context
+ event_dict, event, context
)
try:
@@ -2315,18 +2304,14 @@ class FederationHandler(BaseHandler):
Returns:
Deferred: resolves (to None)
"""
- room_version = yield self.store.get_room_version(room_id)
-
- # NB: event_dict has a particular specced format we might need to fudge
- # if we change event formats too much.
- builder = self.event_builder_factory.new(room_version, event_dict)
+ builder = self.event_builder_factory.new(event_dict)
event, context = yield self.event_creation_handler.create_new_client_event(
builder=builder,
)
event, context = yield self.add_display_name_to_third_party_invite(
- room_version, event_dict, event, context
+ event_dict, event, context
)
try:
@@ -2346,8 +2331,7 @@ class FederationHandler(BaseHandler):
yield member_handler.send_membership_event(None, event, context)
@defer.inlineCallbacks
- def add_display_name_to_third_party_invite(self, room_version, event_dict,
- event, context):
+ def add_display_name_to_third_party_invite(self, event_dict, event, context):
key = (
EventTypes.ThirdPartyInvite,
event.content["third_party_invite"]["signed"]["token"]
@@ -2371,7 +2355,7 @@ class FederationHandler(BaseHandler):
# auth checks. If we need the invite and don't have it then the
# auth check code will explode appropriately.
- builder = self.event_builder_factory.new(room_version, event_dict)
+ builder = self.event_builder_factory.new(event_dict)
EventValidator().validate_new(builder)
event, context = yield self.event_creation_handler.create_new_client_event(
builder=builder,
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 7aaa4fba33..a7cd779b02 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -278,15 +278,7 @@ class EventCreationHandler(object):
"""
yield self.auth.check_auth_blocking(requester.user.to_string())
- if event_dict["type"] == EventTypes.Create and event_dict["state_key"] == "":
- room_version = event_dict["content"]["room_version"]
- else:
- try:
- room_version = yield self.store.get_room_version(event_dict["room_id"])
- except NotFoundError:
- raise AuthError(403, "Unknown room")
-
- builder = self.event_builder_factory.new(room_version, event_dict)
+ builder = self.event_builder_factory.new(event_dict)
self.validator.validate_new(builder)
|
