Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate review

Browse Source
This commit is contained in:
Brendan Abolivier 2019-10-04 11:16:19 +01:00
parent 8a5e8e829b
commit 81d51ce48b
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/handlers/federation.py
View File

@ -2600,20 +2600,14 @@ class FederationHandler(BaseHandler):
) )
if original_invite: if original_invite:
# If the m.room.third_party_invite event's content is empty, it means the # If the m.room.third_party_invite event's content is empty, it means the
# invite has been revoked. # invite has been revoked. In this case, we don't have to raise an error here
if original_invite.content: # because the auth check will fail on the invite (because it's not able to
display_name = original_invite.content["display_name"] # fetch public keys from the m.room.third_party_invite event's content, which
event_dict["content"]["third_party_invite"][ # is empty.
"display_name" display_name = original_invite.content.get("display_name")
] = display_name event_dict["content"]["third_party_invite"][
else: "display_name"
# Don't discard or raise an error here because that's not the right place ] = display_name
# to do auth checks. The auth check will fail on this invite because we
# won't be able to fetch public keys from the m.room.third_party_invite
# event's content (because it's empty).
logger.info(
"Found invite event for third_party_invite but it has been revoked"
)
else: else:
logger.info( logger.info(
"Could not find invite event for third_party_invite: %r", event_dict "Could not find invite event for third_party_invite: %r", event_dict