Fixed text handling in captcha

kicker/handlers.go

@@ -269,8 +269,15 @@ func checkCaptcha(b *bot, update *echotron.Update) error {
 				return nil
 			}
 		}
-		text_runes := []rune(message.Text)
+		userText := message.Text
-		guess := string(text_runes[0])
+		if userText == "" {
+			userText = message.Caption
+		}
+		text_runes := []rune(userText)
+		guess := ""
+		if len(text_runes) > 0 {
+			guess = string(text_runes[0])
+		}
 		solved := false
 		if num, err := strconv.Atoi(guess); err == nil {
 			if num == int(user.CorrectAnswer) {

kicker/kicker.go

@@ -38,7 +38,10 @@ func (b *bot) Update(update *echotron.Update) {
 			userLeft(b, update)
 			return
 		}
-		if update.Message.Text != "" {
+		if update.Message.Text != "" || update.Message.Caption != "" {
+			if update.Message.Text == "" {
+				update.Message.Text = update.Message.Caption
+			}
 			res, err := b.GetChatMember(update.ChatID(), update.Message.From.ID)
 			if err != nil {
 				log.Println("Kicker 44: can't get user member: ", err)
@@ -66,8 +69,8 @@ func (b *bot) Update(update *echotron.Update) {
 					return
 				}
 			}
-			checkCaptcha(b, update)
 		}
+		checkCaptcha(b, update)
 		checkAdminTopics(b, update)
 	}
 	if update.ChatMember != nil {