Bladeren bron

Pass discord.Message instead of *discord.Message to createMessage func

ayn2op 3 jaren geleden
bovenliggende
commit
02ff951e65
3 gewijzigde bestanden met toevoegingen van 8 en 8 verwijderingen
  1. 1 1
      guilds_tree.go
  2. 6 6
      messages_text.go
  3. 1 1
      state.go

+ 1 - 1
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)

+ 6 - 6
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)

+ 1 - 1
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)
 	}
 }