studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix display name not being set on registration when no display name suffix is configured

Browse Source
This commit is contained in:
dasha_uwu
2026-01-26 13:33:41 +05:00
committed by Jason Volk
parent cc9e99f31d
commit 010c519677
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/service/users/register.rs
View File

@@ -67,28 +67,18 @@ pub async fn full_register(
.new_user_displayname_suffix
.as_str();
let add_displayname_suffix = !displayname_suffix.is_empty() && !omit_displayname_suffix;
let mut displayname = displayname.unwrap_or_else(|| user_id.localpart());
if let Some(displayname) =
displayname.or_else(|| add_displayname_suffix.then(|| user_id.localpart()))
{
// If `new_user_displayname_suffix` is set, registration will push whatever
// content is set to the user's display name with a space before it
let displayname = format!(
"{displayname}{}{}",
add_displayname_suffix
.then_some(" ")
.unwrap_or(""),
add_displayname_suffix
.then_some(displayname_suffix)
.unwrap_or("")
);
self.services
.users
.set_displayname(user_id, Some(&displayname));
let displayname_with_suffix;
if !displayname_suffix.is_empty() && !omit_displayname_suffix {
displayname_with_suffix = format!("{displayname} {displayname_suffix}");
displayname = &displayname_with_suffix;
}
self.services
.users
.set_displayname(user_id, Some(displayname));
// Initial account data
self.services
.account_data