From f4af67575ee3690fc60da44b37bfea345cc07c85 Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Tue, 3 Mar 2026 06:01:02 +0000 Subject: [PATCH] fix: Bump ruwuma to resolve duplicate state error --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 3 ++- src/api/client/account_data.rs | 3 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3401d5e..358e7ec1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1221,7 +1221,7 @@ dependencies = [ [[package]] name = "continuwuity-admin-api" version = "0.1.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "ruma-common", "serde", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "draupnir-antispam" version = "0.1.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "ruma-common", "serde", @@ -3002,7 +3002,7 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "meowlnir-antispam" version = "0.1.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "ruma-common", "serde", @@ -4094,7 +4094,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.10.1" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "assign", "continuwuity-admin-api", @@ -4117,7 +4117,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.10.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "js_int", "ruma-common", @@ -4129,7 +4129,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.18.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "as_variant", "assign", @@ -4152,7 +4152,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.13.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "as_variant", "base64 0.22.1", @@ -4184,7 +4184,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.28.1" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "as_variant", "indexmap", @@ -4209,7 +4209,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "bytes", "headers", @@ -4231,7 +4231,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.5" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "js_int", "thiserror 2.0.18", @@ -4240,7 +4240,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "js_int", "ruma-common", @@ -4250,7 +4250,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.13.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "cfg-if", "proc-macro-crate", @@ -4265,7 +4265,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "js_int", "ruma-common", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.15.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" dependencies = [ "base64 0.22.1", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 94441a5f..82de80ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -343,7 +343,7 @@ version = "0.1.2" [workspace.dependencies.ruma] git = "https://forgejo.ellis.link/continuwuation/ruwuma" #branch = "conduwuit-changes" -rev = "a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" +rev = "ad7ffe3b67d56cd3e617d6a688f7fdb169285c95" features = [ "compat", "rand", @@ -381,6 +381,7 @@ features = [ "unstable-pdu", "unstable-msc4155", "unstable-msc4143", # livekit well_known response + "unstable-msc4284" ] [workspace.dependencies.rust-rocksdb] diff --git a/src/api/client/account_data.rs b/src/api/client/account_data.rs index 779a1340..b617b7ba 100644 --- a/src/api/client/account_data.rs +++ b/src/api/client/account_data.rs @@ -8,8 +8,7 @@ use ruma::{ set_room_account_data, }, events::{ - AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent, - GlobalAccountDataEventType, RoomAccountDataEventType, + AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent, RoomAccountDataEventType, }, serde::Raw, };