diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 9cff444779..16bac95331 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -65,7 +65,7 @@ class FederationHandler(BaseHandler):
content.update({"membership": Membership.JOIN})
new_event = self.event_factory.create_event(
etype=RoomMemberEvent.TYPE,
- target_user_id=event.user_id,
+ state_key=event.user_id,
room_id=event.room_id,
user_id=event.user_id,
membership=Membership.JOIN,
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8ab0b8033e..5489de841f 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -399,7 +399,7 @@ class RoomCreationHandler(BaseHandler):
content = {"membership": Membership.JOIN}
join_event = self.event_factory.create_event(
etype=RoomMemberEvent.TYPE,
- target_user_id=user_id,
+ state_key=user_id,
room_id=room_id,
user_id=user_id,
membership=Membership.JOIN,
@@ -527,9 +527,10 @@ class RoomMemberHandler(BaseHandler):
Raises:
SynapseError if there was a problem changing the membership.
"""
+ target_user_id = event.state_key
prev_state = yield self.store.get_room_member(
- event.target_user_id, event.room_id
+ target_user_id, event.room_id
)
if prev_state:
@@ -555,7 +556,7 @@ class RoomMemberHandler(BaseHandler):
yield self.auth.check(event, raises=True)
prev_state = yield self.store.get_room_member(
- event.target_user_id, event.room_id
+ target_user_id, event.room_id
)
if prev_state and prev_state.membership == event.membership:
# double same action, treat this event as a NOOP.
@@ -588,7 +589,7 @@ class RoomMemberHandler(BaseHandler):
content.update({"membership": Membership.JOIN})
new_event = self.event_factory.create_event(
etype=RoomMemberEvent.TYPE,
- target_user_id=joinee.to_string(),
+ state_key=joinee.to_string(),
room_id=room_id,
user_id=joinee.to_string(),
membership=Membership.JOIN,
@@ -601,7 +602,7 @@ class RoomMemberHandler(BaseHandler):
@defer.inlineCallbacks
def _do_join(self, event, room_host=None, do_auth=True):
- joinee = self.hs.parse_userid(event.target_user_id)
+ joinee = self.hs.parse_userid(event.state_key)
# room_id = RoomID.from_string(event.room_id, self.hs)
room_id = event.room_id
@@ -710,16 +711,17 @@ class RoomMemberHandler(BaseHandler):
# If we're inviting someone, then we should also send it to that
# HS.
+ target_user_id = event.state_key
if membership == Membership.INVITE:
host = UserID.from_string(
- event.target_user_id, self.hs
+ target_user_id, self.hs
).domain
destinations.append(host)
# If we are joining a remote HS, include that.
if membership == Membership.JOIN:
host = UserID.from_string(
- event.target_user_id, self.hs
+ target_user_id, self.hs
).domain
destinations.append(host)
|
