Merge pull request #25 from matrix-org/travis-fix-reactions

Don't encrypt reaction events for now
This commit is contained in:
Travis Ralston 2019-10-09 12:27:04 +01:00 committed by GitHub
commit 62b562e112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -790,6 +790,12 @@ class ProxyDaemon:
except KeyError: except KeyError:
return await self.forward_to_web(request, token=client.access_token) return await self.forward_to_web(request, token=client.access_token)
# Don't encrypt reactions for now - they are weird and clients
# need to support them like this.
# TODO: Fix when MSC1849 is fully supported by clients.
if request.match_info["event_type"] == "m.reaction":
encrypt = False
# The room isn't encrypted just forward the message. # The room isn't encrypted just forward the message.
if not encrypt: if not encrypt:
return await self.forward_to_web(request, token=client.access_token) return await self.forward_to_web(request, token=client.access_token)