diff --git a/commands.go b/commands.go index 452a9d9..cedbf8e 100644 --- a/commands.go +++ b/commands.go @@ -27,17 +27,17 @@ func (b *bot) handlePayment(m chat1.MsgSummary) { } } -func (b *bot) setupMeeting(convid chat1.ConvIDStr, sender string, args []string, membersType string) { - b.debug("command recieved in conversation %s", convid) +func (b *bot) handleMeeting(m chat1.MsgSummary) { + b.debug("command recieved in conversation %s", m.ConvID) meeting, err := newJitsiMeetingSimple() if err != nil { - log.Println(err) - 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) + eid := b.logError(err) + 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. Please reference Error ID %s", m.Sender.Username, eid) + b.k.SendMessageByConvID(m.ConvID, message) return } - message := fmt.Sprintf("@%s here's your meeting: %s", sender, meeting.getURL()) - b.k.SendMessageByConvID(convid, message) + message := fmt.Sprintf("@%s here's your meeting: %s", m.Sender.Username, meeting.getURL()) + b.k.SendMessageByConvID(m.ConvID, message) } func (b *bot) sendFeedback(convid chat1.ConvIDStr, mesgID chat1.MessageID, sender string, args []string) { diff --git a/handlers.go b/handlers.go index 6baa9e5..9bb575e 100644 --- a/handlers.go +++ b/handlers.go @@ -58,13 +58,13 @@ func (b *bot) chatHandler(m chat1.MsgSummary) { } case "jitsi": if nargs == 0 { - b.setupMeeting(m.ConvID, m.Sender.Username, args, m.Channel.MembersType) + b.handleMeeting(m) } else if nargs >= 1 { // pop the subcommand off the front of the list subcommand, args := args[0], args[1:] switch subcommand { case "meet": - b.setupMeeting(m.ConvID, m.Sender.Username, args, m.Channel.MembersType) + b.handleMeeting(m) case "feedback": b.sendFeedback(m.ConvID, m.Id, m.Sender.Username, args) case "hello":