De-localpart ProfileWorkerStore.set_profile_displayname()

Signed-off-by: Sean Quah <seanq@matrix.org>
This commit is contained in:
Sean Quah 2023-04-15 02:23:20 +01:00
parent 76d6379727
commit 1dcbff40d6
5 changed files with 12 additions and 9 deletions

View file

@ -179,7 +179,7 @@ class ProfileHandler:
)
await self.store.set_profile_displayname(
target_user.localpart, displayname_to_set
target_user.to_string(), displayname_to_set
)
profile = await self.store.get_profileinfo(target_user.to_string())

View file

@ -108,12 +108,13 @@ class ProfileWorkerStore(SQLBaseStore):
)
async def set_profile_displayname(
self, user_localpart: str, new_displayname: Optional[str]
self, user_id: str, new_displayname: 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={"displayname": new_displayname},
values={"full_user_id": user_id, "displayname": new_displayname},
desc="set_profile_displayname",
)

View file

@ -67,7 +67,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
def test_get_my_name(self) -> None:
self.get_success(
self.store.set_profile_displayname(self.frank.localpart, "Frank")
self.store.set_profile_displayname(self.frank.to_string(), "Frank")
)
displayname = self.get_success(self.handler.get_displayname(self.frank))
@ -122,7 +122,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
# Setting displayname for the first time is allowed
self.get_success(
self.store.set_profile_displayname(self.frank.localpart, "Frank")
self.store.set_profile_displayname(self.frank.to_string(), "Frank")
)
self.assertEqual(
@ -167,7 +167,9 @@ class ProfileTestCase(unittest.HomeserverTestCase):
def test_incoming_fed_query(self) -> None:
self.get_success(self.store.create_profile("@caroline:test"))
self.get_success(self.store.set_profile_displayname("caroline", "Caroline"))
self.get_success(
self.store.set_profile_displayname("@caroline:test", "Caroline")
)
response = self.get_success(
self.query_handlers["profile"](

View file

@ -31,7 +31,7 @@ class DataStoreTestCase(unittest.HomeserverTestCase):
self.get_success(self.store.register_user(self.user.to_string(), "pass"))
self.get_success(self.store.create_profile(self.user.to_string()))
self.get_success(
self.store.set_profile_displayname(self.user.localpart, self.displayname)
self.store.set_profile_displayname(self.user.to_string(), self.displayname)
)
users, total = self.get_success(

View file

@ -30,7 +30,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
self.get_success(self.store.create_profile(self.u_frank.to_string()))
self.get_success(
self.store.set_profile_displayname(self.u_frank.localpart, "Frank")
self.store.set_profile_displayname(self.u_frank.to_string(), "Frank")
)
self.assertEqual(
@ -44,7 +44,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
# test set to None
self.get_success(
self.store.set_profile_displayname(self.u_frank.localpart, None)
self.store.set_profile_displayname(self.u_frank.to_string(), None)
)
self.assertIsNone(