OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0

pull/19/merge
Erik Johnston 2014-11-19 18:03:03 +00:00
parent 5b46ce579b 493055731e
commit 1a9551db82
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/handlers/profile.py
View File

@ -202,7 +202,6 @@ class ProfileHandler(BaseHandler):
content = { content = {
"membership": j.content["membership"], "membership": j.content["membership"],
"prev": j.content["membership"],
} }
yield self.distributor.fire( yield self.distributor.fire(

3
synapse/handlers/room.py
View File

@ -364,9 +364,6 @@ class RoomMemberHandler(BaseHandler):
target_user_id, event.room_id target_user_id, event.room_id
) )
if prev_state:
event.content["prev"] = prev_state.membership
room_id = event.room_id room_id = event.room_id
# If we're trying to join a room then we have to do this differently # If we're trying to join a room then we have to do this differently

1
tests/rest/test_rooms.py
View File

@ -840,7 +840,6 @@ class RoomMemberStateTestCase(RestTestCase):
expected_response = { expected_response = {
"membership": Membership.JOIN, "membership": Membership.JOIN,
"prev": Membership.JOIN,
} }
self.assertEquals(expected_response, response) self.assertEquals(expected_response, response)