From 1231386964b5322d98ec21d3d8a68bf80fd7dfc5 Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Mon, 2 Jan 2023 00:26:29 +0530
Subject: [PATCH] Move timestamps before author

---
 messages_text.go | 9 ++++-----
 state.go         | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/messages_text.go b/messages_text.go
index 92b151e..d67a1a1 100644
--- a/messages_text.go
+++ b/messages_text.go
@@ -48,19 +48,18 @@ func (mt *MessagesText) newMessage(m *discord.Message) error {
 			fmt.Fprintln(mt)
 		}
 
-		// Author
-		mt.newAuthor(m)
 		// Timestamps
 		mt.newTimestamp(m)
+		// Author
+		mt.newAuthor(m)
 		// Content
-		fmt.Fprintln(mt)
 		mt.newContent(m)
 
 		// Tags with no region ID ([""]) don't start new regions. They can therefore be used to mark the end of a region.
 		fmt.Fprint(mt, `[""]`)
 	}
 
-	fmt.Fprint(mt, "\n\n")
+	fmt.Fprintln(mt)
 	return nil
 }
 
@@ -69,7 +68,7 @@ func (mt *MessagesText) newAuthor(m *discord.Message) {
 }
 
 func (mt *MessagesText) newTimestamp(m *discord.Message) {
-	fmt.Fprintf(mt, "[::d]%s[::-]", m.Timestamp.Format(time.Kitchen))
+	fmt.Fprintf(mt, "[::d]%s[::-] ", m.Timestamp.Format(time.Kitchen))
 }
 
 func (mt *MessagesText) newContent(m *discord.Message) {
diff --git a/state.go b/state.go
index 3d54e42..4fee36b 100644
--- a/state.go
+++ b/state.go
@@ -52,7 +52,7 @@ func (s *State) onReady(r *gateway.ReadyEvent) {
 }
 
 func (s *State) onMessageCreate(m *gateway.MessageCreateEvent) {
-	if guildsTree.selectedChannel != nil {
+	if guildsTree.selectedChannel != nil && guildsTree.selectedChannel.ID == m.ChannelID {
 		if err := messagesText.newMessage(&m.Message); err != nil {
 			log.Println(err)
 			return