Skip to content

Commit 0a43b56

Browse files
committed
Upgrade Ruma
1 parent 9a8a937 commit 0a43b56

File tree

14 files changed

+17
-18
lines changed

14 files changed

+17
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Breaking changes:
1313
them as if they were exhaustive, use the `ruma_unstable_exhaustive_types`
1414
compile-time `cfg` setting.
1515
* Changed `users::create_or_modify::v2` third party id parsing by adding a new type without `validated_at` and `added_at` fields (which are not sent according to the API documentation)
16+
* Upgrade ruma to 0.13.0
1617

1718
Improvement:
1819

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ shared-secret-registration-mac = ["dep:hex", "dep:hmac", "dep:sha1"]
1919
[dependencies]
2020
hex = { version = "0.4.3", optional = true }
2121
hmac = { version = "0.12.1", optional = true }
22-
ruma = { version = "0.12.0", features = ["api", "events"] }
22+
ruma = { version = "0.13.0", features = ["api", "events"] }
2323
serde = { version = "1.0.118", features = ["derive"] }
2424
sha1 = { version = "0.10.1", optional = true }
2525

src/experimental_features/enable_features/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const METADATA: Metadata = metadata! {
1111
rate_limited: false,
1212
authentication: AccessToken,
1313
history: {
14-
unstable => "/_synapse/admin/v1/experimental_features/:user_id",
14+
unstable => "/_synapse/admin/v1/experimental_features/{user_id}",
1515
}
1616
};
1717

src/experimental_features/list_features/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const METADATA: Metadata = metadata! {
1313
rate_limited: false,
1414
authentication: AccessToken,
1515
history: {
16-
unstable => "/_synapse/admin/v1/experimental_features/:user_id",
16+
unstable => "/_synapse/admin/v1/experimental_features/{user_id}",
1717
}
1818
};
1919

src/room_membership/join_room/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const METADATA: Metadata = metadata! {
1010
rate_limited: false,
1111
authentication: AccessToken,
1212
history: {
13-
unstable => "/_synapse/admin/v1/join/:room_id_or_alias",
13+
unstable => "/_synapse/admin/v1/join/{room_id_or_alias}",
1414
}
1515
};
1616

src/rooms/list_rooms/v1.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
use ruma::{
33
api::{metadata, request, response, Metadata},
44
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
5-
room::RoomType,
5+
room::{JoinRuleKind, RoomType},
66
serde::{OrdAsRefStr, PartialEqAsRefStr, PartialOrdAsRefStr, StringEnum},
7-
space::SpaceRoomJoinRule,
87
uint, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
98
};
109
use serde::{Deserialize, Serialize};
@@ -183,7 +182,7 @@ pub struct RoomDetails {
183182
pub public: bool,
184183

185184
/// Join rules of the room.
186-
pub join_rules: Option<SpaceRoomJoinRule>,
185+
pub join_rules: Option<JoinRuleKind>,
187186

188187
/// Guest access of the room
189188
pub guest_access: Option<GuestAccess>,

src/rooms/room_details/v1.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
use ruma::{
33
api::{metadata, request, response, Metadata},
44
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
5-
room::RoomType,
6-
space::SpaceRoomJoinRule,
5+
room::{JoinRuleKind, RoomType},
76
uint, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
87
};
98

@@ -12,7 +11,7 @@ const METADATA: Metadata = metadata! {
1211
rate_limited: false,
1312
authentication: AccessToken,
1413
history: {
15-
unstable => "/_synapse/admin/v1/rooms/:room_id",
14+
unstable => "/_synapse/admin/v1/rooms/{room_id}",
1615
}
1716
};
1817

@@ -68,7 +67,7 @@ pub struct Response {
6867
pub public: bool,
6968

7069
/// Join rules of the room.
71-
pub join_rules: Option<SpaceRoomJoinRule>,
70+
pub join_rules: Option<JoinRuleKind>,
7271

7372
/// Guest access of the room
7473
pub guest_access: Option<GuestAccess>,

src/rooms/room_members/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const METADATA: Metadata = metadata! {
99
rate_limited: false,
1010
authentication: AccessToken,
1111
history: {
12-
unstable => "/_synapse/admin/v1/rooms/:room_id/members",
12+
unstable => "/_synapse/admin/v1/rooms/{room_id}/members",
1313
}
1414
};
1515

src/users/create_or_modify/v2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const METADATA: Metadata = metadata! {
1414
rate_limited: false,
1515
authentication: AccessToken,
1616
history: {
17-
unstable => "/_synapse/admin/v2/users/:user_id",
17+
unstable => "/_synapse/admin/v2/users/{user_id}",
1818
}
1919
};
2020

src/users/deactivate_account/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const METADATA: Metadata = metadata! {
1010
rate_limited: false,
1111
authentication: AccessToken,
1212
history: {
13-
unstable => "/_synapse/admin/v1/deactivate/:user_id",
13+
unstable => "/_synapse/admin/v1/deactivate/{user_id}",
1414
}
1515
};
1616

0 commit comments

Comments
 (0)