pierre/MatrixGW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pierre:036118d73762304e763022e88384b1a214b946d3
Branches Tags
pierre:master
pierre:v1.0.0
..
compare: pierre:master
Branches Tags
pierre:master
pierre:v1.0.0

10 Commits
036118d737 ... master

Author SHA1 Message Date
Renovate Bot
54dd04b65e Merge pull request 'Update Rust crate clap to 4.5.41' (#68) from renovate/clap-4.x into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-07-10 00:52:29 +00:00
Renovate Bot
8ca288748d Update Rust crate clap to 4.5.41
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
2025-07-10 00:16:08 +00:00
Renovate Bot
3849e812a8 Merge pull request 'Update Rust crate ruma to 0.12.5' (#67) from renovate/ruma-0.x into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-07-09 00:40:11 +00:00
Renovate Bot
57e49a86d9 Update Rust crate ruma to 0.12.5
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2025-07-09 00:15:36 +00:00
Renovate Bot
9cfe3f33e9 Merge pull request 'Update Rust crate ruma to 0.12.4' (#66) from renovate/ruma-0.x into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-07-08 00:40:43 +00:00
Renovate Bot
26d1ee3602 Update Rust crate ruma to 0.12.4
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
2025-07-08 00:15:35 +00:00
Renovate Bot
286547d455 Merge pull request 'Update Rust crate tokio to 1.46.1' (#65) from renovate/tokio-1.x into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-07-05 00:44:48 +00:00
Renovate Bot
47337dc140 Update Rust crate tokio to 1.46.1
Some checks failed
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is failing
Details
2025-07-05 00:09:10 +00:00
Renovate Bot
e1b0c9563f Update Rust crate tokio to 1.46.0
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details
2025-07-04 00:09:01 +00:00
Pierre HUBERT
5e84b40d05 Fix cargo clippy issues
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-07-03 08:32:53 +02:00
6 changed files with 30 additions and 30 deletions
Expand all files Collapse all files

36
Cargo.lock generated
View File

@ -719,9 +719,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.40"
version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
dependencies = [
"clap_builder",
"clap_derive",
@ -729,9 +729,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.40"
version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
dependencies = [
"anstream",
"anstyle",
@ -741,9 +741,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.5.40"
version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
dependencies = [
"heck",
"proc-macro2",
@ -2750,9 +2750,9 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.12.3"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d910a9b75cbf0e88f74295997c1a41c3ab7a117879a029c72db815192c167a0d"
checksum = "c1d47e42b7dea75a468dea63a230f51331c58d690ca018ea1c6ac782ea98880c"
dependencies = [
"assign",
"js_int",
@ -2788,9 +2788,9 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.20.3"
version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc4ff88a70a3d1e7a2c5b51cca7499cb889b42687608ab664b9a216c49314d"
checksum = "3a9e9c613cfda4923b851c5d8bc442305905bee4f0c2b924564b00e71636c8d4"
dependencies = [
"as_variant",
"assign",
@ -2812,9 +2812,9 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.15.2"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b75da013b362664c3e161662902e5da3f77e990525681b59c6035bac27e87b4"
checksum = "387e1898e868d32ff7b205e7db327361d5dcf635c00a8ae5865068607595a9cf"
dependencies = [
"as_variant",
"base64 0.22.1",
@ -2844,9 +2844,9 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.30.3"
version = "0.30.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41ab3d1b54c32a65194ecc44bc7f7575df50ef4255b139547d7dcc1753dc883d"
checksum = "3cdc7abec9bc2a9ca0b4831cc26ce97a6a8c39a0bde44a19281a719e861b4293"
dependencies = [
"as_variant",
"indexmap",
@ -2878,9 +2878,9 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.15.1"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1182e83ee5cd10121974f163337b16af68a93eedfc7cdbdbd52307ac7e1d743"
checksum = "5ff13fbd6045a7278533390826de316d6116d8582ed828352661337b0c422e1c"
dependencies = [
"cfg-if",
"proc-macro-crate",
@ -3487,9 +3487,9 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.46.0"
version = "1.46.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1140bb80481756a8cbe10541f37433b459c5aa1e727b4c020fbfebdc25bf3ec4"
checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
dependencies = [
"backtrace",
"bytes",

6
Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
log = "0.4.27"
env_logger = "0.11.8"
clap = { version = "4.5.40", features = ["derive", "env"] }
clap = { version = "4.5.41", features = ["derive", "env"] }
lazy_static = "1.5.0"
anyhow = "1.0.98"
serde = { version = "1.0.219", features = ["derive"] }
@ -30,6 +30,6 @@ actix-remote-ip = "0.1.0"
bytes = "1.10.1"
sha2 = "0.11.0-rc.0"
base16ct = "0.2.0"
ruma = { version = "0.12.3", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
ruma = { version = "0.12.5", features = ["client-api-c", "client-ext-client-api", "client-hyper-native-tls", "rand"] }
actix-ws = "0.3.0"
tokio = { version = "1.46.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
tokio = { version = "1.46.1", features = ["rt", "time", "macros", "rt-multi-thread"] }

4
src/server/api/ws.rs
View File

@ -34,7 +34,7 @@ pub async fn ws(
if let Err(e) = tx.send(BroadcastMessage::StartSyncTaskForUser(
auth.user.user_id.clone(),
)) {
log::error!("Failed to send StartSyncTaskForUser: {}", e);
log::error!("Failed to send StartSyncTaskForUser: {e}");
}
let rx = tx.subscribe();
@ -96,7 +96,7 @@ pub async fn ws_handler(
// Send the message to the websocket
if let Ok(msg) = serde_json::to_string(&WsMessage::Sync(*event)) {
if let Err(e) = session.text(msg).await {
log::error!("Failed to send SyncEvent: {}", e);
log::error!("Failed to send SyncEvent: {e}");
}
}
}

8
src/server/web_ui.rs
View File

@ -105,12 +105,12 @@ pub async fn home(
// Close sync task
if let Err(e) = tx.send(BroadcastMessage::StopSyncTaskForUser(user.id.clone())) {
log::error!("Failed to send StopSyncClientForUser: {}", e);
log::error!("Failed to send StopSyncClientForUser: {e}");
}
// Invalidate all Ws connections
if let Err(e) = tx.send(BroadcastMessage::CloseAllUserSessions(user.id.clone())) {
log::error!("Failed to send CloseAllUserSessions: {}", e);
log::error!("Failed to send CloseAllUserSessions: {e}");
}
}
}
@ -145,7 +145,7 @@ pub async fn home(
success_message = Some("The client was successfully deleted!".to_string());
if let Err(e) = tx.send(BroadcastMessage::CloseClientSession(delete_client_id)) {
log::error!("Failed to send CloseClientSession: {}", e);
log::error!("Failed to send CloseClientSession: {e}");
}
}
}
@ -215,7 +215,7 @@ pub async fn oidc_cb(session: Session, query: web::Query<AuthCallbackQuery>) ->
name: user.name.unwrap_or("no_name".to_string()),
email: user.email.unwrap_or("no@mail.com".to_string()),
};
log::info!("Successful authentication as {:?}", user);
log::info!("Successful authentication as {user:?}");
session.insert(USER_SESSION_KEY, user)?;
Ok(HttpResponse::Found()

4
src/sync_client.rs
View File

@ -28,7 +28,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
continue;
}
log::info!("Start sync task for user {:?}", user_id);
log::info!("Start sync task for user {user_id:?}");
let task_id = SyncClientID(uuid::Uuid::new_v4());
running_tasks.insert(user_id.clone(), task_id.clone());
@ -41,7 +41,7 @@ pub async fn sync_client_manager(tx: broadcast::Sender<BroadcastMessage>) -> ! {
BroadcastMessage::StopSyncTaskForUser(user_id) => {
// Check if a task is running for this user
if let Some(task_id) = running_tasks.remove(&user_id) {
log::info!("Stop sync task for user {:?}", user_id);
log::info!("Stop sync task for user {user_id:?}");
tx.send(BroadcastMessage::StopSyncClient(task_id)).unwrap();
} else {
log::info!("Not stopping sync task for user {user_id:?}: not running");

2
src/user.rs
View File

@ -147,7 +147,7 @@ impl UserConfig {
log::warn!("The bucket does not seem to exists, trying to create it!")
}
Err(e) => {
log::error!("Got unexpected error when querying bucket info: {}", e);
log::error!("Got unexpected error when querying bucket info: {e}");
return Err(e.into());
}
}