mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-06 01:46:00 +02:00
Incorporate review
This commit is contained in:
parent
8a5e8e829b
commit
81d51ce48b
1 changed files with 8 additions and 14 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue