summary refs log tree commit diff
path: root/synapse/handlers/account.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2022-03-24 11:19:41 +0100
committerGitHub <noreply@github.com>2022-03-24 11:19:41 +0100
commit5436b014f44699093dd75d0ecbf26c434feecaa0 (patch)
treeb100f2a43aefdb01630d6af775b348286344e836 /synapse/handlers/account.py
parentRefuse to start if DB has an unsafe locale (#12262) (diff)
downloadsynapse-5436b014f44699093dd75d0ecbf26c434feecaa0.tar.xz
Optionally include account validity in MSC3720 account status responses (#12266)
Diffstat (limited to 'synapse/handlers/account.py')
-rw-r--r--synapse/handlers/account.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/synapse/handlers/account.py b/synapse/handlers/account.py
index d5badf635b..c05a14304c 100644
--- a/synapse/handlers/account.py
+++ b/synapse/handlers/account.py
@@ -26,6 +26,10 @@ class AccountHandler:
         self._main_store = hs.get_datastores().main
         self._is_mine = hs.is_mine
         self._federation_client = hs.get_federation_client()
+        self._use_account_validity_in_account_status = (
+            hs.config.server.use_account_validity_in_account_status
+        )
+        self._account_validity_handler = hs.get_account_validity_handler()
 
     async def get_account_statuses(
         self,
@@ -106,6 +110,13 @@ class AccountHandler:
                 "deactivated": userinfo.is_deactivated,
             }
 
+            if self._use_account_validity_in_account_status:
+                status[
+                    "org.matrix.expired"
+                ] = await self._account_validity_handler.is_user_expired(
+                    user_id.to_string()
+                )
+
         return status
 
     async def _get_remote_account_statuses(