Changed logs

Echotron

kicker/handlers.go

@@ -15,13 +15,9 @@ import (
 
 func userJoined(b *bot, update *tb.Update) error {
 	captcha := captchagen.GenCaptcha()
-	_, err := b.DeleteMessage(update.Message.Chat.ID, update.Message.ID)
-	if err != nil {
-		log.Printf("Can't delete message: %v", err)
-	}
 	bytes, err := captcha.ToBytes()
 	if err != nil {
-		fmt.Printf("Error creating captcha bytes: %v", bytes)
+		log.Printf("Error creating captcha bytes: %v", bytes)
 		b.SendMessage("Не могу создать капчу, @nefrace, проверь логи.", update.Message.From.ID, &tb.MessageOptions{MessageThreadID: update.Message.ThreadID})
 	}
 	message := update.Message
@@ -99,23 +95,11 @@ func checkCaptcha(b *bot, update *tb.Update) error {
 				solved = true
 				b.DeleteMessage(message.Chat.ID, message.ID)
 				b.DeleteMessage(message.Chat.ID, user.CaptchaMessage)
-				msg := fmt.Sprintf("Приветствую тебя, *[%s](tg://user?id=%d)* успешно прошёл капчу\\!", EscapeText(tb.MarkdownV2, user.FirstName), user.Id)
-				options := tb.MessageOptions{
-					ParseMode: tb.MarkdownV2,
-				}
-				if message.Chat.IsForum {
-					options.MessageThreadID = int(b.CaptchaTopic)
-				}
-				res, err := b.SendMessage(msg, message.Chat.ID, &options)
-				if err != nil {
-					log.Printf("Can't send welcome message: %s", err)
-				}
-				time.Sleep(time.Second * 10)
-				_, err = b.DeleteMessage(message.Chat.ID, res.Result.ID)
-				if err != nil {
-					log.Printf("Can't delete welcome message: %s", err)
-				}
+
 			}
+		} else {
+			log.Println(err)
+			return err
 		}
 		if !solved {
 			b.DeleteMessage(message.Chat.ID, message.ID)

kicker/tasks.go

@@ -18,7 +18,7 @@ type TaskBot struct {
 
 func TaskKickOldUsers(b *tb.API) {
 	d := db.GetDatabase()
-	log.Print("STARTING KICKING TASK")
+//	log.Print("STARTING KICKING TASK")
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
 	now := time.Now().Unix()
@@ -37,6 +37,7 @@ func TaskKickOldUsers(b *tb.API) {
 			log.Println("User was not banned: ", err)
 			continue
 		}
+		log.Printf("User %s was banned", user.Id)
 		b.DeleteMessage(user.ChatId, user.CaptchaMessage)
 		b.DeleteMessage(user.ChatId, user.JoinedMessage)
 		d.RemoveUser(ctx, user)