char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update dependencies

next
timokoesters 2020-04-28 20:03:14 +02:00
parent 1cdf30f38c
commit fd1aea7e36
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
4 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Cargo.lock generated
View File

@ -35,7 +35,7 @@ checksum = "da71fef07bc806586090247e971229289f64c210a278ee5ae419314eb386b31d"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -258,7 +258,7 @@ dependencies = [
"bitflags", "bitflags",
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -415,7 +415,7 @@ dependencies = [
"proc-macro-hack", "proc-macro-hack",
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -499,9 +499,9 @@ dependencies = [
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.1.11" version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -625,9 +625,9 @@ dependencies = [
[[package]] [[package]]
name = "js_int" name = "js_int"
version = "0.1.4" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f97dc0d13f3bf0369f00504ad806499490045d6f93524a6ead4081c380703a2f" checksum = "77ab7bb370a788ad675863e035fd9bfa56a66a030a16a88ab80aeb6b18cbdf31"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -904,7 +904,7 @@ checksum = "8988430ce790d8682672117bc06dda364c0be32d3abd738234f19f3240bad99a"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -1213,13 +1213,13 @@ checksum = "0f6b02a6a860a96e3c2081c8aea88b37b2918b53e539856b73aadde1908b65ad"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.8.0-rc.5" version = "0.8.0-rc.5"
source = "git+https://github.com/ruma/ruma-client-api.git#473cf2386178781688f12c538ee6419869d14a46" source = "git+https://github.com/ruma/ruma-client-api.git#5a26c387646e17ba076e478d1e7b896b7e47137d"
dependencies = [ dependencies = [
"http", "http",
"js_int", "js_int",
@ -1255,13 +1255,13 @@ checksum = "abd3cfe96c9887fe2eebfa2e5e7d3a4afff02c374874d4e718f46dab5fd3320d"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.0.1" version = "0.0.1"
source = "git+https://git.koesters.xyz/timo/ruma-federation-api.git#6f1c5a6a714d6be2f420f3832d31e214fe4fb229" source = "git+https://github.com/ruma/ruma-federation-api.git#263f2ffc75be6542bd68161e446adf588505fb56"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-api", "ruma-api",
@ -1296,7 +1296,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.6.0-dev.1" version = "0.6.0-dev.1"
source = "git+https://git.koesters.xyz/timo/ruma-signatures.git#e2cd0927c14133b8d49a8cd9fbd96f8af5c60f07" source = "git+https://github.com/ruma/ruma-signatures.git#1ca545cba8dfd43e0fc8e3c18e1311fb73390a97"
dependencies = [ dependencies = [
"base64 0.12.0", "base64 0.12.0",
"ring", "ring",
@ -1375,9 +1375,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "572dfa3a0785509e7a44b5b4bebcf94d41ba34e9ed9eb9df722545c3b3c4144a" checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"core-foundation", "core-foundation",
@ -1388,9 +1388,9 @@ dependencies = [
[[package]] [[package]]
name = "security-framework-sys" name = "security-framework-sys"
version = "0.4.2" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ddb15a5fec93b7021b8a9e96009c5d8d51c15673569f7c0f6b7204e5b7b404f" checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@ -1413,14 +1413,14 @@ checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.51" version = "1.0.52"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9" checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@ -1473,9 +1473,9 @@ dependencies = [
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.3.0" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a" checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
[[package]] [[package]]
name = "spin" name = "spin"
@ -1507,7 +1507,7 @@ dependencies = [
"heck", "heck",
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -1523,9 +1523,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.17" version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
@ -1576,9 +1576,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "0.2.18" version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ef16d072d2b6dc8b4a56c70f5c5ced1a37752116f8e7c1e80c659aa7cb6713" checksum = "7d9c43f1bb96970e153bcbae39a65e249ccb942bd9d36dbdf086024920417c9c"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -1605,7 +1605,7 @@ checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
] ]
[[package]] [[package]]
@ -1712,9 +1712,9 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]] [[package]]
name = "url" name = "url"
@ -1785,7 +1785,7 @@ dependencies = [
"log", "log",
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -1819,7 +1819,7 @@ checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931"
dependencies = [ dependencies = [
"proc-macro2 1.0.10", "proc-macro2 1.0.10",
"quote 1.0.3", "quote 1.0.3",
"syn 1.0.17", "syn 1.0.18",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]

10
Cargo.toml
View File

@ -17,16 +17,16 @@ ruma-client-api = { git = "https://github.com/ruma/ruma-client-api.git" }
ruma-identifiers = { version = "0.16.0", features = ["rand"] } ruma-identifiers = { version = "0.16.0", features = ["rand"] }
ruma-api = "0.16.0-rc.3" ruma-api = "0.16.0-rc.3"
ruma-events = "0.21.0-beta.1" ruma-events = "0.21.0-beta.1"
ruma-signatures = { git = "https://git.koesters.xyz/timo/ruma-signatures.git" } ruma-signatures = { git = "https://github.com/ruma/ruma-signatures.git" }
ruma-federation-api = { git = "https://git.koesters.xyz/timo/ruma-federation-api.git" } ruma-federation-api = { git = "https://github.com/ruma/ruma-federation-api.git" }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
log = "0.4.8" log = "0.4.8"
sled = "0.31.0" sled = "0.31.0"
directories = "2.0.2" directories = "2.0.2"
js_int = "0.1.4" js_int = "0.1.5"
serde_json = "1.0.51" serde_json = "1.0.52"
serde = "1.0.106" serde = "1.0.106"
tokio = { version = "0.2.18", features = ["macros"] } tokio = { version = "0.2.19", features = ["macros"] }
rand = "0.7.3" rand = "0.7.3"
rust-argon2 = "0.8.2" rust-argon2 = "0.8.2"
reqwest = "0.10.4" reqwest = "0.10.4"

9
src/client_server.rs
View File

@ -781,8 +781,7 @@ pub async fn get_public_rooms_filtered_route(
ruma_federation_api::v1::get_public_rooms::Request { ruma_federation_api::v1::get_public_rooms::Request {
limit: Some(20_u32.into()), limit: Some(20_u32.into()),
since: None, since: None,
include_all_networks: None, room_network: ruma_federation_api::v1::get_public_rooms::RoomNetwork::Matrix,
third_party_instance_id: None,
}, },
) )
.await .await
@ -1024,10 +1023,10 @@ pub fn get_message_events_route(
let pdus = data.pdus_until(&body.room_id, from); let pdus = data.pdus_until(&body.room_id, from);
let room_events = pdus.into_iter().map(|pdu| pdu.to_room_event()).collect::<Vec<_>>(); let room_events = pdus.into_iter().map(|pdu| pdu.to_room_event()).collect::<Vec<_>>();
MatrixResult(Ok(get_message_events::Response { MatrixResult(Ok(get_message_events::Response {
start: body.from.clone(), start: Some(body.from.clone()),
end: "".to_owned(), end: None,
chunk: room_events, chunk: room_events,
state: Vec::new(),
})) }))
} else { } else {
MatrixResult(Err(Error { MatrixResult(Err(Error {

4
src/server_server.rs
View File

@ -125,10 +125,10 @@ pub fn well_known_server(data: State<Data>) -> Json<String> {
#[get("/_matrix/federation/v1/version")] #[get("/_matrix/federation/v1/version")]
pub fn get_server_version() -> MatrixResult<get_server_version::Response, Error> { pub fn get_server_version() -> MatrixResult<get_server_version::Response, Error> {
MatrixResult(Ok(get_server_version::Response { MatrixResult(Ok(get_server_version::Response {
server: get_server_version::Server { server: Some(get_server_version::Server {
name: Some("Conduit".to_owned()), name: Some("Conduit".to_owned()),
version: Some(env!("CARGO_PKG_VERSION").to_owned()), version: Some(env!("CARGO_PKG_VERSION").to_owned()),
}, }),
})) }))
} }