From 4dbad6b310a98bc183ff43ccaa14f21181568da0 Mon Sep 17 00:00:00 2001
From: Dastan-glitch <Dastan.ManDan@gmail.com>
Date: Tue, 10 May 2022 01:14:59 +0300
Subject: [PATCH] bin/tau: fix viewing events

---
 bin/tau/README.md           | 5 +----
 bin/tau/tau-cli/src/main.rs | 8 +++++---
 bin/tau/tau-cli/src/view.rs | 6 +++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/tau/README.md b/bin/tau/README.md
index 0287f4768..9d5f453a7 100644
--- a/bin/tau/README.md
+++ b/bin/tau/README.md
@@ -59,7 +59,7 @@ connect to in the p2p network.
 	in config file:
 
 		## Connection slots
-		outbound_connections=5
+		outbound_connections=8
 
 		## Seed nodes to connect to 
 		seeds=["127.0.0.1:11001"]
@@ -139,6 +139,3 @@ $ # comments
 $ tau comments 1  # list comments
 $ tau comments 3 "new comment"  # add new comment 
 ```
-
-
-
diff --git a/bin/tau/tau-cli/src/main.rs b/bin/tau/tau-cli/src/main.rs
index 84fe8d40b..3708ebbbb 100644
--- a/bin/tau/tau-cli/src/main.rs
+++ b/bin/tau/tau-cli/src/main.rs
@@ -19,9 +19,9 @@ mod util;
 mod view;
 
 use cli::CliTauSubCommands;
-use primitives::TaskInfo;
+use primitives::{TaskEvent, TaskInfo};
 use util::{desc_in_editor, CONFIG_FILE, CONFIG_FILE_CONTENTS};
-use view::{comments_as_string, events_as_string, print_list_of_task, print_task_info};
+use view::{comments_as_string, print_list_of_task, print_task_info};
 
 async fn start(mut options: cli::CliTau) -> Result<()> {
     let rpc_addr = &format!("tcp://{}", &options.rpc_listen.clone());
@@ -71,7 +71,9 @@ async fn start(mut options: cli::CliTau) -> Result<()> {
             None => {
                 let task = jsonrpc::get_task_by_id(rpc_addr, id).await?;
                 let taskinfo: TaskInfo = serde_json::from_value(task.clone())?;
-                let state = events_as_string(taskinfo.events);
+                let default_event =
+                    TaskEvent { action: "open".to_string(), timestamp: primitives::Timestamp(0) };
+                let state = &taskinfo.events.last().unwrap_or(&default_event).action;
                 println!("Task {}: {}", id, state);
             }
         },
diff --git a/bin/tau/tau-cli/src/view.rs b/bin/tau/tau-cli/src/view.rs
index 77a8192ec..0a870c961 100644
--- a/bin/tau/tau-cli/src/view.rs
+++ b/bin/tau/tau-cli/src/view.rs
@@ -112,13 +112,17 @@ pub fn comments_as_string(comments: Vec<Comment>) -> String {
         comments_str.push_str(&comment.to_string());
         comments_str.push('\n');
     }
+    comments_str.pop();
     comments_str
 }
 
 pub fn events_as_string(events: Vec<TaskEvent>) -> String {
     let mut events_str = String::new();
     for event in events {
-        events_str.push_str(&event.to_string());
+        events_str.push_str("State changed to ");
+        events_str.push_str(&event.action.to_string());
+        events_str.push_str(" at ");
+        events_str.push_str(&timestamp_to_date(event.timestamp.0, "datetime"));
         events_str.push('\n');
     }
     events_str