From 3659ee6e30106afbbe734a54cf7e22125caa3cf5 Mon Sep 17 00:00:00 2001 From: rigormorrtiss Date: Sat, 7 Aug 2021 14:51:13 +0400 Subject: [PATCH] refactor(util): rename variables to comply with 'effective go' --- util/discord.go | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/util/discord.go b/util/discord.go index 83f27bd..e6fee5a 100644 --- a/util/discord.go +++ b/util/discord.go @@ -9,41 +9,41 @@ import ( "github.com/rivo/tview" ) -func WriteMessage(messagesTextView *tview.TextView, state *state.State, message discord.Message) { - var parsedMsg strings.Builder +func WriteMessage(v *tview.TextView, s *state.State, m discord.Message) { + var b strings.Builder - if state.Ready().User.ID == message.Author.ID { - parsedMsg.WriteString("[#ffb86c::b]") - parsedMsg.WriteString(message.Author.Username) - parsedMsg.WriteString("[-:-:-] ") + if s.Ready().User.ID == m.Author.ID { + b.WriteString("[#ffb86c::b]") + b.WriteString(m.Author.Username) + b.WriteString("[-:-:-] ") } else { - parsedMsg.WriteString("[#ff5555::b]") - parsedMsg.WriteString(message.Author.Username) - parsedMsg.WriteString("[-:-:-] ") + b.WriteString("[#ff5555::b]") + b.WriteString(m.Author.Username) + b.WriteString("[-:-:-] ") } - if message.Author.Bot { - parsedMsg.WriteString("[#bd93f9]BOT[-:-:-] ") + if m.Author.Bot { + b.WriteString("[#bd93f9]BOT[-:-:-] ") } - if message.Content != "" { - parsedMsg.WriteString(message.Content) + if m.Content != "" { + b.WriteString(m.Content) } - if message.EditedTimestamp.IsValid() { - parsedMsg.WriteString(" [::d](edited)[-:-:-]") + if m.EditedTimestamp.IsValid() { + b.WriteString(" [::d](edited)[-:-:-]") } // TODO(rigormorrtiss): display the message embed using "special" format - if len(message.Embeds) > 0 { - parsedMsg.WriteString("\n") + if len(m.Embeds) > 0 { + b.WriteString("\n") } - attachments := message.Attachments + attachments := m.Attachments for i := range attachments { - parsedMsg.WriteString("\n") - parsedMsg.WriteString(attachments[i].URL) + b.WriteString("\n") + b.WriteString(attachments[i].URL) } - fmt.Fprintln(messagesTextView, parsedMsg.String()) + fmt.Fprintln(v, b.String()) }