MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 03:13:52 +01:00
Code Issues Projects Releases Wiki Activity

Look for keys on the right objects

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-10-15 13:10:30 +01:00
parent f38df51e8d
commit 643b5fcdc8
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/federation/federation_client.py
View file

@ -364,7 +364,9 @@ class FederationClient(FederationBase):
args = {}
if third_party_invites.join_has_third_party_invite(content):
args = third_party_invites.extract_join_keys(content)
args = third_party_invites.extract_join_keys(
content["third_party_invite"]
)
try:
ret = yield self.transport_layer.make_join(
destination, room_id, user_id, args

4
synapse/handlers/room.py
View file

@ -566,7 +566,7 @@ class RoomMemberHandler(BaseHandler):
if invitee:
# make sure it looks like a user ID; it'll throw if it's invalid.
UserID.from_string(invitee)
yield self.handlers.message_handler.create_and_send_event(
yield self.hs.get_handlers().message_handler.create_and_send_event(
{
"type": EventTypes.Member,
"content": {
@ -641,7 +641,7 @@ class RoomMemberHandler(BaseHandler):
user.to_string()
)
)
msg_handler = self.handlers.message_handler
msg_handler = self.hs.get_handlers().message_handler
yield msg_handler.create_and_send_event(
{
"type": EventTypes.ThirdPartyInvite,

2
synapse/util/third_party_invites.py
View file

@ -51,7 +51,7 @@ def join_has_third_party_invite(content):
def extract_join_keys(src):
return {
key: value
for key, value in src["third_party_invite"].items()
for key, value in src.items()
if key in JOIN_KEYS
}