[Fix] user status names
This commit is contained in:
parent
e413a52269
commit
55bfceffb1
2 changed files with 13 additions and 13 deletions
|
|
@ -225,7 +225,7 @@ impl OmikronConnection {
|
||||||
// ONLINE STATUS TRACKING
|
// ONLINE STATUS TRACKING
|
||||||
if cv.is_type(CommunicationType::user_connected) {
|
if cv.is_type(CommunicationType::user_connected) {
|
||||||
if let Some(user_id) = cv.get_data(DataTypes::user_id).and_then(|v| v.as_i64()) {
|
if let Some(user_id) = cv.get_data(DataTypes::user_id).and_then(|v| v.as_i64()) {
|
||||||
user_online_tracker::track_user_status(user_id, UserStatus::Online, omikron_id);
|
user_online_tracker::track_user_status(user_id, UserStatus::online, omikron_id);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -234,7 +234,7 @@ impl OmikronConnection {
|
||||||
if let Some(status) = user_online_tracker::get_user_status(user_id) {
|
if let Some(status) = user_online_tracker::get_user_status(user_id) {
|
||||||
user_online_tracker::track_user_status(
|
user_online_tracker::track_user_status(
|
||||||
user_id,
|
user_id,
|
||||||
UserStatus::UserOffline,
|
UserStatus::user_offline,
|
||||||
status.omikron_id,
|
status.omikron_id,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -252,7 +252,7 @@ impl OmikronConnection {
|
||||||
let _ = user_ids.push(JsonValue::from(user.0));
|
let _ = user_ids.push(JsonValue::from(user.0));
|
||||||
user_online_tracker::track_user_status(
|
user_online_tracker::track_user_status(
|
||||||
user.0,
|
user.0,
|
||||||
UserStatus::UserOffline,
|
UserStatus::user_offline,
|
||||||
omikron_id,
|
omikron_id,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -291,7 +291,7 @@ impl OmikronConnection {
|
||||||
if let Some(user_id) = user_id_json.as_i64() {
|
if let Some(user_id) = user_id_json.as_i64() {
|
||||||
user_online_tracker::track_user_status(
|
user_online_tracker::track_user_status(
|
||||||
user_id,
|
user_id,
|
||||||
UserStatus::Online,
|
UserStatus::online,
|
||||||
omikron_id,
|
omikron_id,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -387,7 +387,7 @@ impl OmikronConnection {
|
||||||
} else {
|
} else {
|
||||||
response = response.add_data(
|
response = response.add_data(
|
||||||
DataTypes::online_status,
|
DataTypes::online_status,
|
||||||
JsonValue::String(UserStatus::IotaOffline.to_string()),
|
JsonValue::String(UserStatus::iota_offline.to_string()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -463,7 +463,7 @@ impl OmikronConnection {
|
||||||
} else {
|
} else {
|
||||||
response = response.add_data(
|
response = response.add_data(
|
||||||
DataTypes::online_status,
|
DataTypes::online_status,
|
||||||
JsonValue::String(UserStatus::IotaOffline.to_string()),
|
JsonValue::String(UserStatus::iota_offline.to_string()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
response = response.add_data(
|
response = response.add_data(
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,14 @@ use strum::IntoEnumIterator;
|
||||||
use strum_macros::EnumIter;
|
use strum_macros::EnumIter;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, EnumIter, Eq)]
|
#[derive(Debug, Clone, PartialEq, EnumIter, Eq)]
|
||||||
#[allow(unused)]
|
#[allow(unused, non_camel_case_types)]
|
||||||
pub enum UserStatus {
|
pub enum UserStatus {
|
||||||
Online,
|
online,
|
||||||
PhoneOnline,
|
phone_online,
|
||||||
Away,
|
away,
|
||||||
DoNotDisturb,
|
do_not_disturb,
|
||||||
UserOffline,
|
user_offline,
|
||||||
IotaOffline,
|
iota_offline,
|
||||||
}
|
}
|
||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
impl UserStatus {
|
impl UserStatus {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue