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

src/service/users/register.rs

@@ -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) =
+	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
-			.users
-			.set_displayname(user_id, Some(&displayname));
 	}
 
+	self.services
+		.users
+		.set_displayname(user_id, Some(displayname));
+
 	// Initial account data
 	self.services
 		.account_data