diff --git a/commands.go b/commands.go index c12c26d..8886c12 100644 --- a/commands.go +++ b/commands.go @@ -3,6 +3,7 @@ package main import ( "fmt" "log" + "strings" "samhofi.us/x/keybase/types/chat1" ) @@ -20,11 +21,12 @@ func (b *bot) setupMeeting(convid chat1.ConvIDStr, sender string, words []string b.k.SendMessageByConvID(convid, message) } -func (b *bot) sendFeedback(convid chat1.ConvIDStr, mesgID chat1.MessageID, sender string, message string) { +func (b *bot) sendFeedback(convid chat1.ConvIDStr, mesgID chat1.MessageID, sender string, words []string) { b.debug("feedback recieved in %s", convid) if b.config.FeedbackConvIDStr != "" { + feedback := strings.Join(words[2:], "") fcID := chat1.ConvIDStr(b.config.FeedbackConvIDStr) - if _, err := b.k.SendMessageByConvID(fcID, "Feedback from @%s:\n```%s```", sender, message); err != nil { + if _, err := b.k.SendMessageByConvID(fcID, "Feedback from @%s:\n```%s```", sender, feedback); err != nil { b.k.ReplyByConvID(convid, mesgID, "I'm sorry, I was unable to send your feedback because my benevolent overlords have not set a destination for feedback. :sad:") log.Printf("Unable to send feedback: %s", err) } else { diff --git a/handlers.go b/handlers.go index ec7b5d9..6d2d6f4 100644 --- a/handlers.go +++ b/handlers.go @@ -55,7 +55,7 @@ func (b *bot) chatHandler(m chat1.MsgSummary) { case "meet": b.setupMeeting(m.ConvID, m.Sender.Username, words, m.Channel.MembersType) case "feedback": - b.sendFeedback(m.ConvID, m.Id, m.Sender.Username, m.Content.Text.Body) + b.sendFeedback(m.ConvID, m.Id, m.Sender.Username, words) } } } @@ -71,7 +71,7 @@ func (b *bot) chatHandler(m chat1.MsgSummary) { case "jitsi": switch maybeSubCommand { case "feedback": - b.sendFeedback(m.ConvID, m.Id, m.Sender.Username, m.Content.Text.Body) + b.sendFeedback(m.ConvID, m.Id, m.Sender.Username, words) default: b.setupMeeting(m.ConvID, m.Sender.Username, words, m.Channel.MembersType) }