dandri/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity/ synced 2026-04-27 13:45:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Fix remaining errors in api/cient/message.rs

Browse Source
This commit is contained in:
Ginger
2026-04-12 11:58:59 -04:00
parent 29f3ef117d
commit 74ad07376c
4 changed files with 35 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+20 -46
View File
@@ -1049,7 +1049,7 @@ dependencies = [
"ruma",
"ruminuwuity",
"serde",
"serde_html_form 0.4.0",
"serde_html_form",
"serde_json",
"sha1 0.11.0",
"tokio",
@@ -1817,7 +1817,6 @@ checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
dependencies = [
"curve25519-dalek",
"ed25519",
"rand_core 0.6.4",
"serde",
"sha2 0.10.9",
"subtle",
@@ -4348,8 +4347,6 @@ version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
]
@@ -4359,7 +4356,7 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
dependencies = [
"rand_chacha 0.9.0",
"rand_chacha",
"rand_core 0.9.5",
]
@@ -4374,16 +4371,6 @@ dependencies = [
"rand_core 0.10.1",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core 0.6.4",
]
[[package]]
name = "rand_chacha"
version = "0.9.0"
@@ -4446,7 +4433,7 @@ dependencies = [
"paste",
"profiling",
"rand 0.9.4",
"rand_chacha 0.9.0",
"rand_chacha",
"simd_helpers",
"thiserror 2.0.18",
"v_frame",
@@ -4646,7 +4633,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.14.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"assign",
"js_int",
@@ -4665,7 +4652,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.14.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"js_int",
"ruma-common",
@@ -4677,7 +4664,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.22.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"as_variant",
"assign",
@@ -4689,7 +4676,7 @@ dependencies = [
"ruma-common",
"ruma-events",
"serde",
"serde_html_form 0.2.8",
"serde_html_form",
"serde_json",
"thiserror 2.0.18",
"url",
@@ -4699,25 +4686,25 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.17.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"as_variant",
"base64 0.22.1",
"bytes",
"date_header",
"form_urlencoded",
"getrandom 0.2.17",
"getrandom 0.4.2",
"http",
"indexmap",
"js_int",
"konst",
"percent-encoding",
"rand 0.8.6",
"rand 0.10.1",
"regex",
"ruma-identifiers-validation",
"ruma-macros",
"serde",
"serde_html_form 0.2.8",
"serde_html_form",
"serde_json",
"thiserror 2.0.18",
"time",
@@ -4732,7 +4719,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.32.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"as_variant",
"indexmap",
@@ -4753,7 +4740,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.13.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"bytes",
"headers",
@@ -4763,7 +4750,7 @@ dependencies = [
"js_int",
"memchr",
"mime",
"rand 0.8.6",
"rand 0.10.1",
"ruma-common",
"ruma-events",
"ruma-signatures",
@@ -4776,7 +4763,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.12.0"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"js_int",
"thiserror 2.0.18",
@@ -4785,7 +4772,7 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.17.1"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"as_variant",
"cfg-if",
@@ -4801,7 +4788,7 @@ dependencies = [
[[package]]
name = "ruma-push-gateway-api"
version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"js_int",
"ruma-common",
@@ -4813,13 +4800,13 @@ dependencies = [
[[package]]
name = "ruma-signatures"
version = "0.19.0"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"base64 0.22.1",
"ed25519-dalek",
"memchr",
"pkcs8",
"rand 0.8.6",
"rand 0.10.1",
"ruma-common",
"serde_json",
"sha2 0.10.9",
@@ -4829,7 +4816,7 @@ dependencies = [
[[package]]
name = "ruma-state-res"
version = "0.15.0"
source = "git+https://github.com/ruma/ruma.git?rev=3df2c7a208859a022ab3fee9dc822a5ab4ca9edf#3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545"
dependencies = [
"js_int",
"ruma-common",
@@ -5293,19 +5280,6 @@ dependencies = [
"syn",
]
[[package]]
name = "serde_html_form"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2f2d7ff8a2140333718bb329f5c40fc5f0865b84c426183ce14c97d2ab8154f"
dependencies = [
"form_urlencoded",
"indexmap",
"itoa",
"ryu",
"serde_core",
]
[[package]]
name = "serde_html_form"
version = "0.4.0"
Cargo.toml
+9 -8
View File
@@ -68,7 +68,7 @@ default-features = false
version = "0.1.3"
[workspace.dependencies.rand]
version = "0.10.0"
version = "0.10.1"
# Used for the http request / response body type for Ruma endpoints used with reqwest
[workspace.dependencies.bytes]
@@ -349,7 +349,7 @@ version = "1.1.1"
[workspace.dependencies.ruma]
# version = "0.14.1"
git = "https://github.com/ruma/ruma.git"
rev = "3df2c7a208859a022ab3fee9dc822a5ab4ca9edf"
rev = "ce4708a2727f18d42ba83b1c262142e6ffd0f545"
features = [
"appservice-api-c",
"client-api",
@@ -367,20 +367,21 @@ features = [
"unstable-msc3061",
"unstable-msc3814",
"unstable-msc3245",
"unstable-msc3381", # polls
"unstable-msc3489", # beacon / live location
"unstable-msc3930", # polls push rules
"unstable-msc3381",
"unstable-msc3489",
"unstable-msc3930",
"unstable-msc4075",
"unstable-msc4095",
"unstable-msc4121",
"unstable-msc4125",
"unstable-msc4186",
"unstable-msc4195",
"unstable-msc4203", # sending to-device events to appservices
"unstable-msc4203",
"unstable-msc4310",
"unstable-msc4380",
"unstable-msc4143", # livekit well_known response
"unstable-msc4439", # pgp_key in .well_known/matrix/support
"unstable-msc4143",
"unstable-msc4406",
"unstable-msc4439",
"unstable-extensible-events",
]
src/api/client/message.rs
+5 -3
View File
@@ -27,7 +27,7 @@
api::{
Direction,
client::{filter::RoomEventFilter, message::get_message_events},
error::ErrorKind,
error::{ErrorKind, SenderIgnoredErrorData},
},
assign,
events::{
@@ -325,7 +325,7 @@ pub(crate) async fn is_ignored_pdu<Pdu>(
if server_ignored {
// the sender's server is ignored, so ignore this event
return Err(Error::BadRequest(
ErrorKind::SenderIgnored { sender: None },
ErrorKind::SenderIgnored(SenderIgnoredErrorData::new()),
"The sender's server is ignored by this server.",
));
}
@@ -334,7 +334,9 @@ pub(crate) async fn is_ignored_pdu<Pdu>(
// the recipient of this PDU has the sender ignored, and we're not
// configured to send ignored messages to clients
return Err(Error::BadRequest(
ErrorKind::SenderIgnored { sender: Some(event.sender().to_owned()) },
ErrorKind::SenderIgnored(SenderIgnoredErrorData::with_sender(
event.sender().to_owned(),
)),
"You have ignored this sender.",
));
}
src/service/server_keys/keypair.rs
+1 -2
View File
@@ -44,8 +44,7 @@ fn load(db: &Arc<Database>) -> Result<Box<Ed25519KeyPair>> {
}
fn create(db: &Arc<Database>) -> Result<(String, Vec<u8>)> {
let keypair = Ed25519KeyPair::generate()
.map_err(|e| err!("Failed to generate new ed25519 keypair: {e:?}"))?;
let keypair = Ed25519KeyPair::generate();
let id = utils::rand::string(8);
debug_info!("Generated new Ed25519 keypair: {id:?}");