Less warnings & Speeeeed!!
This commit is contained in:
parent
af1088e9fb
commit
42cfada4a7
22 changed files with 312 additions and 403 deletions
|
|
@ -7,18 +7,6 @@ pub struct Contact {
|
|||
pub user_id: Option<Uuid>,
|
||||
pub user_name: Option<String>,
|
||||
pub last_message_at: Option<i64>,
|
||||
pub user_status: UserStatus,
|
||||
pub about: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum UserStatus {
|
||||
Online,
|
||||
Do_Not_Disturb,
|
||||
WC,
|
||||
Away,
|
||||
User_Offline,
|
||||
Iota_Offline,
|
||||
}
|
||||
|
||||
impl Default for Contact {
|
||||
|
|
@ -31,30 +19,16 @@ impl Default for Contact {
|
|||
user_id: None,
|
||||
user_name: None,
|
||||
last_message_at: Some(now),
|
||||
user_status: UserStatus::User_Offline,
|
||||
about: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Contact {
|
||||
pub fn new_with_time(last_message_at: i64, user_id: Uuid) -> Self {
|
||||
Contact {
|
||||
user_id: Some(user_id),
|
||||
user_name: None,
|
||||
last_message_at: Some(last_message_at),
|
||||
user_status: UserStatus::User_Offline,
|
||||
about: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(user_id: Uuid) -> Self {
|
||||
Contact {
|
||||
user_id: Some(user_id),
|
||||
user_name: None,
|
||||
last_message_at: None,
|
||||
user_status: UserStatus::User_Offline,
|
||||
about: None,
|
||||
}
|
||||
}
|
||||
pub fn set_last_message_at(&mut self, p0: i64) {
|
||||
|
|
@ -74,12 +48,6 @@ impl Contact {
|
|||
}
|
||||
obj
|
||||
}
|
||||
|
||||
pub fn from_string(s: &str) -> Contact {
|
||||
let parsed: JsonValue = JsonValue::from(s);
|
||||
Self::from_json(&parsed)
|
||||
}
|
||||
|
||||
pub fn from_json(o: &JsonValue) -> Contact {
|
||||
let user_id = o["user_id"].as_str().and_then(|s| Uuid::parse_str(s).ok());
|
||||
|
||||
|
|
@ -91,51 +59,6 @@ impl Contact {
|
|||
user_id,
|
||||
user_name,
|
||||
last_message_at,
|
||||
user_status: UserStatus::User_Offline, // default
|
||||
about: None,
|
||||
}
|
||||
}
|
||||
pub fn info(&self) -> JsonValue {
|
||||
let mut obj = self.to_json();
|
||||
if let Some(id) = &self.user_id {
|
||||
obj["user_id"] = JsonValue::from(id.to_string());
|
||||
}
|
||||
if let Some(name) = &self.user_name {
|
||||
obj["user_name"] = JsonValue::from(name.as_str());
|
||||
}
|
||||
obj
|
||||
}
|
||||
|
||||
// getters & setters
|
||||
pub fn get_about(&self) -> Option<&String> {
|
||||
self.about.as_ref()
|
||||
}
|
||||
|
||||
pub fn set_about(&mut self, about: String) {
|
||||
self.about = Some(about);
|
||||
}
|
||||
|
||||
pub fn get_user_id(&self) -> Option<Uuid> {
|
||||
self.user_id
|
||||
}
|
||||
|
||||
pub fn set_user_id(&mut self, id: Uuid) {
|
||||
self.user_id = Some(id);
|
||||
}
|
||||
|
||||
pub fn get_user_name(&self) -> Option<&String> {
|
||||
self.user_name.as_ref()
|
||||
}
|
||||
|
||||
pub fn set_user_name(&mut self, name: String) {
|
||||
self.user_name = Some(name);
|
||||
}
|
||||
|
||||
pub fn get_user_status(&self) -> &UserStatus {
|
||||
&self.user_status
|
||||
}
|
||||
|
||||
pub fn set_user_status(&mut self, status: UserStatus) {
|
||||
self.user_status = status;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,13 +75,6 @@ pub fn get_users() -> Vec<UserProfile> {
|
|||
USERS.lock().unwrap().clone()
|
||||
}
|
||||
|
||||
pub fn add_user(up: UserProfile) {
|
||||
let mut users = USERS.lock().unwrap();
|
||||
users.retain(|u| u.user_id != up.user_id);
|
||||
users.push(up);
|
||||
*UNIQUE.lock().unwrap() = true;
|
||||
}
|
||||
|
||||
pub fn remove_user(user_id: Uuid) {
|
||||
let mut users = USERS.lock().unwrap();
|
||||
users.retain(|u| u.user_id != user_id);
|
||||
|
|
|
|||
Loading…
Reference in a new issue