diff --git a/src/broker_messages/mod.rs b/src/broker_messages/mod.rs index c83f19a..6fb1f9f 100644 --- a/src/broker_messages/mod.rs +++ b/src/broker_messages/mod.rs @@ -21,5 +21,5 @@ use dev::MessageResponse; // use dev::ResponseChannel; pub mod pind; +pub mod responses; pub mod sansad; -pub mod util; diff --git a/src/broker_messages/pind.rs b/src/broker_messages/pind.rs index 95b2410..152df40 100644 --- a/src/broker_messages/pind.rs +++ b/src/broker_messages/pind.rs @@ -16,7 +16,7 @@ */ //! Messages to be sent between Actors -use super::util::Resp; +use super::responses::ResultResponse; use super::*; //################################################## For ChatPinnd ################################################## @@ -24,7 +24,7 @@ use super::*; /// Request to Kaksh with its kunjika #[derive(Clone, Message)] -#[rtype(result = "Resp")] +#[rtype(result = "ResultResponse")] pub struct JoinKaksh { pub kaksh_kunjika: String, pub length: Option, @@ -35,7 +35,7 @@ pub struct JoinKaksh { /// Request to connect Random vayakti #[derive(Clone, Message)] -#[rtype(result = "Resp")] +#[rtype(result = "ResultResponse")] pub struct JoinRandom { pub addr: Addr, pub kunjika: String, @@ -44,7 +44,7 @@ pub struct JoinRandom { } /// Request to connect Random Next vayakti #[derive(Clone, Message)] -#[rtype(result = "Resp")] +#[rtype(result = "ResultResponse")] pub struct JoinRandomNext { pub kaksh_kunjika: String, pub kunjika: String, diff --git a/src/broker_messages/util.rs b/src/broker_messages/responses.rs similarity index 96% rename from src/broker_messages/util.rs rename to src/broker_messages/responses.rs index 461f212..88b3fcc 100644 --- a/src/broker_messages/util.rs +++ b/src/broker_messages/responses.rs @@ -17,7 +17,7 @@ // //################################################## Helper ################################################## #[derive(Debug)] -pub enum Resp { +pub enum ResultResponse { Ok, Err(String), None, diff --git a/src/chat_pinnd/mod.rs b/src/chat_pinnd/mod.rs index 50b093d..ba8c887 100644 --- a/src/chat_pinnd/mod.rs +++ b/src/chat_pinnd/mod.rs @@ -25,7 +25,7 @@ use std::{collections::HashMap, vec}; use actix::prelude::*; use actix_broker::BrokerSubscribe; -use crate::{broker_messages as ms, broker_messages::util::Resp, ws_sansad}; +use crate::{broker_messages as ms, broker_messages::responses::ResultResponse, ws_sansad}; #[allow(dead_code)] pub struct ChatPinnd { diff --git a/src/chat_pinnd/user.rs b/src/chat_pinnd/user.rs index b63e268..4d2ccb2 100644 --- a/src/chat_pinnd/user.rs +++ b/src/chat_pinnd/user.rs @@ -28,7 +28,7 @@ impl Handler for ChatPinnd { .iter() .position(|vk| vk.kunjika == msg.kunjika) { - return MessageResult(Resp::Err("Kunjika already exist".to_owned())); + return MessageResult(ResultResponse::Err("Kunjika already exist".to_owned())); } if let Some(_) = self.kaksh.iter().position(|(_, g)| { @@ -37,7 +37,7 @@ impl Handler for ChatPinnd { None => false, } }) { - return MessageResult(Resp::Err("Kunjika already exist".to_owned())); + return MessageResult(ResultResponse::Err("Kunjika already exist".to_owned())); } // check if kaksh exist and add user @@ -47,7 +47,9 @@ impl Handler for ChatPinnd { // check if kaksh have no space left if let Some(n) = kaksh.length { if kaksh.loog.len() >= n { - return MessageResult(Resp::Err("Kaksh have no space".to_owned())); + return MessageResult(ResultResponse::Err( + "Kaksh have no space".to_owned(), + )); } } @@ -80,7 +82,7 @@ impl Handler for ChatPinnd { } } - MessageResult(Resp::Ok) + MessageResult(ResultResponse::Ok) } } @@ -97,7 +99,7 @@ impl Handler for ChatPinnd { .iter() .position(|vk| vk.kunjika == msg.kunjika) { - return MessageResult(Resp::Err("Kunjika already exist".to_owned())); + return MessageResult(ResultResponse::Err("Kunjika already exist".to_owned())); } if let Some(_) = self.kaksh.iter().position(|(_, g)| { @@ -106,7 +108,7 @@ impl Handler for ChatPinnd { None => false, } }) { - return MessageResult(Resp::Err("Kunjika already exist".to_owned())); + return MessageResult(ResultResponse::Err("Kunjika already exist".to_owned())); } // Check if watch list is empty @@ -117,7 +119,7 @@ impl Handler for ChatPinnd { name: msg.name, tags: msg.tags, }); - return MessageResult(Resp::None); + return MessageResult(ResultResponse::None); } // connect person with tag @@ -136,7 +138,7 @@ impl Handler for ChatPinnd { name: msg.name, tags: msg.tags, }); - return MessageResult(Resp::None); + return MessageResult(ResultResponse::None); } } } else { @@ -185,7 +187,7 @@ impl Handler for ChatPinnd { kaksh_kunjika: group_kunjika, }); - MessageResult(Resp::Ok) + MessageResult(ResultResponse::Ok) } } @@ -195,12 +197,20 @@ impl Handler for ChatPinnd { fn handle(&mut self, msg: ms::pind::JoinRandomNext, _: &mut Self::Context) -> Self::Result { let kaksh = match self.kaksh.get_mut(&msg.kaksh_kunjika) { Some(v) => v, - None => return MessageResult(Resp::Err("Failed to join, check entries!".to_owned())), + None => { + return MessageResult(ResultResponse::Err( + "Failed to join, check entries!".to_owned(), + )) + } }; let loog_i = match kaksh.loog.iter().position(|a| a.kunjika == msg.kunjika) { Some(v) => v, - None => return MessageResult(Resp::Err("Failed to join, check entries!".to_owned())), + None => { + return MessageResult(ResultResponse::Err( + "Failed to join, check entries!".to_owned(), + )) + } }; let addr; @@ -211,12 +221,16 @@ impl Handler for ChatPinnd { let loog = match kaksh.loog.get(loog_i) { Some(v) => v, None => { - return MessageResult(Resp::Err("Failed to join, check entries!".to_owned())) + return MessageResult(ResultResponse::Err( + "Failed to join, check entries!".to_owned(), + )) } }; if let None = loog.tags { - return MessageResult(Resp::Err("You are not a randome vyakti!".to_owned())); + return MessageResult(ResultResponse::Err( + "You are not a randome vyakti!".to_owned(), + )); } addr = loog.addr.clone(); @@ -224,7 +238,9 @@ impl Handler for ChatPinnd { tags = match loog.tags.clone() { Some(v) => v, None => { - return MessageResult(Resp::Err("Failed to join, check entries!".to_owned())) + return MessageResult(ResultResponse::Err( + "Failed to join, check entries!".to_owned(), + )) } }; } @@ -246,7 +262,7 @@ impl Handler for ChatPinnd { name, tags, }); - return MessageResult(Resp::None); + return MessageResult(ResultResponse::None); } // connect person with tag or to zero let pos = if tags.len() > 0 { @@ -264,7 +280,7 @@ impl Handler for ChatPinnd { name, tags, }); - return MessageResult(Resp::None); + return MessageResult(ResultResponse::None); } } } else { @@ -318,7 +334,7 @@ impl Handler for ChatPinnd { kaksh_kunjika: group_kunjika, }); - MessageResult(Resp::Ok) + MessageResult(ResultResponse::Ok) } } diff --git a/src/ws_sansad/mod.rs b/src/ws_sansad/mod.rs index c50ff55..9a43368 100644 --- a/src/ws_sansad/mod.rs +++ b/src/ws_sansad/mod.rs @@ -29,7 +29,7 @@ use std::time::{Duration, Instant}; use crate::{ broker_messages as ms, - broker_messages::util::Resp, + broker_messages::responses::ResultResponse, chat_pinnd::ChatPinnd, validator::{validate, Validation as vl}, }; diff --git a/src/ws_sansad/users.rs b/src/ws_sansad/users.rs index a9b2386..7d0f476 100644 --- a/src/ws_sansad/users.rs +++ b/src/ws_sansad/users.rs @@ -98,7 +98,7 @@ impl WsSansad { }; // request - let result: Resp = ChatPinnd::from_registry() + let result: ResultResponse = ChatPinnd::from_registry() .send(ms::pind::JoinKaksh { kaksh_kunjika: kaksh_kunjika.to_owned(), length, @@ -110,8 +110,8 @@ impl WsSansad { .unwrap(); match result { - Resp::Err(err) => self.send_err_response(&err), - Resp::Ok => { + ResultResponse::Err(err) => self.send_err_response(&err), + ResultResponse::Ok => { self.isthiti = Isthiti::Kaksh(kaksh_kunjika); self.addr .clone() @@ -189,7 +189,7 @@ impl WsSansad { }; // request - let result: Resp = ChatPinnd::from_registry() + let result: ResultResponse = ChatPinnd::from_registry() .send(ms::pind::JoinRandom { addr: self.addr.clone().unwrap(), kunjika: kunjika.to_owned(), @@ -200,8 +200,8 @@ impl WsSansad { .unwrap(); match result { - Resp::Err(err) => self.send_err_response(&err), - Resp::Ok => { + ResultResponse::Err(err) => self.send_err_response(&err), + ResultResponse::Ok => { self.addr .clone() .unwrap() @@ -210,7 +210,7 @@ impl WsSansad { }); self.kunjika = kunjika; } - Resp::None => { + ResultResponse::None => { self.addr.clone().unwrap().do_send(ms::sansad::WsResponse { result: "watch".to_owned(), message: "Watchlist".to_owned(), @@ -243,7 +243,7 @@ impl WsSansad { }; // request - let result: Resp = ChatPinnd::from_registry() + let result: ResultResponse = ChatPinnd::from_registry() .send(ms::pind::JoinRandomNext { kunjika: self.kunjika.to_owned(), kaksh_kunjika: kaksh_kunjika.to_owned(), @@ -252,8 +252,8 @@ impl WsSansad { .unwrap(); match result { - Resp::Err(err) => self.send_err_response(&err), - Resp::None => { + ResultResponse::Err(err) => self.send_err_response(&err), + ResultResponse::None => { self.addr.clone().unwrap().do_send(ms::sansad::WsResponse { result: "watch".to_owned(), message: "Watchlist".to_owned(),