mirror of
https://github.com/element-hq/synapse
synced 2024-10-05 22:22:40 +00:00
De-localpart ProfileWorkerStore.set_profile_avatar_url()
Signed-off-by: Sean Quah <seanq@matrix.org>
This commit is contained in:
parent
1dcbff40d6
commit
1a4f41b3de
5 changed files with 14 additions and 13 deletions
|
@ -273,7 +273,7 @@ class ProfileHandler:
|
|||
)
|
||||
|
||||
await self.store.set_profile_avatar_url(
|
||||
target_user.localpart, avatar_url_to_set
|
||||
target_user.to_string(), avatar_url_to_set
|
||||
)
|
||||
|
||||
profile = await self.store.get_profileinfo(target_user.to_string())
|
||||
|
|
|
@ -119,12 +119,13 @@ class ProfileWorkerStore(SQLBaseStore):
|
|||
)
|
||||
|
||||
async def set_profile_avatar_url(
|
||||
self, user_localpart: str, new_avatar_url: Optional[str]
|
||||
self, user_id: str, new_avatar_url: Optional[str]
|
||||
) -> None:
|
||||
user_localpart = UserID.from_string(user_id).localpart
|
||||
await self.db_pool.simple_upsert(
|
||||
table="profiles",
|
||||
keyvalues={"user_id": user_localpart},
|
||||
values={"avatar_url": new_avatar_url},
|
||||
values={"full_user_id": user_id, "avatar_url": new_avatar_url},
|
||||
desc="set_profile_avatar_url",
|
||||
)
|
||||
|
||||
|
|
|
@ -186,7 +186,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
|
|||
def test_get_my_avatar(self) -> None:
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url(
|
||||
self.frank.localpart, "http://my.server/me.png"
|
||||
self.frank.to_string(), "http://my.server/me.png"
|
||||
)
|
||||
)
|
||||
avatar_url = self.get_success(self.handler.get_avatar_url(self.frank))
|
||||
|
@ -252,7 +252,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
|
|||
# Setting displayname for the first time is allowed
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url(
|
||||
self.frank.localpart, "http://my.server/me.png"
|
||||
self.frank.to_string(), "http://my.server/me.png"
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
@ -802,9 +802,9 @@ class UsersListTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# Set avatar URL to all users, that no user has a NULL value to avoid
|
||||
# different sort order between SQlite and PostreSQL
|
||||
self.get_success(self.store.set_profile_avatar_url("user1", "mxc://url3"))
|
||||
self.get_success(self.store.set_profile_avatar_url("user2", "mxc://url2"))
|
||||
self.get_success(self.store.set_profile_avatar_url("admin", "mxc://url1"))
|
||||
self.get_success(self.store.set_profile_avatar_url("@user1:test", "mxc://url3"))
|
||||
self.get_success(self.store.set_profile_avatar_url("@user2:test", "mxc://url2"))
|
||||
self.get_success(self.store.set_profile_avatar_url("@admin:test", "mxc://url1"))
|
||||
|
||||
# order by default (name)
|
||||
self._order_test([self.admin_user, user1, user2], None)
|
||||
|
@ -1127,7 +1127,7 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# set attributes for user
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url("user", "mxc://servername/mediaid")
|
||||
self.store.set_profile_avatar_url("@user:test", "mxc://servername/mediaid")
|
||||
)
|
||||
self.get_success(
|
||||
self.store.user_add_threepid("@user:test", "email", "foo@bar.com", 0, 0)
|
||||
|
@ -1257,7 +1257,7 @@ class DeactivateAccountTestCase(unittest.HomeserverTestCase):
|
|||
Reproduces #12257.
|
||||
"""
|
||||
# Patch `self.other_user` to have an empty string as their avatar.
|
||||
self.get_success(self.store.set_profile_avatar_url("user", ""))
|
||||
self.get_success(self.store.set_profile_avatar_url("@user:test", ""))
|
||||
|
||||
# Check we can still erase them.
|
||||
channel = self.make_request(
|
||||
|
@ -2311,7 +2311,7 @@ class UserRestTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# set attributes for user
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url("user", "mxc://servername/mediaid")
|
||||
self.store.set_profile_avatar_url("@user:test", "mxc://servername/mediaid")
|
||||
)
|
||||
self.get_success(
|
||||
self.store.user_add_threepid("@user:test", "email", "foo@bar.com", 0, 0)
|
||||
|
|
|
@ -58,7 +58,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url(
|
||||
self.u_frank.localpart, "http://my.site/here"
|
||||
self.u_frank.to_string(), "http://my.site/here"
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -73,7 +73,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
|
|||
|
||||
# test set to None
|
||||
self.get_success(
|
||||
self.store.set_profile_avatar_url(self.u_frank.localpart, None)
|
||||
self.store.set_profile_avatar_url(self.u_frank.to_string(), None)
|
||||
)
|
||||
|
||||
self.assertIsNone(
|
||||
|
|
Loading…
Reference in a new issue