diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-02-23 12:35:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 12:35:53 +0000 |
| commit | 5b2b36809fc3543ed0c9ec587398a09f2e176265 (patch) | |
| tree | efed3f9982193ddced3e42f11b4b144d62df2515 | |
| parent | Remove `HomeServer.get_datastore()` (#12031) (diff) | |
| download | synapse-5b2b36809fc3543ed0c9ec587398a09f2e176265.tar.xz | |
Remove more references to `get_datastore` (#12067)
These have snuck in since #12031 was started. Also a couple of other cleanups while we're in the area.
| -rw-r--r-- | changelog.d/12067.feature | 1 | ||||
| -rw-r--r-- | synapse/handlers/account.py | 4 | ||||
| -rw-r--r-- | synapse/rest/client/account.py | 3 | ||||
| -rw-r--r-- | tests/rest/client/test_account.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/changelog.d/12067.feature b/changelog.d/12067.feature new file mode 100644 index 0000000000..dc1153c49e --- /dev/null +++ b/changelog.d/12067.feature @@ -0,0 +1 @@ +Implement experimental support for [MSC3720](https://github.com/matrix-org/matrix-doc/pull/3720) (account status endpoints). diff --git a/synapse/handlers/account.py b/synapse/handlers/account.py index f8cfe9f6de..d5badf635b 100644 --- a/synapse/handlers/account.py +++ b/synapse/handlers/account.py @@ -23,7 +23,7 @@ if TYPE_CHECKING: class AccountHandler: def __init__(self, hs: "HomeServer"): - self._store = hs.get_datastore() + self._main_store = hs.get_datastores().main self._is_mine = hs.is_mine self._federation_client = hs.get_federation_client() @@ -98,7 +98,7 @@ class AccountHandler: """ status = {"exists": False} - userinfo = await self._store.get_userinfo_by_id(user_id.to_string()) + userinfo = await self._main_store.get_userinfo_by_id(user_id.to_string()) if userinfo is not None: status = { diff --git a/synapse/rest/client/account.py b/synapse/rest/client/account.py index 4b217882e8..5587cae98a 100644 --- a/synapse/rest/client/account.py +++ b/synapse/rest/client/account.py @@ -904,9 +904,6 @@ class AccountStatusRestServlet(RestServlet): def __init__(self, hs: "HomeServer"): super().__init__() self._auth = hs.get_auth() - self._store = hs.get_datastore() - self._is_mine = hs.is_mine - self._federation_client = hs.get_federation_client() self._account_handler = hs.get_account_handler() async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]: diff --git a/tests/rest/client/test_account.py b/tests/rest/client/test_account.py index aa019c9a44..008d635b70 100644 --- a/tests/rest/client/test_account.py +++ b/tests/rest/client/test_account.py @@ -1119,7 +1119,9 @@ class AccountStatusTestCase(unittest.HomeserverTestCase): """Tests that the account status endpoint correctly reports a deactivated user.""" user = self.register_user("someuser", "password") self.get_success( - self.hs.get_datastore().set_user_deactivated_status(user, deactivated=True) + self.hs.get_datastores().main.set_user_deactivated_status( + user, deactivated=True + ) ) self._test_status( |