From 02ff951e65c960df2efe01f25d8ff18191ee1c1d Mon Sep 17 00:00:00 2001 From: ayn2op Date: Mon, 23 Jan 2023 17:41:32 +0530 Subject: [PATCH] Pass discord.Message instead of *discord.Message to createMessage func --- guilds_tree.go | 2 +- messages_text.go | 12 ++++++------ state.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/guilds_tree.go b/guilds_tree.go index e225e0d..cc4b4c5 100644 --- a/guilds_tree.go +++ b/guilds_tree.go @@ -169,7 +169,7 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) { } for i := len(ms) - 1; i >= 0; i-- { - messagesText.createMessage(&ms[i]) + messagesText.createMessage(ms[i]) } c, err := discordState.Cabinet.Channel(ref) diff --git a/messages_text.go b/messages_text.go index bd162b7..8e0465a 100644 --- a/messages_text.go +++ b/messages_text.go @@ -59,7 +59,7 @@ func (mt *MessagesText) reset() { mt.Highlight() } -func (mt *MessagesText) createMessage(m *discord.Message) { +func (mt *MessagesText) createMessage(m discord.Message) { switch m.Type { case discord.DefaultMessage, discord.InlinedReplyMessage: // Region tags are square brackets that contain a region ID in double quotes @@ -69,8 +69,8 @@ func (mt *MessagesText) createMessage(m *discord.Message) { if m.ReferencedMessage != nil { fmt.Fprintf(mt, "[::d]%c ", replyIndicator) - mt.createHeader(mt, m.ReferencedMessage) - mt.createBody(mt, m.ReferencedMessage) + mt.createHeader(mt, *m.ReferencedMessage) + mt.createBody(mt, *m.ReferencedMessage) fmt.Fprint(mt, "[::-]\n") } @@ -85,7 +85,7 @@ func (mt *MessagesText) createMessage(m *discord.Message) { } } -func (mt *MessagesText) createHeader(w io.Writer, m *discord.Message) { +func (mt *MessagesText) createHeader(w io.Writer, m discord.Message) { fmt.Fprintf(w, "[%s]%s[-] ", cfg.Theme.MessagesText.AuthorColor, m.Author.Username) if cfg.Timestamps { @@ -93,11 +93,11 @@ func (mt *MessagesText) createHeader(w io.Writer, m *discord.Message) { } } -func (mt *MessagesText) createBody(w io.Writer, m *discord.Message) { +func (mt *MessagesText) createBody(w io.Writer, m discord.Message) { fmt.Fprint(w, discordmd.Parse(tview.Escape(m.Content))) } -func (mt *MessagesText) createFooter(w io.Writer, m *discord.Message) { +func (mt *MessagesText) createFooter(w io.Writer, m discord.Message) { for _, a := range m.Attachments { fmt.Fprintln(w) fmt.Fprintf(w, "[%s]: %s", a.Filename, a.URL) diff --git a/state.go b/state.go index 3661b76..d6bed72 100644 --- a/state.go +++ b/state.go @@ -83,6 +83,6 @@ func (s *State) onReady(r *gateway.ReadyEvent) { func (s *State) onMessageCreate(m *gateway.MessageCreateEvent) { if guildsTree.selectedChannelID.IsValid() && guildsTree.selectedChannelID == m.ChannelID { - messagesText.createMessage(&m.Message) + messagesText.createMessage(m.Message) } }