Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Bump ruwuma to resolve duplicate state error

Browse Source
This commit is contained in:
nexy7574
2026-03-03 06:01:02 +00:00
parent 6adb99397e
commit f4af67575e
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+14 -14
View File
@@ -1221,7 +1221,7 @@ dependencies = [
[[package]] [[package]]
name = "continuwuity-admin-api" name = "continuwuity-admin-api"
version = "0.1.0" 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 = [ dependencies = [
"ruma-common", "ruma-common",
"serde", "serde",
@@ -1600,7 +1600,7 @@ dependencies = [
[[package]] [[package]]
name = "draupnir-antispam" name = "draupnir-antispam"
version = "0.1.0" 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 = [ dependencies = [
"ruma-common", "ruma-common",
"serde", "serde",
@@ -3002,7 +3002,7 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
[[package]] [[package]]
name = "meowlnir-antispam" name = "meowlnir-antispam"
version = "0.1.0" 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 = [ dependencies = [
"ruma-common", "ruma-common",
"serde", "serde",
@@ -4094,7 +4094,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.10.1" 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 = [ dependencies = [
"assign", "assign",
"continuwuity-admin-api", "continuwuity-admin-api",
@@ -4117,7 +4117,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.10.0" 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 = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4129,7 +4129,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.18.0" 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 = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@@ -4152,7 +4152,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.13.0" 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 = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@@ -4184,7 +4184,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.28.1" 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 = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@@ -4209,7 +4209,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.9.0" 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 = [ dependencies = [
"bytes", "bytes",
"headers", "headers",
@@ -4231,7 +4231,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.9.5" 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 = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.18", "thiserror 2.0.18",
@@ -4240,7 +4240,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://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4250,7 +4250,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.13.0" 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 = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro-crate", "proc-macro-crate",
@@ -4265,7 +4265,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://forgejo.ellis.link/continuwuation/ruwuma?rev=a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf#a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4277,7 +4277,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.15.0" 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 = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
Cargo.toml
+2 -1
View File
@@ -343,7 +343,7 @@ version = "0.1.2"
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
git = "https://forgejo.ellis.link/continuwuation/ruwuma" git = "https://forgejo.ellis.link/continuwuation/ruwuma"
#branch = "conduwuit-changes" #branch = "conduwuit-changes"
rev = "a4b5e89f4951c87e903ef224c2d1c2c4ef1ebeaf" rev = "ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
features = [ features = [
"compat", "compat",
"rand", "rand",
@@ -381,6 +381,7 @@ features = [
"unstable-pdu", "unstable-pdu",
"unstable-msc4155", "unstable-msc4155",
"unstable-msc4143", # livekit well_known response "unstable-msc4143", # livekit well_known response
"unstable-msc4284"
] ]
[workspace.dependencies.rust-rocksdb] [workspace.dependencies.rust-rocksdb]
src/api/client/account_data.rs
+1 -2
View File
@@ -8,8 +8,7 @@ use ruma::{
set_room_account_data, set_room_account_data,
}, },
events::{ events::{
AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent, AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent, RoomAccountDataEventType,
GlobalAccountDataEventType, RoomAccountDataEventType,
}, },
serde::Raw, serde::Raw,
}; };