diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-25 11:44:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 11:44:45 +0100 |
| commit | 60f09b1e11c3726b0ee073d8627b56e9e1c64667 (patch) | |
| tree | e98ab32595d489f293ec9ac99a680163ea8b005b /synapse/server_notices/consent_server_notices.py | |
| parent | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room (diff) | |
| parent | Fix default for send_server_notice_to_guests (diff) | |
| download | synapse-60f09b1e11c3726b0ee073d8627b56e9e1c64667.tar.xz | |
Merge pull request #3288 from matrix-org/rav/no_spam_guests
Avoid sending consent notice 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 |