Avii/irc-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*SNEEZE*

Browse Source
This commit is contained in:
Avii
2025-03-07 19:13:44 +01:00
parent 460a18638f
commit d005e8fec9
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.rs
View File

@@ -1,5 +1,4 @@
use std::collections::{HashMap, HashSet}; use std::collections::HashMap;
use std::marker;
use std::time::Instant; use std::time::Instant;
use std::{io::Cursor, net::SocketAddr, str::FromStr, sync::Arc, time::Duration}; use std::{io::Cursor, net::SocketAddr, str::FromStr, sync::Arc, time::Duration};
@@ -25,8 +24,7 @@ struct Client {
username: Option<String>, username: Option<String>,
realname: Option<String>, realname: Option<String>,
modes: HashSet<u8>, // [byte per mode](https://www.unrealircd.org/docs/User_modes) // modes: HashSet<u8>, // [byte per mode](https://www.unrealircd.org/docs/User_modes)
last_pong: Instant, last_pong: Instant,
c2s_tx: Option<Sender<Message>>, c2s_tx: Option<Sender<Message>>,
@@ -46,7 +44,7 @@ impl Client {
username: None, username: None,
realname: None, realname: None,
modes: HashSet::new(), // modes: HashSet::new(),
last_pong: Instant::now(), last_pong: Instant::now(),
c2s_tx: Some(c2s_tx), c2s_tx: Some(c2s_tx),
@@ -63,7 +61,7 @@ impl Client {
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct AppState { pub struct AppState {
clients: RwLock<HashMap<SocketAddr, Client>>, clients: RwLock<HashMap<SocketAddr, Client>>,
} }
@@ -96,7 +94,7 @@ impl AppState {
&self, &self,
peer_addr: SocketAddr, peer_addr: SocketAddr,
username: &str, username: &str,
mode: u16, // mode: u16,
realname: Option<&str>, realname: Option<&str>,
) { ) {
if let Some(client) = self.clients.write().await.get_mut(&peer_addr) { if let Some(client) = self.clients.write().await.get_mut(&peer_addr) {
@@ -191,7 +189,7 @@ async fn main() -> Result<()> {
let acceptor = TlsAcceptor::from(Arc::new(config)); let acceptor = TlsAcceptor::from(Arc::new(config));
let listener = TcpListener::bind("0.0.0.0:6697").await?; let listener = TcpListener::bind("0.0.0.0:6697").await?;
// which means, this goes into yet another thread // Connection loop
let state: Arc<AppState> = app_state.clone(); let state: Arc<AppState> = app_state.clone();
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
@@ -217,7 +215,7 @@ async fn main() -> Result<()> {
} }
}); });
// todo: the "processing" loop goes here... // Processing loop
let state: Arc<AppState> = app_state.clone(); let state: Arc<AppState> = app_state.clone();
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
@@ -304,11 +302,11 @@ async fn handle(
"USER" => { "USER" => {
let mut params = msg.params()?; let mut params = msg.params()?;
let username = params.next().unwrap_or_default(); // aviinl let username = params.next().unwrap_or_default(); // aviinl
let mode = params.next().unwrap_or_default().parse::<u16>()?; // mode // let mode = params.next().unwrap_or_default().parse::<u16>()?; // mode
params.next().unwrap_or_default(); // unused // params.next().unwrap_or_default(); // unused
let realname = msg.trailing()?; // realname let realname = msg.trailing()?; // realname
state.user(peer_addr, username, mode, realname).await; state.user(peer_addr, username, /*mode,*/ realname).await;
let nick = state.nick(peer_addr).await.unwrap_or(username.to_string()); let nick = state.nick(peer_addr).await.unwrap_or(username.to_string());
state state