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

bump ruwuma

Browse source 
Signed-off-by: strawberry <june@girlboss.ceo>
This commit is contained in:
strawberry 2025-02-17 17:35:03 -05:00
parent f47677c995
commit c614d5bf44
No known key found for this signature in database
4 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Cargo.lock generated
View file

@ -3482,7 +3482,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.10.1" version = "0.10.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -3504,7 +3504,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3516,7 +3516,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.18.0" version = "0.18.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -3539,12 +3539,13 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"form_urlencoded", "form_urlencoded",
"getrandom 0.2.15",
"http", "http",
"indexmap 2.7.1", "indexmap 2.7.1",
"js_int", "js_int",
@ -3570,7 +3571,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.28.1" version = "0.28.1"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap 2.7.1", "indexmap 2.7.1",
@ -3595,7 +3596,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"bytes", "bytes",
"http", "http",
@ -3613,7 +3614,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.5" version = "0.9.5"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.11", "thiserror 2.0.11",
@ -3622,7 +3623,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identity-service-api" name = "ruma-identity-service-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3632,7 +3633,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro-crate", "proc-macro-crate",
@ -3647,7 +3648,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -3659,7 +3660,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-server-util" name = "ruma-server-util"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"headers", "headers",
"http", "http",
@ -3672,7 +3673,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.15.0" version = "0.15.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@ -3688,7 +3689,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/girlbossceo/ruwuma?rev=e7a793b720e58bbe6858fecb86db97191dbfe7aa#e7a793b720e58bbe6858fecb86db97191dbfe7aa" source = "git+https://github.com/girlbossceo/ruwuma?rev=4b3a92568310bef42078783e0172b188c5a92b3d#4b3a92568310bef42078783e0172b188c5a92b3d"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"js_int", "js_int",

2
Cargo.toml
View file

@ -346,7 +346,7 @@ version = "0.1.2"
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
git = "https://github.com/girlbossceo/ruwuma" git = "https://github.com/girlbossceo/ruwuma"
#branch = "conduwuit-changes" #branch = "conduwuit-changes"
rev = "e7a793b720e58bbe6858fecb86db97191dbfe7aa" rev = "4b3a92568310bef42078783e0172b188c5a92b3d"
features = [ features = [
"compat", "compat",
"rand", "rand",

6
flake.lock generated
View file

@ -567,11 +567,11 @@
"rocksdb": { "rocksdb": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737828695, "lastModified": 1739735789,
"narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=", "narHash": "sha256-BIzuZS0TV4gRnciP4ieW5J3Hql986iedM5dHQfK6z68=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "rocksdb", "repo": "rocksdb",
"rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c", "rev": "34e401fd4392dd3268e042f1e40dffd064b9a7ff",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -272,7 +272,7 @@ pub(crate) async fn set_profile_key_route(
))); )));
} }
let Some(profile_key_value) = body.kv_pair.get(&body.key) else { let Some(profile_key_value) = body.kv_pair.get(&body.key_name) else {
return Err!(Request(BadJson( return Err!(Request(BadJson(
"The key does not match the URL field key, or JSON body is empty (use DELETE)" "The key does not match the URL field key, or JSON body is empty (use DELETE)"
))); )));
@ -290,7 +290,7 @@ pub(crate) async fn set_profile_key_route(
return Err!(Request(BadJson("Key names cannot be longer than 128 bytes"))); return Err!(Request(BadJson("Key names cannot be longer than 128 bytes")));
} }
if body.key == "displayname" { if body.key_name == "displayname" {
let all_joined_rooms: Vec<OwnedRoomId> = services let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms .rooms
.state_cache .state_cache
@ -306,7 +306,7 @@ pub(crate) async fn set_profile_key_route(
&all_joined_rooms, &all_joined_rooms,
) )
.await; .await;
} else if body.key == "avatar_url" { } else if body.key_name == "avatar_url" {
let mxc = ruma::OwnedMxcUri::from(profile_key_value.to_string()); let mxc = ruma::OwnedMxcUri::from(profile_key_value.to_string());
let all_joined_rooms: Vec<OwnedRoomId> = services let all_joined_rooms: Vec<OwnedRoomId> = services
@ -319,9 +319,11 @@ pub(crate) async fn set_profile_key_route(
update_avatar_url(&services, &body.user_id, Some(mxc), None, &all_joined_rooms).await; update_avatar_url(&services, &body.user_id, Some(mxc), None, &all_joined_rooms).await;
} else { } else {
services services.users.set_profile_key(
.users &body.user_id,
.set_profile_key(&body.user_id, &body.key, Some(profile_key_value.clone())); &body.key_name,
Some(profile_key_value.clone()),
);
} }
if services.globals.allow_local_presence() { if services.globals.allow_local_presence() {
@ -357,7 +359,7 @@ pub(crate) async fn delete_profile_key_route(
))); )));
} }
if body.key == "displayname" { if body.key_name == "displayname" {
let all_joined_rooms: Vec<OwnedRoomId> = services let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms .rooms
.state_cache .state_cache
@ -367,7 +369,7 @@ pub(crate) async fn delete_profile_key_route(
.await; .await;
update_displayname(&services, &body.user_id, None, &all_joined_rooms).await; update_displayname(&services, &body.user_id, None, &all_joined_rooms).await;
} else if body.key == "avatar_url" { } else if body.key_name == "avatar_url" {
let all_joined_rooms: Vec<OwnedRoomId> = services let all_joined_rooms: Vec<OwnedRoomId> = services
.rooms .rooms
.state_cache .state_cache
@ -380,7 +382,7 @@ pub(crate) async fn delete_profile_key_route(
} else { } else {
services services
.users .users
.set_profile_key(&body.user_id, &body.key, None); .set_profile_key(&body.user_id, &body.key_name, None);
} }
if services.globals.allow_local_presence() { if services.globals.allow_local_presence() {
@ -497,11 +499,13 @@ pub(crate) async fn get_profile_key_route(
.users .users
.set_timezone(&body.user_id, response.tz.clone()); .set_timezone(&body.user_id, response.tz.clone());
if let Some(value) = response.custom_profile_fields.get(&body.key) { if let Some(value) = response.custom_profile_fields.get(&body.key_name) {
profile_key_value.insert(body.key.clone(), value.clone()); profile_key_value.insert(body.key_name.clone(), value.clone());
services services.users.set_profile_key(
.users &body.user_id,
.set_profile_key(&body.user_id, &body.key, Some(value.clone())); &body.key_name,
Some(value.clone()),
);
} else { } else {
return Err!(Request(NotFound("The requested profile key does not exist."))); return Err!(Request(NotFound("The requested profile key does not exist.")));
} }
@ -520,8 +524,12 @@ pub(crate) async fn get_profile_key_route(
return Err!(Request(NotFound("Profile was not found."))); return Err!(Request(NotFound("Profile was not found.")));
} }
if let Ok(value) = services.users.profile_key(&body.user_id, &body.key).await { if let Ok(value) = services
profile_key_value.insert(body.key.clone(), value); .users
.profile_key(&body.user_id, &body.key_name)
.await
{
profile_key_value.insert(body.key_name.clone(), value);
} else { } else {
return Err!(Request(NotFound("The requested profile key does not exist."))); return Err!(Request(NotFound("The requested profile key does not exist.")));
} }