summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-19 17:59:51 +0000
committerErik Johnston <erik@matrix.org>2014-11-19 17:59:51 +0000
commit415ddf59bb4d39c5f8d814359d7b60c8cbc19cab (patch)
tree782867dd1d9fdaf7bcd30ee014759d51cf1d44ae /synapse
parentInitialise UserPresenceCache instances to always contain a 'presence' key (diff)
downloadsynapse-415ddf59bb4d39c5f8d814359d7b60c8cbc19cab.tar.xz
Don't add a 'prev' key to m.room.member messages
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/profile.py1
-rw-r--r--synapse/handlers/room.py3
2 files changed, 0 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index 834b37f5f3..7853bf5098 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -202,7 +202,6 @@ class ProfileHandler(BaseHandler): content = { "membership": j.content["membership"], - "prev": j.content["membership"], } yield self.distributor.fire( diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index d09743ed1b..7d9458e1d0 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py
@@ -364,9 +364,6 @@ class RoomMemberHandler(BaseHandler): target_user_id, event.room_id ) - if prev_state: - event.content["prev"] = prev_state.membership - room_id = event.room_id # If we're trying to join a room then we have to do this differently