From 608a3bbdeb6511af995bf6ff64d41cb6039baa76 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Sun, 17 Dec 2023 23:00:37 +0100
Subject: [PATCH] Info Logging Bugfix

---
 src/bot/mod.rs | 5 +++--
 src/tui/mod.rs | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 4fe068c..7c7bbbb 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -64,7 +64,7 @@ pub(crate) async fn run(data: Arc<RwLock<SharedData>>) {
 
             write.start = Utc::now();
 
-            if write.start - last_reload > Duration::seconds(write.config.config_reload_seconds as i64) {
+            if write.start - last_reload >= Duration::seconds(write.config.config_reload_seconds as i64) {
                 write.config = match Config::load() {
                     Ok(data) => data,
                     Err(e) => panic!("{}", e),
@@ -91,7 +91,7 @@ pub(crate) async fn run(data: Arc<RwLock<SharedData>>) {
 
         {
             let read = data.read().await;
-            if read.start - last_reload > Duration::seconds(read.config.config_reload_seconds as i64) {
+            if read.start - last_reload >= Duration::seconds(read.config.config_reload_seconds as i64) {
                 communities = match lemmy.get_communities().await {
                     Ok(data) => data,
                     Err(e) => {
@@ -102,6 +102,7 @@ pub(crate) async fn run(data: Arc<RwLock<SharedData>>) {
                         continue
                     }
                 };
+                drop(read);
                 let mut write = data.write().await;
                 write.messages.push(Message::Info("Communities reloaded".to_string()));
                 last_reload = Utc::now();
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
index 35245fc..5c6406c 100644
--- a/src/tui/mod.rs
+++ b/src/tui/mod.rs
@@ -27,12 +27,13 @@ async fn print_info<'a>(data: RwLockReadGuard<'a, SharedData>, min_len_series: &
         Utc::now().naive_local().format("%H:%M:%S")
     );
     println!("Instance: {}", data.config.instance);
-    println!(
-        "Ran Last: {}",
+    print!(
+        "Ran Last: {} | Config Reload Interval: {}",
         data
             .start
             .naive_local()
-            .format("%d/%m/%Y %H:%M:%S")
+            .format("%d/%m/%Y %H:%M:%S"),
+        data.config.config_reload_seconds
     );
     println!("{:#<1$}", "", separator_width);
     data.post_history.series.iter().for_each(|(series, post_history)| {
@@ -82,7 +83,7 @@ async fn print_info<'a>(data: RwLockReadGuard<'a, SharedData>, min_len_series: &
         println!("{}", error.content());
     }
     println!("{:#<1$}", "", separator_width);
-    for message in data.get_messages(false, false, false).iter() {
+    for message in data.get_messages(false, false, true).iter() {
         println!("{}", message.content());
     }
 }
\ No newline at end of file