romenskiy2012/tuwunel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

24
src/service/users/register.rs
View file

@ -67,27 +67,17 @@ pub async fn full_register(
.new_user_displayname_suffix .new_user_displayname_suffix
.as_str(); .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) = let displayname_with_suffix;
displayname.or_else(|| add_displayname_suffix.then(|| user_id.localpart())) if !displayname_suffix.is_empty() && !omit_displayname_suffix {
{ displayname_with_suffix = format!("{displayname} {displayname_suffix}");
// If `new_user_displayname_suffix` is set, registration will push whatever displayname = &displayname_with_suffix;
// 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 self.services
.users .users
.set_displayname(user_id, Some(&displayname)); .set_displayname(user_id, Some(displayname));
}
// Initial account data // Initial account data
self.services self.services