diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-14 14:15:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-14 14:17:43 +0000 |
| commit | 62ad701326089ceebbc2683a2e0c9eeeaa734293 (patch) | |
| tree | d6a68b83874c68f628715cf6589a73eeb24fb30a | |
| parent | Split RoomMemberWorkerHandler to separate file (diff) | |
| download | synapse-62ad701326089ceebbc2683a2e0c9eeeaa734293.tar.xz | |
s/join/joined/ in notify_user_membership_change
| -rw-r--r-- | synapse/handlers/room_member_worker.py | 2 | ||||
| -rw-r--r-- | synapse/replication/http/membership.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/room_member_worker.py b/synapse/handlers/room_member_worker.py index 75a881d990..493aec1e48 100644 --- a/synapse/handlers/room_member_worker.py +++ b/synapse/handlers/room_member_worker.py @@ -73,7 +73,7 @@ class RoomMemberWorkerHandler(RoomMemberHandler): port=self.config.worker_replication_http_port, user_id=target.to_string(), room_id=room_id, - change="join", + change="joined", ) def _user_left_room(self, target, room_id): diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py index df16c3b2b4..fcd038a8a2 100644 --- a/synapse/replication/http/membership.py +++ b/synapse/replication/http/membership.py @@ -154,7 +154,7 @@ def notify_user_membership_change(client, host, port, user_id, room_id, change): Returns: Deferred """ - assert change in ("join", "left") + assert change in ("joined", "left") uri = "http://%s:%s/_synapse/replication/user_%s_room" % (host, port, change) @@ -297,7 +297,7 @@ class ReplicationRegister3PIDGuestRestServlet(RestServlet): class ReplicationUserJoinedLeftRoomRestServlet(RestServlet): - PATTERNS = [re.compile("^/_synapse/replication/user_(?P<change>join|left)_room$")] + PATTERNS = [re.compile("^/_synapse/replication/user_(?P<change>joined|left)_room$")] def __init__(self, hs): super(ReplicationUserJoinedLeftRoomRestServlet, self).__init__() @@ -317,7 +317,7 @@ class ReplicationUserJoinedLeftRoomRestServlet(RestServlet): user = UserID.from_string(user_id) - if change == "join": + if change == "joined": user_joined_room(self.distributor, user, room_id) elif change == "left": user_left_room(self.distributor, user, room_id) |