Format

715209 · 715209 · commit 92886aeef789 · 2025-04-23T20:36:48.000+02:00
diff --git a/src/chat/kick.rs b/src/chat/kick.rs
@@ -4,15 +4,16 @@ use std::time::Duration;
 use async_trait::async_trait;
 use futures_util::{SinkExt as _, StreamExt as _};
 use tokio::{
-    sync::{mpsc, Mutex},
+    sync::{Mutex, mpsc},
     time,
 };
 use tokio_tungstenite::tungstenite::Message as TMessage;
 use tracing::{info, warn};
 
 use crate::{
+    ChatSender,
     chat::{self, ChatPlatform, HandleMessage, InternalUpdate},
-    config, error, ChatSender,
+    config, error,
 };
 
 const KICK_CHAT_WS: &str = "wss://ws-us2.pusher.com/app/32cbd69e4b950bf97679?protocol=7&client=js&version=7.6.0&flash=false";
@@ -337,8 +338,8 @@ impl Inner {
     }
 }
 
-async fn get_connection(
-) -> tokio_tungstenite::WebSocketStream<tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>> {
+async fn get_connection()
+-> tokio_tungstenite::WebSocketStream<tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>> {
     let mut retry_grow = 1;
 
     loop {
diff --git a/src/chat/twitch.rs b/src/chat/twitch.rs
@@ -4,16 +4,16 @@ use async_trait::async_trait;
 use tokio::sync::mpsc;
 use tracing::{error, info, trace};
 use twitch_irc::{
+    ClientConfig, SecureTCPTransport, TwitchIRCClient,
     login::StaticLoginCredentials,
     message,
     transport::tcp::{TCPTransport, TLS},
-    ClientConfig, SecureTCPTransport, TwitchIRCClient,
 };
 
 use crate::{
+    ChatSender,
     chat::{self, ChatPlatform, HandleMessage},
     twitch_pubsub::PubsubManager,
-    ChatSender,
 };
 
 #[derive(Clone)]
@@ -62,8 +62,7 @@ impl Twitch {
                 message::ServerMessage::RoomState(state) => {
                     trace!(
                         "user_id: {}, user_name: {}",
-                        state.channel_id,
-                        state.channel_login
+                        state.channel_id, state.channel_login
                     );
                     pubsub.add_raid(state.channel_id, state.channel_login).await;
                 }
diff --git a/src/main.rs b/src/main.rs
@@ -4,7 +4,7 @@ use std::{env, sync::Arc};
 use anyhow::Result;
 use tokio::signal;
 
-use noalbs::{chat::ChatPlatform, config, Noalbs};
+use noalbs::{Noalbs, chat::ChatPlatform, config};
 use tracing::warn;
 
 #[tokio::main]
diff --git a/src/state.rs b/src/state.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashSet, sync::Arc};
 
 use serde::Serialize;
-use tokio::sync::{mpsc, Notify};
+use tokio::sync::{Notify, mpsc};
 
 use crate::{broadcasting_software::BroadcastingSoftwareLogic, config};
 
diff --git a/src/stream_servers/belabox.rs b/src/stream_servers/belabox.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use tracing::{error, trace};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/irlhosting.rs b/src/stream_servers/irlhosting.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use tracing::{error, trace};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/mediamtx.rs b/src/stream_servers/mediamtx.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use tracing::{error, trace};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/nginx.rs b/src/stream_servers/nginx.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use log::{error, trace};
 use serde::{Deserialize, Serialize};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/nimble.rs b/src/stream_servers/nimble.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use tracing::error;
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/nms.rs b/src/stream_servers/nms.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use log::{error, trace};
 use serde::{Deserialize, Serialize};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/rist.rs b/src/stream_servers/rist.rs
@@ -3,7 +3,7 @@ use log::error;
 use serde::{Deserialize, Serialize};
 use tracing::trace;
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/sls.rs b/src/stream_servers/sls.rs
@@ -3,7 +3,7 @@ use log::{error, trace};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/stream_servers/xiu.rs b/src/stream_servers/xiu.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 use log::{error, trace};
 use serde::{Deserialize, Serialize};
 
-use super::{default_reqwest_client, Bsl, StreamServersCommands, SwitchLogic};
+use super::{Bsl, StreamServersCommands, SwitchLogic, default_reqwest_client};
 use crate::switcher::{SwitchType, Triggers};
 
 #[derive(Deserialize, Debug)]
diff --git a/src/switcher.rs b/src/switcher.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use serde::{Deserialize, Serialize};
 use tokio::sync::Notify;
-use tracing::{debug, error, info, Instrument};
+use tracing::{Instrument, debug, error, info};
 
 use crate::{
     chat, error,
diff --git a/src/twitch_pubsub.rs b/src/twitch_pubsub.rs
@@ -1,19 +1,19 @@
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
 use futures_util::{
-    stream::{SplitSink, SplitStream},
     SinkExt, StreamExt,
+    stream::{SplitSink, SplitStream},
 };
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::{
     net::TcpStream,
-    sync::{mpsc, oneshot, Mutex},
+    sync::{Mutex, mpsc, oneshot},
     time::{self, Instant},
 };
 use tokio_tungstenite::{
-    tungstenite::{self, protocol::CloseFrame, Message as TMessage},
     MaybeTlsStream, WebSocketStream,
+    tungstenite::{self, Message as TMessage, protocol::CloseFrame},
 };
 use tracing::{debug, error, info, trace, warn};
 
diff --git a/src/user_manager.rs b/src/user_manager.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use tokio::sync::RwLock;
 
-use crate::{chat, config, Noalbs};
+use crate::{Noalbs, chat, config};
 
 type User = Arc<RwLock<HashMap<String, Arc<Noalbs>>>>;
 
diff --git a/src/web_server.rs b/src/web_server.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use futures_util::{SinkExt, StreamExt, TryFutureExt};
 use tokio::sync::mpsc::{self, UnboundedSender};
 use tracing::info;
-use warp::{ws::WebSocket, Filter};
+use warp::{Filter, ws::WebSocket};
 
 use crate::{user_manager::UserManager, ws};
 
diff --git a/src/ws/mod.rs b/src/ws/mod.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
 use argon2::{
+    Argon2,
     password_hash::{
-        rand_core::{OsRng, RngCore},
         PasswordHash, PasswordHasher, PasswordVerifier, SaltString,
+        rand_core::{OsRng, RngCore},
     },
-    Argon2,
 };
 use base64::Engine;
 use tokio::sync::mpsc;
diff --git a/src/ws/ws_handler.rs b/src/ws/ws_handler.rs
@@ -2,17 +2,18 @@ use std::{collections::HashMap, sync::Arc};
 
 use futures_util::StreamExt;
 use tokio::sync::{
-    mpsc::{UnboundedReceiver, UnboundedSender},
     RwLock,
+    mpsc::{UnboundedReceiver, UnboundedSender},
 };
 use tokio_stream::wrappers::UnboundedReceiverStream;
 use tracing::debug;
 
-use crate::{user_manager, Noalbs};
+use crate::{Noalbs, user_manager};
 
 use super::{
+    InternalClientToken, WsClient, WsMessage,
     requests::{Auth, SetPassword},
-    responses, InternalClientToken, WsClient, WsMessage,
+    responses,
 };
 
 pub struct WsHandler {
