diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-05-25 11:36:43 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-05-25 11:36:43 +0100 |
commit | ba1b1635901f148d793777ea77386dbe3412dfaf (patch) | |
tree | 30d2084bca8847a71bade727ea75558b71bdd719 /synapse/server_notices/consent_server_notices.py | |
parent | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room (diff) | |
download | synapse-ba1b1635901f148d793777ea77386dbe3412dfaf.tar.xz |
Avoid sending consent notice to guest users
we think it makes sense not to send the notices to guest users.
Diffstat (limited to 'synapse/server_notices/consent_server_notices.py')
-rw-r--r-- | synapse/server_notices/consent_server_notices.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server_notices/consent_server_notices.py b/synapse/server_notices/consent_server_notices.py index a709802856..bb74af1af5 100644 --- a/synapse/server_notices/consent_server_notices.py +++ b/synapse/server_notices/consent_server_notices.py @@ -42,6 +42,7 @@ class ConsentServerNotices(object): self._current_consent_version = hs.config.user_consent_version self._server_notice_content = hs.config.user_consent_server_notice_content + self._send_to_guests = hs.config.user_consent_server_notice_to_guests if self._server_notice_content is not None: if not self._server_notices_manager.is_enabled(): @@ -78,6 +79,10 @@ class ConsentServerNotices(object): try: u = yield self._store.get_user_by_id(user_id) + if u["is_guest"] and not self._send_to_guests: + # don't send to guests + return + if u["consent_version"] == self._current_consent_version: # user has already consented return |