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

add client IP and user logging on join, remove unnecessary Option

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-07-07 15:02:09 -04:00 • committed by June 🍓🦴
parent 93e7cf461d
commit 0fa6976d86
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/admin/user/commands.rs
View file

@ -95,7 +95,7 @@ pub(super) async fn create(
if let Some(room_id_server_name) = room.server_name() { if let Some(room_id_server_name) = room.server_name() {
match join_room_by_id_helper( match join_room_by_id_helper(
Some(&user_id), &user_id,
room, room,
Some("Automatically joining this room upon registration".to_owned()), Some("Automatically joining this room upon registration".to_owned()),
&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()], &[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],

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

@ -376,7 +376,7 @@ pub(crate) async fn register_route(
if let Some(room_id_server_name) = room.server_name() { if let Some(room_id_server_name) = room.server_name() {
if let Err(e) = join_room_by_id_helper( if let Err(e) = join_room_by_id_helper(
Some(&user_id), &user_id,
room, room,
Some("Automatically joining this room upon registration".to_owned()), Some("Automatically joining this room upon registration".to_owned()),
&[room_id_server_name.to_owned(), services().globals.server_name().to_owned()], &[room_id_server_name.to_owned(), services().globals.server_name().to_owned()],

10
src/api/client/membership.rs
View file

@ -202,7 +202,7 @@ pub(crate) async fn join_room_by_id_route(
} }
join_room_by_id_helper( join_room_by_id_helper(
body.sender_user.as_deref(), sender_user,
&body.room_id, &body.room_id,
body.reason.clone(), body.reason.clone(),
&servers, &servers,
@ -301,7 +301,7 @@ pub(crate) async fn join_room_by_id_or_alias_route(
}; };
let join_room_response = join_room_by_id_helper( let join_room_response = join_room_by_id_helper(
Some(sender_user), sender_user,
&room_id, &room_id,
body.reason.clone(), body.reason.clone(),
&servers, &servers,
@ -653,11 +653,9 @@ pub(crate) async fn joined_members_route(
} }
pub async fn join_room_by_id_helper( pub async fn join_room_by_id_helper(
sender_user: Option<&UserId>, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName], sender_user: &UserId, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName],
third_party_signed: Option<&ThirdPartySigned>, third_party_signed: Option<&ThirdPartySigned>,
) -> Result<join_room_by_id::v3::Response> { ) -> Result<join_room_by_id::v3::Response> {
let sender_user = sender_user.expect("user is authenticated");
if matches!(services().rooms.state_cache.is_joined(sender_user, room_id), Ok(true)) { if matches!(services().rooms.state_cache.is_joined(sender_user, room_id), Ok(true)) {
info!("{sender_user} is already joined in {room_id}"); info!("{sender_user} is already joined in {room_id}");
return Ok(join_room_by_id::v3::Response { return Ok(join_room_by_id::v3::Response {
@ -679,6 +677,7 @@ pub async fn join_room_by_id_helper(
} }
} }
#[tracing::instrument(skip_all, fields(%sender_user, %room_id), name = "join_remote")]
async fn join_room_by_id_helper_remote( async fn join_room_by_id_helper_remote(
sender_user: &UserId, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName], sender_user: &UserId, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName],
_third_party_signed: Option<&ThirdPartySigned>, state_lock: mutex_map::Guard<()>, _third_party_signed: Option<&ThirdPartySigned>, state_lock: mutex_map::Guard<()>,
@ -1014,6 +1013,7 @@ async fn join_room_by_id_helper_remote(
Ok(join_room_by_id::v3::Response::new(room_id.to_owned())) Ok(join_room_by_id::v3::Response::new(room_id.to_owned()))
} }
#[tracing::instrument(skip_all, fields(%sender_user, %room_id), name = "join_local")]
async fn join_room_by_id_helper_local( async fn join_room_by_id_helper_local(
sender_user: &UserId, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName], sender_user: &UserId, room_id: &RoomId, reason: Option<String>, servers: &[OwnedServerName],
_third_party_signed: Option<&ThirdPartySigned>, state_lock: mutex_map::Guard<()>, _third_party_signed: Option<&ThirdPartySigned>, state_lock: mutex_map::Guard<()>,