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

run cargo fix for rust 2024 changes and rustfmt

Browse source 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
This commit is contained in:
June Clementine Strawberry 2025-02-23 01:17:45 -05:00
parent e97952b7f6
commit a1e1f40ded
No known key found for this signature in database
320 changed files with 2212 additions and 2039 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/api/client/unstable.rs
View file

@ -5,6 +5,7 @@ use axum_client_ip::InsecureClientIp;
use conduwuit::Err;
use futures::StreamExt;
use ruma::{
OwnedRoomId,
api::{
client::{
error::ErrorKind,
@ -19,7 +20,6 @@ use ruma::{
},
events::room::member::MembershipState,
presence::PresenceState,
OwnedRoomId,
};
use super::{update_avatar_url, update_displayname};
@ -499,15 +499,18 @@ pub(crate) async fn get_profile_key_route(
.users
.set_timezone(&body.user_id, response.tz.clone());
if let Some(value) = response.custom_profile_fields.get(&body.key_name) {
profile_key_value.insert(body.key_name.clone(), value.clone());
services.users.set_profile_key(
&body.user_id,
&body.key_name,
Some(value.clone()),
);
} else {
return Err!(Request(NotFound("The requested profile key does not exist.")));
match response.custom_profile_fields.get(&body.key_name) {
| Some(value) => {
profile_key_value.insert(body.key_name.clone(), value.clone());
services.users.set_profile_key(
&body.user_id,
&body.key_name,
Some(value.clone()),
);
},
| _ => {
return Err!(Request(NotFound("The requested profile key does not exist.")));
},
}
if profile_key_value.is_empty() {
@ -524,14 +527,17 @@ pub(crate) async fn get_profile_key_route(
return Err!(Request(NotFound("Profile was not found.")));
}
if let Ok(value) = services
match services
.users
.profile_key(&body.user_id, &body.key_name)
.await
{
profile_key_value.insert(body.key_name.clone(), value);
} else {
return Err!(Request(NotFound("The requested profile key does not exist.")));
| Ok(value) => {
profile_key_value.insert(body.key_name.clone(), value);
},
| _ => {
return Err!(Request(NotFound("The requested profile key does not exist.")));
},
}
if profile_key_value.is_empty() {