From 27a686e53b8ba3f2e2f102fae73e598c00ec0086 Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Thu, 22 Aug 2019 14:22:04 +0100
Subject: [PATCH] Do not send consent notices if "no-consent-required" is set
---
synapse/server_notices/consent_server_notices.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/synapse/server_notices/consent_server_notices.py b/synapse/server_notices/consent_server_notices.py
index 415e9c17d8..8e82ee32b2 100644
--- a/synapse/server_notices/consent_server_notices.py
+++ b/synapse/server_notices/consent_server_notices.py
@@ -80,6 +80,10 @@ class ConsentServerNotices(object):
try:
u = yield self._store.get_user_by_id(user_id)
+ if u["consent_version"] == "no-consent-required":
+ # user is exempt
+ return
+
if u["is_guest"] and not self._send_to_guests:
# don't send to guests
return
--
GitLab