feat: Switch toruma-api's request/response macro to reduce HTTP boilerplate

Cargo.toml

@@ -1,14 +1,15 @@
 [workspace]
-members = [
-    "crates/core",
-    "crates/matrix",
-    "crates/server",
-    "crates/test"
-]
+members = ["crates/core", "crates/matrix", "crates/server", "crates/test"]
 default-members = ["crates/server"]
-resolver = "1"
+resolver = "2"
 
 [workspace.dependencies]
+async-trait = "0.1.74"
+hex = "0.4.3"
+hmac = "0.12.1"
+serde_path_to_error = "0.1.14"
+serde_qs = "0.12.0"
+sha1 = "0.10.6"
 anyhow = "1.0.75"
 axum = { version = "0.7.4", features = ["tokio"] }
 chrono = { version = "0.4.34", features = ["serde"] }
@@ -17,7 +18,12 @@ http = "0.2.11"
 mime = "0.3.17"
 openssl = { version = "0.10.63", features = ["vendored"] }
 openssl-sys = { version = "0.9.99", features = ["vendored"] }
-reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls", "multipart"] }
+reqwest = { version = "0.11.22", default-features = false, features = [
+  "blocking",
+  "json",
+  "rustls",
+  "multipart",
+] }
 serde = "1.0.192"
 serde_json = "1.0.108"
 tokio = "1.34.0"

crates/core/src/lib.rs

@@ -1,4 +1,7 @@
-pub mod account;
+//! This library deals with our core logic, such as authorizing user interactions,
+//! forwarding regular events and constructing custom requests.
+
+pub mod session;
 pub mod auth;
 pub mod error;
 pub mod mail;
@@ -9,14 +12,11 @@ pub use error::{Error, HttpStatusCode, Result};
 
 use mail::service::MailService;
 use room::service::RoomService;
+use tokio::sync::mpsc::Receiver;
 use url::Url;
 
 use std::{fmt::Debug, str::FromStr, sync::Arc};
 
-use matrix::Client as MatrixAdminClient;
-
-use self::{account::service::AccountService, auth::service::AuthService};
-
 pub mod env {
     pub const COMMUNE_SYNAPSE_HOST: &str = "COMMUNE_SYNAPSE_HOST";
     pub const COMMUNE_SYNAPSE_ADMIN_TOKEN: &str = "COMMUNE_SYNAPSE_ADMIN_TOKEN";
@@ -92,9 +92,7 @@ impl CommuneConfig {
 }
 
 pub struct Commune {
-    pub account: Arc<AccountService>,
-    pub auth: Arc<AuthService>,
-    pub room: Arc<RoomService>,
+
 }
 
 impl Commune {

crates/matrix/Cargo.toml

@@ -5,22 +5,31 @@ edition = "2021"
 publish = false
 
 [dependencies]
-async-trait = "0.1.74"
-hex = "0.4.3"
-hmac = "0.12.1"
-serde_path_to_error = "0.1.14"
-serde_qs = "0.12.0"
-sha1 = "0.10.6"
-ruma-events = { version = "0.27.11", features = ["html", "markdown"] }
-ruma-common = { version = "0.12.1", features = ["rand"] }
-ruma-macros = "0.12.0"
+ruma-events = { version = "0.27.11", default_features = false, features = [
+  "html",
+  "markdown",
+] }
+ruma-common = { version = "0.12.0", default_features = false, features = [
+  "api",
+  "rand",
+] }
+ruma-macros = { version = "0.12.0", default_features = false }
+ruma-client = { version = "0.12.0", default_features = false }
 
 # Workspace Dependencies
-anyhow = { workspace = true }
-chrono = { workspace = true, features = ["serde"] }
 mime = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
+sha1 = { workspace = true }
 url = { workspace = true, features = ["serde"] }
+hex = { workspace = true }
+hmac = { workspace = true }
+http.workspace = true
+bytes = "1.5.0"
+async-trait = "0.1.77"
+
+[features]
+client = []
+server = []

crates/matrix/src/admin/mod.rs

@@ -1 +1,7 @@
-pub mod resources;
+//! This module is the root of the admin API.
+//!
+//! reference: https://matrix-org.github.io/synapse/latest/usage/administration/admin_api/index.html
+
+pub mod room;
+pub mod session;
+pub mod user;