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

fix: Bump ruwuma again

Browse source
This commit is contained in:
timedout 2026-03-03 18:10:28 +00:00
parent f4af67575e
commit b507898c62
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
5 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -1221,7 +1221,7 @@ dependencies = [
[[package]]
name = "continuwuity-admin-api"
version = "0.1.0"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
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=ad7ffe3b67d56cd3e617d6a688f7fdb169285c95#ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=bb12ed288a31a23aa11b10ba0fad22b7f985eb88#bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
dependencies = [
"base64 0.22.1",
"ed25519-dalek",

2
Cargo.toml
View file

@ -343,7 +343,7 @@ version = "0.1.2"
[workspace.dependencies.ruma]
git = "https://forgejo.ellis.link/continuwuation/ruwuma"
#branch = "conduwuit-changes"
rev = "ad7ffe3b67d56cd3e617d6a688f7fdb169285c95"
rev = "bb12ed288a31a23aa11b10ba0fad22b7f985eb88"
features = [
"compat",
"rand",

3
src/api/client/account_data.rs
View file

@ -8,7 +8,8 @@ use ruma::{
set_room_account_data,
},
events::{
AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent, RoomAccountDataEventType,
AnyGlobalAccountDataEventContent, AnyRoomAccountDataEventContent,
RoomAccountDataEventType,
},
serde::Raw,
};

4
src/service/rooms/event_handler/fetch_state.rs
View file

@ -63,7 +63,9 @@ where
},
| hash_map::Entry::Occupied(_) => {
return Err!(Database(
"State event's type and state_key combination exists multiple times.",
"State event's type and state_key combination exists multiple times: {}, {}",
pdu.kind(),
state_key
));
},
}

4
src/service/rooms/event_handler/handle_outlier_pdu.rs
View file

@ -162,7 +162,9 @@ where
},
| hash_map::Entry::Occupied(_) => {
return Err!(Request(InvalidParam(
"Auth event's type and state_key combination exists multiple times.",
"Auth event's type and state_key combination exists multiple times: {}, {}",
auth_event.kind,
auth_event.state_key().unwrap_or("")
)));
},
}