changeset 39:3cc9ebfc1137

Some handlers improvements: Empty message detection, quotes handler removed, testing using Reply IDs
author Lewin Bormann <lbo@spheniscida.de>
date Sat, 10 Dec 2016 16:02:58 +0100
parents 176b68335f52
children 7d363fef93a8
files handlers.go
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/handlers.go	Sat Dec 10 15:06:35 2016 +0100
+++ b/handlers.go	Sat Dec 10 16:02:58 2016 +0100
@@ -13,7 +13,6 @@
 	echoCmd    = "echo"
 	fortuneCmd = "fortune"
 	helpCmd    = "help"
-	quoteCmd   = "quote"
 	remindCmd  = "remind"
 	statusCmd  = "status"
 	todoCmd    = "todo"
@@ -33,7 +32,6 @@
 	handlers = map[string]handler{
 		echoCmd:    {echoHandler, "Anfrage zurücksenden"},
 		fortuneCmd: {fortuneHandler, "Glückskeks"},
-		quoteCmd:   {missingHandler, "Zitat speichern/abfragen"},
 		remindCmd:  {missingHandler, "Wecker"},
 		statusCmd:  {statusHandler, "Status anfragen"},
 		todoCmd:    {todoHandler, "Aufgabenliste"},
@@ -86,7 +84,7 @@
 	var err error
 	var chatID int64
 
-	if upd.Message.Message_ID > 0 {
+	if upd.Message.Text != "" {
 		srvStatus.commands++
 		chatID = upd.Message.Chat.ID
 		rp, err = dispatchMessage(ctx, upd.Message)
@@ -100,7 +98,7 @@
 			Parse_Mode: "Markdown",
 			Text:       "",
 		}
-		srvStatus.errors++
+		srvStatus.unhandled++
 
 		return reply, nil
 	}
@@ -110,10 +108,11 @@
 	}
 
 	reply := sendMessage{
-		Chat_ID:      chatID,
-		Parse_Mode:   "Markdown",
-		Text:         rp.text,
-		Reply_Markup: inlineKeyboardMarkup{Inline_Keyboard: [][]inlineKeyboardButton{}},
+		Chat_ID:             chatID,
+		Parse_Mode:          "Markdown",
+		Text:                rp.text,
+		Reply_Markup:        inlineKeyboardMarkup{Inline_Keyboard: [][]inlineKeyboardButton{}},
+		Reply_To_Message_Id: upd.Message.Message_ID,
 	}
 
 	if rp.buttons.Inline_Keyboard != nil {