Change project structure a bit

cmd/anon3anon/main.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/telegram/handler"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/telegram/handler"
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/telegram/middleware"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/telegram/middleware"
 
 	"github.com/go-telegram/bot"
 )

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{})
+	Info(...any)
-	Error(error, ...interface{})
+	Error(error, ...any)
-	FatalError(error, ...interface{})
+	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{}) {
+func (l *logger) Error(err error, args ...any) {
-	l.FieldLogger.WithError(err).Error(args)
+	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,8 +2,9 @@ package handler
 
 import (
 	"context"
+	"fmt"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"
@@ -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,

pkg/infrastructure/telegram/handler/startcommand.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"context"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"

pkg/infrastructure/telegram/middleware/loggingmiddleware.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nightnoryu/anon3anon/pkg/anon3anon/infrastructure/jsonlog"
+	"github.com/nightnoryu/anon3anon/pkg/infrastructure/jsonlog"
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"