Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-08 05:52:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

Browse source
This commit is contained in:
Erik Johnston 2017-01-11 10:57:42 +00:00
commit 10f7bfe897
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -30,6 +30,7 @@ Changes in synapse v0.18.6 (2017-01-06)
Bug fixes: Bug fixes:
* Fix bug when checking if a guest user is allowed to join a room (PR #1772) * Fix bug when checking if a guest user is allowed to join a room (PR #1772)
Thanks to Patrik Oldsberg for diagnosing and the fix!
Changes in synapse v0.18.6-rc3 (2017-01-05) Changes in synapse v0.18.6-rc3 (2017-01-05)

11
synapse/handlers/room_member.py
View file

@ -232,11 +232,12 @@ class RoomMemberHandler(BaseHandler):
errcode=Codes.BAD_STATE errcode=Codes.BAD_STATE
) )
same_content = content == old_state.content if old_state:
same_membership = old_membership == effective_membership_state same_content = content == old_state.content
same_sender = requester.user.to_string() == old_state.sender same_membership = old_membership == effective_membership_state
if same_sender and same_membership and same_content: same_sender = requester.user.to_string() == old_state.sender
defer.returnValue(old_state) if same_sender and same_membership and same_content:
defer.returnValue(old_state)
is_host_in_room = yield self._is_host_in_room(current_state_ids) is_host_in_room = yield self._is_host_in_room(current_state_ids)