mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-18 00:01:24 +01:00
Bump ruma to 5aebd8f81fc70226940c1a46eb57ef298230d34f (SupportedVersions refactor)
<https://github.com/ruma/ruma/pull/2062>
This commit is contained in:
parent
d11731b74f
commit
3d7d28fba7
5 changed files with 31 additions and 21 deletions
30
Cargo.lock
generated
30
Cargo.lock
generated
|
|
@ -2441,8 +2441,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma"
|
name = "ruma"
|
||||||
version = "0.12.2"
|
version = "0.12.3"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"assign",
|
"assign",
|
||||||
"js_int",
|
"js_int",
|
||||||
|
|
@ -2460,8 +2460,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-appservice-api"
|
name = "ruma-appservice-api"
|
||||||
version = "0.12.1"
|
version = "0.12.2"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js_int",
|
"js_int",
|
||||||
"ruma-common",
|
"ruma-common",
|
||||||
|
|
@ -2472,8 +2472,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-client-api"
|
name = "ruma-client-api"
|
||||||
version = "0.20.2"
|
version = "0.20.3"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"as_variant",
|
"as_variant",
|
||||||
"assign",
|
"assign",
|
||||||
|
|
@ -2496,7 +2496,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-common"
|
name = "ruma-common"
|
||||||
version = "0.15.2"
|
version = "0.15.2"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"as_variant",
|
"as_variant",
|
||||||
"base64",
|
"base64",
|
||||||
|
|
@ -2526,8 +2526,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-events"
|
name = "ruma-events"
|
||||||
version = "0.30.2"
|
version = "0.30.3"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"as_variant",
|
"as_variant",
|
||||||
"indexmap 2.10.0",
|
"indexmap 2.10.0",
|
||||||
|
|
@ -2550,7 +2550,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-federation-api"
|
name = "ruma-federation-api"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"headers",
|
"headers",
|
||||||
|
|
@ -2572,7 +2572,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-identifiers-validation"
|
name = "ruma-identifiers-validation"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js_int",
|
"js_int",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
|
|
@ -2581,7 +2581,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-macros"
|
name = "ruma-macros"
|
||||||
version = "0.15.1"
|
version = "0.15.1"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"proc-macro-crate",
|
"proc-macro-crate",
|
||||||
|
|
@ -2596,7 +2596,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-push-gateway-api"
|
name = "ruma-push-gateway-api"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js_int",
|
"js_int",
|
||||||
"ruma-common",
|
"ruma-common",
|
||||||
|
|
@ -2608,7 +2608,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-signatures"
|
name = "ruma-signatures"
|
||||||
version = "0.17.1"
|
version = "0.17.1"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"ed25519-dalek",
|
"ed25519-dalek",
|
||||||
|
|
@ -2624,7 +2624,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruma-state-res"
|
name = "ruma-state-res"
|
||||||
version = "0.13.0"
|
version = "0.13.0"
|
||||||
source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
source = "git+https://github.com/ruma/ruma.git?rev=5aebd8f81fc70226940c1a46eb57ef298230d34f#5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js_int",
|
"js_int",
|
||||||
"ruma-common",
|
"ruma-common",
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ xdg = "2.5.2"
|
||||||
|
|
||||||
[dependencies.ruma]
|
[dependencies.ruma]
|
||||||
git = "https://github.com/ruma/ruma.git"
|
git = "https://github.com/ruma/ruma.git"
|
||||||
rev = "c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337"
|
rev = "5aebd8f81fc70226940c1a46eb57ef298230d34f"
|
||||||
features = [
|
features = [
|
||||||
"compat-server-signing-key-version",
|
"compat-server-signing-key-version",
|
||||||
"compat-empty-string-null",
|
"compat-empty-string-null",
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ use std::{fmt::Debug, mem, time::Duration};
|
||||||
use bytes::BytesMut;
|
use bytes::BytesMut;
|
||||||
use ruma::api::{
|
use ruma::api::{
|
||||||
appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest,
|
appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest,
|
||||||
SendAccessToken,
|
SendAccessToken, SupportedVersions,
|
||||||
};
|
};
|
||||||
use tracing::warn;
|
use tracing::warn;
|
||||||
|
|
||||||
|
|
@ -31,7 +31,10 @@ where
|
||||||
.try_into_http_request::<BytesMut>(
|
.try_into_http_request::<BytesMut>(
|
||||||
&destination,
|
&destination,
|
||||||
SendAccessToken::IfRequired(hs_token),
|
SendAccessToken::IfRequired(hs_token),
|
||||||
&[MatrixVersion::V1_0],
|
&SupportedVersions {
|
||||||
|
versions: [MatrixVersion::V1_0].into_iter().collect(),
|
||||||
|
features: vec![],
|
||||||
|
},
|
||||||
)
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.map(BytesMut::freeze);
|
.map(BytesMut::freeze);
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ use ruma::{
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
EndpointError, IncomingResponse, MatrixVersion, OutgoingRequest,
|
EndpointError, IncomingResponse, MatrixVersion, OutgoingRequest,
|
||||||
OutgoingResponse, SendAccessToken,
|
OutgoingResponse, SendAccessToken, SupportedVersions,
|
||||||
},
|
},
|
||||||
directory::{Filter, RoomNetwork},
|
directory::{Filter, RoomNetwork},
|
||||||
events::{
|
events::{
|
||||||
|
|
@ -199,7 +199,10 @@ where
|
||||||
.try_into_http_request::<Vec<u8>>(
|
.try_into_http_request::<Vec<u8>>(
|
||||||
&actual_destination_str,
|
&actual_destination_str,
|
||||||
SendAccessToken::IfRequired(""),
|
SendAccessToken::IfRequired(""),
|
||||||
&[MatrixVersion::V1_11],
|
&SupportedVersions {
|
||||||
|
versions: [MatrixVersion::V1_11].into_iter().collect(),
|
||||||
|
features: vec![],
|
||||||
|
},
|
||||||
)
|
)
|
||||||
.map_err(|error| {
|
.map_err(|error| {
|
||||||
warn!(
|
warn!(
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ use ruma::{
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
|
IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken,
|
||||||
|
SupportedVersions,
|
||||||
},
|
},
|
||||||
events::{
|
events::{
|
||||||
room::power_levels::RoomPowerLevelsEventContent, AnySyncTimelineEvent,
|
room::power_levels::RoomPowerLevelsEventContent, AnySyncTimelineEvent,
|
||||||
|
|
@ -78,7 +79,10 @@ impl Service {
|
||||||
.try_into_http_request::<BytesMut>(
|
.try_into_http_request::<BytesMut>(
|
||||||
&destination,
|
&destination,
|
||||||
SendAccessToken::IfRequired(""),
|
SendAccessToken::IfRequired(""),
|
||||||
&[MatrixVersion::V1_0],
|
&SupportedVersions {
|
||||||
|
versions: [MatrixVersion::V1_0].into_iter().collect(),
|
||||||
|
features: vec![],
|
||||||
|
},
|
||||||
)
|
)
|
||||||
.map_err(|error| {
|
.map_err(|error| {
|
||||||
warn!(%error, %destination, "Failed to find destination");
|
warn!(%error, %destination, "Failed to find destination");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue