diff --git a/commands.go b/commands.go index dbe92d3..d3412d8 100644 --- a/commands.go +++ b/commands.go @@ -7,14 +7,15 @@ import ( "samhofi.us/x/keybase/types/chat1" ) -func (b *bot) setupMeeting(convid chat1.ConvIDStr, msgid chat1.MessageID, words []string, membersType string) { +func (b *bot) setupMeeting(convid chat1.ConvIDStr, sender string, words []string, membersType string) { b.debug("command recieved in conversation %s", convid) meeting, err := newJitsiMeeting() if err != nil { log.Println(err) - b.k.SendMessageByConvID(convid, "I'm sorry, i'm not sure what happened... I was unable to set up a new meeting.\nI've written the appropriate logs and notified my humans.") + message := fmt.Sprintf("@%s - I'm sorry, i'm not sure what happened... I was unable to set up a new meeting.\nI've written the appropriate logs and notified my humans.", sender) + b.k.SendMessageByConvID(convid, message) return } - message := fmt.Sprintf("Here's your meeting: %s", meeting.getURL()) + message := fmt.Sprintf("@%s here's your meeting: %s", sender, meeting.getURL()) b.k.SendMessageByConvID(convid, message) } diff --git a/handlers.go b/handlers.go index d1e9ef2..ac95134 100644 --- a/handlers.go +++ b/handlers.go @@ -53,7 +53,7 @@ func (b *bot) chatHandler(m chat1.MsgSummary) { if len(words) > 1 { switch words[1] { case "meet": - b.setupMeeting(m.ConvID, m.Id, words, m.Channel.MembersType) + b.setupMeeting(m.ConvID, m.Sender.Username, words, m.Channel.MembersType) } } } @@ -66,7 +66,7 @@ func (b *bot) chatHandler(m chat1.MsgSummary) { // decide if this is askind for extended commands switch thisCommand { case "jitsi": - b.setupMeeting(m.ConvID, m.Id, words, m.Channel.MembersType) + b.setupMeeting(m.ConvID, m.Sender.Username, words, m.Channel.MembersType) default: return }