From 6c47d05e9c485eb2977bae5e8c6b8c1999c30691 Mon Sep 17 00:00:00 2001 From: ScuroNeko Date: Wed, 28 Jan 2026 13:42:04 +0300 Subject: [PATCH] some fixes; in hub now pushes dev tag --- Dockerfile | 2 +- Makefile | 6 ++---- build.bat | 4 ++-- db.docker-compose.yml | 13 +++++++++++++ laniakea | 2 +- main.go | 4 ++-- plugins/admin.go | 1 - plugins/logs.go | 12 ++++++------ plugins/rp.go | 5 ----- plugins/service.go | 12 ++++++++++++ 10 files changed, 39 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd1d7b1..d4ce976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.5-alpine3.23 AS builder +FROM golang:1.25.6-alpine3.23 AS builder ARG BUILD_TIME ARG GIT_COMMIT WORKDIR /usr/src/kurumi diff --git a/Makefile b/Makefile index d2e3844..7b0b419 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,5 @@ build: @echo "Building commit $(GIT_COMMIT)" @echo "Build time $(BUILD_TIME)" go mod tidy - docker build --build-arg GIT_COMMIT --build-arg BUILD_TIME \ - -t git.nix13.pw/scuroneko/kurumibotgo:latest \ - -t git.nix13.pw/scuroneko/kurumibotgo:0.2.0 -f ./Dockerfile . - docker push git.nix13.pw/scuroneko/kurumibotgo --all-tags \ No newline at end of file + docker build --build-arg GIT_COMMIT --build-arg BUILD_TIME -t git.nix13.pw/scuroneko/kurumibotgo:dev -f ./Dockerfile . + docker push git.nix13.pw/scuroneko/kurumibotgo:dev \ No newline at end of file diff --git a/build.bat b/build.bat index 10c4770..d84c88e 100644 --- a/build.bat +++ b/build.bat @@ -1,3 +1,3 @@ go mod tidy -docker build --build-arg GIT_COMMIT="DEV" --build-arg BUILD_TIME="DEV" -t git.nix13.pw/scuroneko/kurumibotgo:latest -t git.nix13.pw/scuroneko/kurumibotgo:0.2.0 -f ./Dockerfile . -docker push git.nix13.pw/scuroneko/kurumibotgo --all-tags \ No newline at end of file +docker build --build-arg GIT_COMMIT="DEV" --build-arg BUILD_TIME="DEV" -t git.nix13.pw/scuroneko/kurumibotgo:dev -f ./Dockerfile . +docker push git.nix13.pw/scuroneko/kurumibotgo:dev \ No newline at end of file diff --git a/db.docker-compose.yml b/db.docker-compose.yml index 4b543ed..b9ef8d9 100644 --- a/db.docker-compose.yml +++ b/db.docker-compose.yml @@ -14,6 +14,7 @@ services: interval: 2s retries: 5 timeout: 10s + start_period: 5s volumes: - ./scripts/postgres:/docker-entrypoint-initdb.d - postgres_data:/var/lib/postgresql/data @@ -27,6 +28,12 @@ services: MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS} MONGO_INITDB_DATABASE: ${MONGO_NAME} + healthcheck: + test: [ "CMD", "mongosh", "--quiet", "admin", "--eval", "quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)" ] + interval: 10s + timeout: 10s + retries: 5 + start_period: 10s volumes: - ./scripts/mongo:/docker-entrypoint-initdb.d - mongo_data:/data/db @@ -36,6 +43,12 @@ services: - bot ports: - "6379:6379" + healthcheck: + test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] + interval: 5s + retries: 5 + timeout: 10s + start_period: 2s volumes: - redis_data:/data diff --git a/laniakea b/laniakea index c503b68..05dadc3 160000 --- a/laniakea +++ b/laniakea @@ -1 +1 @@ -Subproject commit c503b68814c9f4c027fedc45cd5a7ebff698cf9d +Subproject commit 05dadc3de320a18a618e9997c550f407be0408c5 diff --git a/main.go b/main.go index 9ef8dac..b0b8a51 100644 --- a/main.go +++ b/main.go @@ -24,12 +24,12 @@ func main() { bot = bot.ErrorTemplate("Во время выполнения команды произошла ошибка!\nСообщите об этом разработчику!\n\n%s") bot = bot.InitDatabaseContext(dbCtx) bot.AddDatabaseLogger(plugins.DatabaseLogger) - bot.AddMiddleware(plugins.InitLogMiddleware()) + plugins.RegisterService(bot) + plugins.RegisterAdmin(bot) plugins.RegisterEconomy(bot) plugins.RegisterWaifus(bot) - plugins.RegisterAdmin(bot) plugins.RegisterRP(bot) defer bot.Close() diff --git a/plugins/admin.go b/plugins/admin.go index 76e5d21..55364f9 100644 --- a/plugins/admin.go +++ b/plugins/admin.go @@ -9,7 +9,6 @@ import ( func RegisterAdmin(b *laniakea.Bot) { p := laniakea.NewPlugin("Admin") p = p.Command(uploadPhoto, "uploadPhoto") - b.AddPlugins(p.Build()) } diff --git a/plugins/logs.go b/plugins/logs.go index 0b7c60d..e9bf513 100644 --- a/plugins/logs.go +++ b/plugins/logs.go @@ -32,8 +32,9 @@ func logMiddleware(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) { } } -func DatabaseLogger(db *laniakea.DatabaseContext) laniakea.LoggerWriter { - return func(level laniakea.LogLevel, prefix, traceback string, m []any) { +func DatabaseLogger(db *laniakea.DatabaseContext) *laniakea.LoggerWriter { + w := &laniakea.LoggerWriter{} + w.SetFn(func(level laniakea.LogLevel, prefix, traceback string, m []any) error { t := time.Now() entry := &mdb.ConsoleLogEntry{ Level: level.GetName(), @@ -46,8 +47,7 @@ func DatabaseLogger(db *laniakea.DatabaseContext) laniakea.LoggerWriter { TimeStamp: t.Unix(), } err := mdb.WriteConsoleLog(db, entry) - if err != nil { - fmt.Println(err) - } - } + return err + }) + return w } diff --git a/plugins/rp.go b/plugins/rp.go index 4be171d..a86eaaf 100644 --- a/plugins/rp.go +++ b/plugins/rp.go @@ -35,7 +35,6 @@ func RegisterRP(bot *laniakea.Bot) { rp.Command(rpUserPromptSet, "rpuserpset") rp.Command(generate, "g", "gen", "г") rp.Payload(compress, "rp.compress_chat") - rp.Payload(generalClose, "general.close") bot.AddPlugins(rp.Build()) } @@ -647,7 +646,3 @@ func compress(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) { kb = kb.AddCallbackButton("На главную", "rp.info") ctx.EditCallback("Сжатие завершено", kb) } - -func generalClose(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) { - ctx.CallbackDelete() -} diff --git a/plugins/service.go b/plugins/service.go index d5c343e..d65ad61 100644 --- a/plugins/service.go +++ b/plugins/service.go @@ -1 +1,13 @@ package plugins + +import "kurumibot/laniakea" + +func RegisterService(bot *laniakea.Bot) { + p := laniakea.NewPlugin("service") + p = p.Payload(generalClose, "general.close") + bot.AddPlugins(p.Build()) +} + +func generalClose(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) { + ctx.CallbackDelete() +}