1 files changed, 12 insertions, 10 deletions
diff --git a/src/lib.rs b/src/lib.rs
index de3a4cf..4891ddd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,19 +17,23 @@ pub fn deserialize_i64_1<'de, D: Deserializer<'de>>(deserializer: D) -> std::res
         .map_err(serde::de::Error::custom)
 }
 
-pub mod generated;
+pub mod core;
+pub use crate::core::*;
 
-pub use generated::*;
+//pub mod messaging;
+//pub use crate::messaging::*;
+
+impl ClientExt for Client {}
 
 impl std::fmt::Display for UserStatus {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            UserStatus::UserStatusEmpty => write!(f, "seen never"),
-            UserStatus::UserStatusOnline(online) => write!(f, "online. expires: {}", fmt_date(online.expires)),
-            UserStatus::UserStatusOffline(offline) => write!(f, "online. expires: {}", fmt_date(offline.was_online)),
-            UserStatus::UserStatusRecently => write!(f, "seen recently"),
-            UserStatus::UserStatusLastWeek => write!(f, "seen last week"),
-            UserStatus::UserStatusLastMonth => write!(f, "seen last month"),
+            UserStatus::UserStatusEmpty => write!(f, "never"),
+            UserStatus::UserStatusOnline(online) => write!(f, "online until {}", fmt_date(online.expires)),
+            UserStatus::UserStatusOffline(offline) => write!(f, "online until {}", fmt_date(offline.was_online)),
+            UserStatus::UserStatusRecently => write!(f, "recently"),
+            UserStatus::UserStatusLastWeek => write!(f, "last week"),
+            UserStatus::UserStatusLastMonth => write!(f, "last month"),
         }
     }
 }
@@ -39,5 +43,3 @@ fn fmt_date(date: i32) -> String {
     let dt: chrono::DateTime<chrono::Local> = chrono::Local.timestamp(date as i64, 0);
     format!("{}", dt)
 }
-
-impl ClientExt for Client {}