Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ homepage = "https://ruma.dev/"
keywords = ["matrix", "chat", "messaging", "ruma"]
license = "MIT"
repository = "https://github.com/ruma/synapse-admin-api"
edition = "2021"
edition = "2024"
rust-version = "1.88"

[features]
Expand Down
2 changes: 1 addition & 1 deletion src/account_validity/renew_account/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [GET /_synapse/admin/v1/account_validity/validity](https://github.com/element-hq/synapse/blob/master/docs/admin_api/account_validity.md)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
MilliSecondsSinceUnixEpoch, OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down
5 changes: 4 additions & 1 deletion src/background_updates/status/v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ fn test_status_background_updates() {

// Serialize
let serialized = serde_json::to_string(&response).expect("Failed to serialize");
assert_eq!(serialized, "{\"enabled\":true,\"current_updates\":{\"master\":{\"name\":\"current update 1\",\"total_item_count\":123456789,\"total_duration_ms\":2134567.12345,\"average_items_per_ms\":2.5}}}");
assert_eq!(
serialized,
"{\"enabled\":true,\"current_updates\":{\"master\":{\"name\":\"current update 1\",\"total_item_count\":123456789,\"total_duration_ms\":2134567.12345,\"average_items_per_ms\":2.5}}}"
);

// Deserialize
let deserialized: Response = serde_json::from_str(&serialized).expect("Failed to deserialize");
Expand Down
3 changes: 2 additions & 1 deletion src/experimental_features/enable_features/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
//! [PUT /_synapse/admin/v1/experimental_features/:user_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/experimental_features.md#enablingdisabling-features)

use ruma::{
OwnedUserId,
api::{auth_scheme::AccessToken, request, response},
metadata, OwnedUserId,
metadata,
};
use serde::{Deserialize, Serialize};

Expand Down
3 changes: 2 additions & 1 deletion src/experimental_features/list_features/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
//! [GET /_synapse/admin/v1/experimental_features/:user_id](https://github.com/element-hq/synapse/blob/develop/docs/admin_api/experimental_features.md#listing-enabled-features)

use ruma::{
OwnedUserId,
api::{auth_scheme::AccessToken, request, response},
metadata, OwnedUserId,
metadata,
};
use serde::{Deserialize, Serialize};

Expand Down
12 changes: 3 additions & 9 deletions src/register_users/shared_secret_register/v1.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//! [POST /_synapse/admin/v1/register](https://github.com/element-hq/synapse/blob/master/docs/admin_api/register_api.md)

#[cfg(feature = "shared-secret-registration-mac")]
use hmac::{digest::InvalidLength, Hmac, Mac};
use hmac::{Hmac, Mac, digest::InvalidLength};
use ruma::{
api::{auth_scheme::NoAuthentication, metadata, request, response},
OwnedDeviceId, OwnedServerName, OwnedUserId,
api::{auth_scheme::NoAuthentication, metadata, request, response},
};
#[cfg(feature = "shared-secret-registration-mac")]
use sha1::Sha1;
Expand Down Expand Up @@ -103,13 +103,7 @@ pub fn hmac(
mac.update(b"\x00");
mac.update(password.as_bytes());
mac.update(b"\x00");
mac.update({
if admin {
b"admin"
} else {
b"notadmin"
}
});
mac.update(if admin { b"admin" } else { b"notadmin" });
let mac = mac.finalize();
let mac = hex::encode(mac.into_bytes());

Expand Down
3 changes: 2 additions & 1 deletion src/room_membership/join_room/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
//! [POST /_synapse/admin/v1/join/:room_id_or_alias](https://github.com/element-hq/synapse/blob/master/docs/admin_api/room_membership.md)

use ruma::{
OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId,
api::{auth_scheme::AccessToken, request, response},
metadata, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId,
metadata,
};

metadata! {
Expand Down
3 changes: 2 additions & 1 deletion src/rooms/list_rooms/v1.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
//! [GET /_synapse/admin/v1/rooms](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#list-room-api)
use ruma::{
OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
api::{auth_scheme::AccessToken, metadata, request, response},
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
room::{JoinRuleKind, RoomType},
serde::StringEnum,
uint, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
uint,
};
use serde::{Deserialize, Serialize};

Expand Down
3 changes: 2 additions & 1 deletion src/rooms/room_details/v1.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
//! [GET /_synapse/admin/v1/rooms/:room_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#room-details-api)
use ruma::{
OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
api::{auth_scheme::AccessToken, metadata, request, response},
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
room::{JoinRuleKind, RoomType},
uint, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
uint,
};

metadata! {
Expand Down
2 changes: 1 addition & 1 deletion src/rooms/room_members/v1.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! [GET /_synapse/admin/v1/rooms/:room_id/members](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#room-members-api)
use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedRoomId, OwnedUserId, UInt,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down
2 changes: 1 addition & 1 deletion src/serde.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! synapse admin api specific serde

use serde::{de::Visitor, Deserializer};
use serde::{Deserializer, de::Visitor};

pub(crate) fn bool_or_uint<'de, D>(deserializer: D) -> Result<bool, D::Error>
where
Expand Down
2 changes: 1 addition & 1 deletion src/users.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub mod list_joined_rooms;
pub mod list_users;
pub mod reset_password;

use ruma::{thirdparty::ThirdPartyIdentifier, SecondsSinceUnixEpoch};
use ruma::{SecondsSinceUnixEpoch, thirdparty::ThirdPartyIdentifier};
use serde::{Deserialize, Serialize};

/// User details
Expand Down
2 changes: 1 addition & 1 deletion src/users/create_or_modify/v2.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! [PUT /_synapse/admin/v2/users/:user_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#create-or-modify-account)

use ruma::{
OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
thirdparty::Medium,
OwnedUserId,
};
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/users/deactivate_account/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [POST /_synapse/admin/v1/deactivate/:user_id](https://github.com/element-hq/synapse/blob/develop/docs/admin_api/user_admin_api.md#deactivate-account)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down
2 changes: 1 addition & 1 deletion src/users/get_details/v2.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [GET /_synapse/admin/v2/users/:user_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#query-user-account)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
};

pub use crate::users::UserDetails;
Expand Down
2 changes: 1 addition & 1 deletion src/users/is_user_admin/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [GET /_synapse/admin/v1/users/:user_id/admin](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#get-whether-a-user-is-a-server-administrator-or-not)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down
2 changes: 1 addition & 1 deletion src/users/list_joined_rooms/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [GET /_synapse/admin/v1/users/:user_id/joined_rooms](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#list-joined-rooms-of-a-user)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedRoomId, OwnedUserId, UInt,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down
2 changes: 1 addition & 1 deletion src/users/list_users/v2.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [GET /_synapse/admin/v2/users](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#list-accounts)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedUserId, UInt,
api::{auth_scheme::AccessToken, metadata, request, response},
};
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/users/reset_password/v1.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! [POST /_synapse/admin/v1/reset_password/:user_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/user_admin_api.md#reset-password)

use ruma::{
api::{auth_scheme::AccessToken, metadata, request, response},
OwnedUserId,
api::{auth_scheme::AccessToken, metadata, request, response},
};

metadata! {
Expand Down