Mercurial > lbo > hg > goe_bot
changeset 48:f81fa9a0f30e
Return correct errors from reminder handler
| author | Lewin Bormann <lbo@spheniscida.de> |
|---|---|
| date | Sat, 10 Dec 2016 18:04:30 +0100 |
| parents | 5839919d7b2d |
| children | c7c515afd73b |
| files | handler_remind.go handler_todo.go remind.go scripts/run.sh |
| diffstat | 4 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/handler_remind.go Sat Dec 10 17:53:28 2016 +0100 +++ b/handler_remind.go Sat Dec 10 18:04:30 2016 +0100 @@ -2,7 +2,6 @@ import ( "context" - "errors" "fmt" "log" "regexp" @@ -81,21 +80,21 @@ if len(parts) < 2 { log.Println("Not enough parts in message:", msg.Text) - return replyContent{text: "_Hilfe (z.B.): /remind 25m Irgendwas_"}, errors.New("bad message format") + return replyContent{text: "_Hilfe (z.B.): /remind 26m Irgendwas_"}, nil } alertTime := parseReminderString(parts[0]) if alertTime.IsZero() { return replyContent{text: "Tut mir leid, ich verstehe das Format nicht. Bitte benutze +XX{s,m,h,d} oder hh:mm"}, - errors.New("didn't understand time format") + nil } db, err := backend.Reminders() if err != nil { log.Println("Couldn't get Reminders object:", err) - return replyContent{text: "_Ich konnte mich nicht mit der Datenbank verbinden :(_"}, errors.New("couldn't get Reminders") + return replyContent{text: "_Ich konnte mich nicht mit der Datenbank verbinden :(_"}, nil } r := reminder{ @@ -103,13 +102,14 @@ Owner: msg.From.First_Name + " " + msg.From.Last_Name, Due: alertTime, ChatID: msg.Chat.ID, - ReplyTo: msg.Message_ID} + ReplyTo: msg.Message_ID, + } id, err := db.InsertReminder(sql.Reminder(r)) if err != nil { log.Println("Couldn't insert reminder:", err) - return replyContent{text: "_Ich konnte leider keine Erinnerung setzen._"}, errors.New("couldn't set reminder") + return replyContent{text: "_Ich konnte leider keine Erinnerung setzen._"}, nil } return replyContent{text: fmt.Sprintf("*✓* Erinnerung #%d in %v", id, alertTime.Sub(time.Now()))}, nil
--- a/handler_todo.go Sat Dec 10 17:53:28 2016 +0100 +++ b/handler_todo.go Sat Dec 10 18:04:30 2016 +0100 @@ -70,7 +70,7 @@ id, err := strconv.ParseUint(token, 10, 64) if err != nil { - return replyContent{text: "_Falsches Format; Zahl erwartet_ (" + token + ")"}, err + return replyContent{text: "_Falsches Format; Zahl erwartet_ (" + token + ")"}, nil } affected, err := todo.MarkTodoDone(int64(id))
--- a/remind.go Sat Dec 10 17:53:28 2016 +0100 +++ b/remind.go Sat Dec 10 18:04:30 2016 +0100 @@ -27,6 +27,7 @@ Parse_Mode: "Markdown", Reply_To_Message_Id: rm.ReplyTo, Text: "*BEEP BEEP BEEP*", + Reply_Markup: inlineKeyboardMarkup{Inline_Keyboard: [][]inlineKeyboardButton{}}, } rm.Attempts++
--- a/scripts/run.sh Sat Dec 10 17:53:28 2016 +0100 +++ b/scripts/run.sh Sat Dec 10 18:04:30 2016 +0100 @@ -4,7 +4,11 @@ # webhook token ($HOOKTOKEN) and name ($NAME) source token.txt +# seconds from UTC that your users are +OFFSET=3600 + ./goe_bot --token=$TOKEN \ --hook_token=$HOOKTOKEN \ --myurl=$HOOKURL \ + --tz_off=$OFFSET \ $@ > bot.log 2>&1