Bump go-telegram-bot version

1. Move all pre-defined messages to constants in a separate file
2. Remove pkg/errors dependency

.github/workflows/check-go.yml

@@ -0,0 +1,50 @@
+name: Check Go code
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**.go'
+
+permissions:
+  contents: read
+
+jobs:
+
+  build:
+    name: Build and test
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24.x'
+
+      - name: Download dependencies
+        run: go mod download
+
+      - name: Run tests
+        run: go test ./...
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24.x'
+
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v8
+        with:
+          version: 'v2.1'

.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+
+  release:
+    name: Automatic release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Create the release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true

.gitignore

@@ -1,3 +1,4 @@
 .idea
 vendor
+bin
 docker-compose.override.yml

.golangci.yml

@@ -0,0 +1,4 @@
+version: "2"
+
+run:
+  timeout: 5m

README.md

@@ -1,25 +1,23 @@
-# anon3anon
+# :performing_arts: anon3anon [![Github release](https://img.shields.io/github/release/nightnoryu/anon3anon.svg)](https://github.com/nightnoryu/anon3anon/releases) [![Build Status](https://github.com/nightnoryu/anon3anon/actions/workflows/check-go.yml/badge.svg)](https://github.com/nightnoryu/anon3anon/actions/workflows/check-go.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/nightnoryu/anon3anon)](https://goreportcard.com/report/github.com/nightnoryu/anon3anon)
 
-Telegram bot for anonymous messages 🎭✨
+Telegram bot for anonymous messages.
 
----
+Currently running at https://t.me/meme_me_a_meme_bot for my channel.
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/nightnoryu/anon3anon)](https://goreportcard.com/report/github.com/nightnoryu/anon3anon)
-
-## Building for local development
+## Local development
 
 Prerequisites:
 
-1. Linux
-2. Git
-3. Docker
-4. (optional) [BrewKit](https://github.com/ispringtech/brewkit)
+1. Git
+2. Docker
+3. [bkit](https://github.com/nightnoryu/bkit)
 
 Firstly, clone the repository into your `$GOPATH`:
 
 ```shell
 mkdir -p $GOPATH/src/github.com/nightnoryu
 cd $GOPATH/src/github.com/nightnoryu
+
 git clone git@github.com:nightnoryu/anon3anon.git
 cd anon3anon
 ```
@@ -27,10 +25,7 @@ cd anon3anon
 Then build the project:
 
 ```shell
-brewkit build
-
-# Alternatively, if you don't want to use BrewKit, you can do it the old-fashioned way:
-# go build -o ./bin/anon3anon ./cmd/anon3anon
+bkit build
 ```
 
 After that, copy the `docker-compose.override.example.yml` to `docker-compose.override.yml` and set the environment variables:
@@ -39,10 +34,13 @@ After that, copy the `docker-compose.override.example.yml` to `docker-compose.ov
 services:
   anon3anon:
     environment:
-      TELEGRAM_BOT_TOKEN: 123:ABC # The token for your bot, obtained from t.me/BotFather
-      OWNER_CHAT_ID: 123 # ID of your chat with your bot
+      ANON3ANON_TELEGRAM_BOT_TOKEN: 123:ABC # The token for your bot, obtained from t.me/BotFather
+      ANON3ANON_OWNER_CHAT_ID: 123 # ID of your chat with your bot
 ```
 
+> [!NOTE]
+> When launching the bot for the first time, leave `ANON3ANON_OWNER_CHAT_ID` empty and write a message to the bot. It will print the chat ID in the logs and after that you can set it up.
+
 And you're set! Use `docker compose` to manage the application:
 
 ```shell

bin/.gitignore

@@ -1 +0,0 @@
-/anon3anon

bkit.jsonnet

@@ -1,4 +1,4 @@
-local project = import 'brewkit/project.libsonnet';
+local project = import 'bkit/project.libsonnet';
 
 local appIDs = [
     "anon3anon",

bkit/images.libsonnet

@@ -0,0 +1,4 @@
+{
+    gobuilder: "golang:1.24-alpine",
+    golangcilint: "golangci/golangci-lint:v2.1-alpine",
+}

bkit/project.libsonnet

@@ -18,10 +18,10 @@ local gocache = [
 
 {
     project(appIDs):: {
-        apiVersion: "brewkit/v1",
+        apiVersion: "bkit/v1",
 
         targets: {
-            all: ["modules", "build"],
+            all: ["modules", "build", "check"],
         } + {
             modules: ["gotidy", "modulesvendor"],
 
@@ -62,6 +62,30 @@ local gocache = [
                 }
             }
             for appID in appIDs
+        } + {
+            check: ["test", "lint"],
+
+            test: {
+                from: "gobase",
+                workdir: "/app",
+                cache: gocache,
+                command: "go test ./..."
+            },
+
+            lint: {
+                from: images.golangcilint,
+                workdir: "/app",
+                cache: gocache,
+                copy: [
+                    copyFrom("gosources", "/app", "/app"),
+                    copy(".golangci.yml", ".golangci.yml"),
+                ],
+                env: {
+                    GOCACHE: "/app/cache/go-build",
+                    GOLANGCI_LINT_CACHE: "/app/cache/go-build",
+                },
+                command: "golangci-lint run"
+            },
         } + {
             gobase: {
                 from: images.gobuilder,

brewkit/images.libsonnet

@@ -1,3 +0,0 @@
-{
-    gobuilder: "golang:1.24.2"
-}

cmd/anon3anon/config.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/kelseyhightower/envconfig"
-	"github.com/pkg/errors"
 )
 
 func parseEnv() (*config, error) {
 	c := new(config)
 	if err := envconfig.Process(appID, c); err != nil {
-		return nil, errors.Wrap(err, "failed to parse env")
+		return nil, fmt.Errorf("failed to parse env: %w", err)
 	}
 	return c, nil
 }

cmd/anon3anon/main.go

@@ -22,13 +22,8 @@ func main() {
 		logger.FatalError(err)
 	}
 
-	opts := []bot.Option{
-		bot.WithMiddlewares(middleware.NewLoggingMiddleware(logger)),
-		bot.WithMessageTextHandler("/start", bot.MatchTypeExact, handler.NewStartCommandHandler(logger)),
-		bot.WithDefaultHandler(handler.NewAnonymousMessagesHandler(logger, conf.OwnerChatID)),
-	}
-
-	b, err := bot.New(conf.TelegramBotToken, opts...)
+	options := initBotOptions(conf, logger)
+	b, err := bot.New(conf.TelegramBotToken, options...)
 	if err != nil {
 		logger.FatalError(err)
 	}
@@ -46,3 +41,14 @@ func initLogger() jsonlog.Logger {
 	})
 	return logger
 }
+
+func initBotOptions(conf *config, logger jsonlog.Logger) []bot.Option {
+	startCommandHandler := handler.NewStartCommandHandler(logger)
+	anonymousMessagesHandler := handler.NewAnonymousMessagesHandler(logger, conf.OwnerChatID)
+
+	return []bot.Option{
+		bot.WithMiddlewares(middleware.NewLoggingMiddleware(logger)),
+		bot.WithMessageTextHandler("start", bot.MatchTypeCommand, startCommandHandler),
+		bot.WithDefaultHandler(anonymousMessagesHandler),
+	}
+}

go.mod

@@ -3,9 +3,8 @@ module github.com/nightnoryu/anon3anon
 go 1.24
 
 require (
-	github.com/go-telegram/bot v1.13.3
+	github.com/go-telegram/bot v1.15.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 )
 

go.sum

@@ -1,12 +1,10 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-telegram/bot v1.13.3 h1:r2erpHI5rMQsR5TFWJ/XVqWHq9R228fcaejLFvXJsmM=
-github.com/go-telegram/bot v1.13.3/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM=
+github.com/go-telegram/bot v1.15.0 h1:/ba5pp084MUhjR5sQDymQ7JNZ001CQa7QjtxLWcuGpg=
+github.com/go-telegram/bot v1.15.0/go.mod h1:i2TRs7fXWIeaceF3z7KzsMt/he0TwkVC680mvdTFYeM=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

pkg/infrastructure/jsonlog/logger.go

@@ -14,11 +14,11 @@ var fieldMap = logrus.FieldMap{
 }
 
 type Logger interface {
-	WithField(key string, value interface{}) Logger
+	WithField(key string, value any) Logger
 
-	Info(...interface{})
-	Error(error, ...interface{})
-	FatalError(error, ...interface{})
+	Info(...any)
+	Error(error, ...any)
+	FatalError(error, ...any)
 }
 
 type Config struct {
@@ -42,14 +42,14 @@ type logger struct {
 	logrus.FieldLogger
 }
 
-func (l *logger) WithField(key string, value interface{}) Logger {
+func (l *logger) WithField(key string, value any) Logger {
 	return &logger{l.FieldLogger.WithField(key, value)}
 }
 
-func (l *logger) Error(err error, args ...interface{}) {
-	l.FieldLogger.WithError(err).Error(args)
+func (l *logger) Error(err error, args ...any) {
+	l.FieldLogger.WithError(err).Error(args...)
 }
 
-func (l *logger) FatalError(err error, args ...interface{}) {
+func (l *logger) FatalError(err error, args ...any) {
 	l.FieldLogger.WithError(err).Fatal(args...)
 }

pkg/infrastructure/telegram/handler/anonymousmessages.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
@@ -15,6 +16,11 @@ func NewAnonymousMessagesHandler(logger jsonlog.Logger, ownerChatId int) bot.Han
 			return
 		}
 
+		if ownerChatId == 0 {
+			logger.Info(fmt.Sprintf("owner chat ID not set. set to %d to use the last chat", update.Message.Chat.ID))
+			return
+		}
+
 		params := &bot.CopyMessageParams{
 			ChatID:     ownerChatId,
 			FromChatID: update.Message.Chat.ID,
@@ -28,7 +34,7 @@ func NewAnonymousMessagesHandler(logger jsonlog.Logger, ownerChatId int) bot.Han
 
 		sendParams := &bot.SendMessageParams{
 			ChatID: update.Message.Chat.ID,
-			Text:   "Сообщение отправлено!!",
+			Text:   messageSentMessage,
 		}
 		_, err = b.SendMessage(ctx, sendParams)
 		if err != nil {

pkg/infrastructure/telegram/handler/messages.go

@@ -0,0 +1,6 @@
+package handler
+
+const (
+	greetingMessage    = "Жду твоих сообщений!!"
+	messageSentMessage = "Сообщение отправлено!!"
+)

pkg/infrastructure/telegram/handler/startcommand.go

@@ -11,9 +11,13 @@ import (
 
 func NewStartCommandHandler(logger jsonlog.Logger) bot.HandlerFunc {
 	return func(ctx context.Context, b *bot.Bot, update *models.Update) {
+		if update.Message == nil {
+			return
+		}
+
 		params := &bot.SendMessageParams{
 			ChatID: update.Message.Chat.ID,
-			Text:   "Жду твоих сообщений!!",
+			Text:   greetingMessage,
 		}
 		_, err := b.SendMessage(ctx, params)
 		if err != nil {