diff --git a/rc_core/src/persist/config/traits.rs b/rc_core/src/persist/config/traits.rs index cc43273..4dd0a15 100644 --- a/rc_core/src/persist/config/traits.rs +++ b/rc_core/src/persist/config/traits.rs @@ -70,10 +70,7 @@ impl DevMessageProvider { pub fn get(&self, index: usize) -> TypedDevMessage { // TODO maybe make this less obtuse -- it works for random, but isn't really obvious for anything else if self.messages.is_empty() { - TypedDevMessage { - message: Typed::Bytes(Vec::default().into()), - display_time: Typed::Int(-1), - } + self.get_empty() } else if self.messages.len() == 1 { self.messages[0].clone() } else { @@ -81,6 +78,13 @@ impl DevMessageProvider { self.messages[actual_index].clone() } } + + pub fn get_empty(&self) -> TypedDevMessage { + TypedDevMessage { + message: Typed::Bytes(Vec::default().into()), + display_time: Typed::Int(-1), + } + } } #[derive(Clone, Debug)] diff --git a/rc_core/src/persist/user/account_json.rs b/rc_core/src/persist/user/account_json.rs index 47d0a2e..9716312 100644 --- a/rc_core/src/persist/user/account_json.rs +++ b/rc_core/src/persist/user/account_json.rs @@ -492,4 +492,38 @@ impl super::User for UserData { colour_data: slot.colour_data, }) } + + async fn last_seen(&self) -> Result { + let last_seen_aux_opt = self.db.user_aux_by_user_id_and_descriptor(self.account.id, rc_database::schema::user_aux::Descriptor::LastSeen).await + .map_err(|e| { + log::error!("Failed to retrieve LastSeen (user_aux) for user_id {}: {}", self.account.id, e); + DATABASE_ERR + })?; + let now = chrono::Utc::now().timestamp(); + if let Some(last_seen) = last_seen_aux_opt { + let to_update = rc_database::schema::user_aux::ActiveModel { + data: rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()), + ..Default::default() + }; + self.db.update_user_aux_by_user_id_and_descriptor(to_update, self.account.id, rc_database::schema::user_aux::Descriptor::LastSeen).await + .map_err(|e| { + log::error!("Failed to update LastSeen (user_aux) for user_id {}: {}", self.account.id, e); + DATABASE_ERR + })?; + Ok(last_seen.data.parse().unwrap_or_default()) + } else { + let to_insert = rc_database::schema::user_aux::ActiveModel { + user_id: rc_database::sea_orm::ActiveValue::Set(self.account.id), + creation_time: rc_database::sea_orm::ActiveValue::Set(now), + descriptor: rc_database::sea_orm::ActiveValue::Set(rc_database::schema::user_aux::Descriptor::LastSeen), + data: rc_database::sea_orm::ActiveValue::Set((now as u64).to_string()), + ..Default::default() + }; + self.db.insert_user_aux(vec![to_insert]).await.map_err(|e| { + log::error!("Failed to insert LastSeen (user_aux) for user_id {}: {}", self.account.id, e); + DATABASE_ERR + })?; + Ok(0) + } + } } diff --git a/rc_core/src/persist/user/traits.rs b/rc_core/src/persist/user/traits.rs index 6841fd8..89df593 100644 --- a/rc_core/src/persist/user/traits.rs +++ b/rc_core/src/persist/user/traits.rs @@ -72,6 +72,7 @@ pub trait User { fn signup_date(&self) -> i64; async fn singleplayer_robots(&self) -> Result, i16>; async fn prepare_factory_upload(&self, vehicle: VehicleUploadData) -> Result; + async fn last_seen(&self) -> Result; } pub struct UserSlots { diff --git a/rc_database/src/schema/user_aux.rs b/rc_database/src/schema/user_aux.rs index dce40fd..f4a591c 100644 --- a/rc_database/src/schema/user_aux.rs +++ b/rc_database/src/schema/user_aux.rs @@ -40,4 +40,5 @@ pub enum Descriptor { UserFreeCurrency, // u64 UserPaidCurrency, // u64 GarageSlotOrder, // Vec, + LastSeen, // u64, seconds since Unix epoch } diff --git a/rc_services_room/src/operations/dev_message.rs b/rc_services_room/src/operations/dev_message.rs index 35ad2fa..ec23740 100644 --- a/rc_services_room/src/operations/dev_message.rs +++ b/rc_services_room/src/operations/dev_message.rs @@ -2,6 +2,10 @@ use polariton_server::operations::{Operation, OperationCode}; use rand::Rng; use rc_core::ConfigProvider; +const MAX_DELTA: u64 = 60 * 60 * 24; // 1 day + +const CODE: u8 = 8; + const MESSAGE_PARAM_KEY: u8 = 2; const DISPLAY_TIME_PARAM_KEY: u8 = 15; @@ -9,27 +13,39 @@ pub struct DevMessageProvider { messages: rc_core::persist::config::DevMessageProvider, } +impl DevMessageProvider { + async fn do_handling(&self, params: polariton::operation::ParameterTable, user: &crate::UserTy) -> Result, i16> { + let mut params = params.to_dict(); + let user_info = user.user()?; + let last_seen = user_info.last_seen().await?; + let now = chrono::Utc::now().timestamp() as u64; + if (now - last_seen) > MAX_DELTA { + let index = rand::rng().random::(); + let dev_msg = self.messages.get(index as _); + params.insert(MESSAGE_PARAM_KEY, dev_msg.message); + params.insert(DISPLAY_TIME_PARAM_KEY, dev_msg.display_time); + } else { + let dev_msg = self.messages.get_empty(); + params.insert(MESSAGE_PARAM_KEY, dev_msg.message); + params.insert(DISPLAY_TIME_PARAM_KEY, dev_msg.display_time); + } + + Ok(params.into()) + } +} + +#[async_trait::async_trait] impl Operation for DevMessageProvider { type User = crate::UserTy; - fn handle(&self, params: polariton::operation::ParameterTable, _user: &Self::User) -> polariton::operation::OperationResponse { - let mut params = params.to_dict(); - let index = rand::rng().random::(); - let dev_msg = self.messages.get(index as _); - params.insert(MESSAGE_PARAM_KEY, dev_msg.message); - params.insert(DISPLAY_TIME_PARAM_KEY, dev_msg.display_time); - polariton::operation::OperationResponse { - code: Self::op_code(), - return_code: 0, - message: polariton::operation::Typed::Null, - params: params.into(), - } + async fn handle_async(&self, params: polariton::operation::ParameterTable, user: &Self::User) -> polariton::operation::OperationResponse { + polariton_server::operations::result_to_op_resp::(self.do_handling(params, user).await) } } impl OperationCode for DevMessageProvider { fn op_code() -> u8 { - 8 + CODE } }