magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log device display name on normal user registrations too

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-09-07 10:10:46 -04:00
parent f163ebf3bb
commit b3974c569d
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/api/client/account.rs
View file

@ -296,48 +296,47 @@ pub(crate) async fn register_route(
debug_info!(%user_id, %device_id, "User account was created"); debug_info!(%user_id, %device_id, "User account was created");
let device_display_name = body.initial_device_display_name.clone().unwrap_or_default();
// log in conduit admin channel if a non-guest user registered // log in conduit admin channel if a non-guest user registered
if body.appservice_info.is_none() && !is_guest { if body.appservice_info.is_none() && !is_guest {
info!("New user \"{user_id}\" registered on this server."); if !device_display_name.is_empty() {
services info!("New user \"{user_id}\" registered on this server with device display name: {device_display_name}");
.admin services
.send_message(RoomMessageEventContent::notice_plain(format!( .admin
"New user \"{user_id}\" registered on this server from IP {client}." .send_message(RoomMessageEventContent::notice_plain(format!(
))) "New user \"{user_id}\" registered on this server from IP {client} and device display name \
.await; \"{device_display_name}\""
)))
.await;
} else {
info!("New user \"{user_id}\" registered on this server.");
services
.admin
.send_message(RoomMessageEventContent::notice_plain(format!(
"New user \"{user_id}\" registered on this server from IP {client}"
)))
.await;
}
} }
// log in conduit admin channel if a guest registered // log in conduit admin channel if a guest registered
if body.appservice_info.is_none() && is_guest && services.globals.log_guest_registrations() { if body.appservice_info.is_none() && is_guest && services.globals.log_guest_registrations() {
info!("New guest user \"{user_id}\" registered on this server."); info!("New guest user \"{user_id}\" registered on this server.");
if let Some(device_display_name) = &body.initial_device_display_name { if !device_display_name.is_empty() {
if body services
.initial_device_display_name .admin
.as_ref() .send_message(RoomMessageEventContent::notice_plain(format!(
.is_some_and(|device_display_name| !device_display_name.is_empty()) "Guest user \"{user_id}\" with device display name \"{device_display_name}\" registered on this \
{ server from IP {client}"
services )))
.admin .await;
.send_message(RoomMessageEventContent::notice_plain(format!(
"Guest user \"{user_id}\" with device display name `{device_display_name}` registered on this \
server from IP {client}."
)))
.await;
} else {
services
.admin
.send_message(RoomMessageEventContent::notice_plain(format!(
"Guest user \"{user_id}\" with no device display name registered on this server from IP \
{client}.",
)))
.await;
}
} else { } else {
services services
.admin .admin
.send_message(RoomMessageEventContent::notice_plain(format!( .send_message(RoomMessageEventContent::notice_plain(format!(
"Guest user \"{user_id}\" with no device display name registered on this server from IP {client}.", "Guest user \"{user_id}\" with no device display name registered on this server from IP {client}",
))) )))
.await; .await;
} }