From f8a4777f718eb4eb9c19b4049fc52fa3089f4b6e Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Mon, 19 Aug 2024 21:25:59 +0300
Subject: [PATCH] feat(kinds): more accurate tag formatting

---
 src/kinds.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/kinds.rs b/src/kinds.rs
index b010fca..2e6cc71 100644
--- a/src/kinds.rs
+++ b/src/kinds.rs
@@ -3,7 +3,7 @@ use log::info;
 use nostr_sdk::{Alphabet, EventBuilder, EventId, Kind, Tag, TagStandard};
 use nostr_sdk::TagStandard::Hashtag;
 
-use crate::task::State;
+use crate::task::{MARKER_PARENT, State};
 
 pub const METADATA_KIND: u16 = 0;
 pub const NOTE_KIND: u16 = 1;
@@ -100,13 +100,16 @@ fn format_tag(tag: &Tag) -> String {
     match tag.as_standardized() {
         Some(TagStandard::Event {
                  event_id,
+                 marker,
                  ..
-             }) => format!("Parent: {}", event_id.to_string()[..8].to_string()),
+             }) => format!("{}: {:.8}", marker.as_ref().map(|m| m.to_string()).unwrap_or(MARKER_PARENT.to_string()), event_id),
         Some(TagStandard::PublicKey {
                  public_key,
+                 alias,
                  ..
-             }) => format!("Key: {}", public_key.to_string()[..8].to_string()),
-        Some(TagStandard::Hashtag(content)) => format!("#{content}"),
+             }) => format!("Key{}: {:.8}", public_key.to_string(), alias.as_ref().map(|s| format!(" {s}")).unwrap_or_default()),
+        Some(TagStandard::Hashtag(content)) =>
+            format!("#{content}"),
         _ => tag.content().map_or_else(
             || format!("Kind {}", tag.kind()),
             |content| content.to_string(),