Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:16:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary class-wrapping

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-10-13 18:00:38 +01:00
parent 14edea1aff
commit 0c38e8637f
8 changed files with 94 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/rest/client/v1/room.py
View file

@ -26,7 +26,7 @@ from synapse.events.utils import serialize_event
import simplejson as json
import logging
import urllib
from synapse.util.thirdpartyinvites import ThirdPartyInvites
from synapse.util import third_party_invites
logger = logging.getLogger(__name__)
@ -415,7 +415,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
# target user is you unless it is an invite
state_key = user.to_string()
if membership_action == "invite" and ThirdPartyInvites.has_invite_keys(content):
if membership_action == "invite" and third_party_invites.has_invite_keys(content):
yield self.handlers.room_member_handler.do_3pid_invite(
room_id,
user,
@ -446,9 +446,10 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
"membership": unicode(membership_action),
}
if membership_action == "join" and ThirdPartyInvites.has_join_keys(content):
event_content["third_party_invite"] = {}
ThirdPartyInvites.copy_join_keys(content, event_content["third_party_invite"])
if membership_action == "join" and third_party_invites.has_join_keys(content):
event_content["third_party_invite"] = (
third_party_invites.extract_join_keys(content)
)
yield msg_handler.create_and_send_event(
{