MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-13 22:43:50 +01:00
Code Issues Projects Releases Wiki Activity

Remove more references to get_datastore (#12067)

Browse source 
These have snuck in since #12031 was started.

Also a couple of other cleanups while we're in the area.
This commit is contained in:
Richard van der Hoff 2022-02-23 12:35:53 +00:00 committed by GitHub
parent e24ff8ebe3
commit 5b2b36809f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12067.feature Normal file
View file

@ -0,0 +1 @@
Implement experimental support for [MSC3720](https://github.com/matrix-org/matrix-doc/pull/3720) (account status endpoints).

4
synapse/handlers/account.py
View file

@ -23,7 +23,7 @@ if TYPE_CHECKING:
class AccountHandler: class AccountHandler:
def __init__(self, hs: "HomeServer"): def __init__(self, hs: "HomeServer"):
self._store = hs.get_datastore() self._main_store = hs.get_datastores().main
self._is_mine = hs.is_mine self._is_mine = hs.is_mine
self._federation_client = hs.get_federation_client() self._federation_client = hs.get_federation_client()
@ -98,7 +98,7 @@ class AccountHandler:
""" """
status = {"exists": False} 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: if userinfo is not None:
status = { status = {

3
synapse/rest/client/account.py
View file

@ -904,9 +904,6 @@ class AccountStatusRestServlet(RestServlet):
def __init__(self, hs: "HomeServer"): def __init__(self, hs: "HomeServer"):
super().__init__() super().__init__()
self._auth = hs.get_auth() 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() self._account_handler = hs.get_account_handler()
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]: async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:

4
tests/rest/client/test_account.py
View file

@ -1119,7 +1119,9 @@ class AccountStatusTestCase(unittest.HomeserverTestCase):
"""Tests that the account status endpoint correctly reports a deactivated user.""" """Tests that the account status endpoint correctly reports a deactivated user."""
user = self.register_user("someuser", "password") user = self.register_user("someuser", "password")
self.get_success( 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( self._test_status(