From 5e5be54f1e7e9c05a34fe8e9b288f3cd356a990b Mon Sep 17 00:00:00 2001 From: ScuroNeko Date: Wed, 28 Jan 2026 16:52:42 +0300 Subject: [PATCH] laniakea now used as external module --- database/mdb/code.go | 2 +- database/mdb/logs.go | 2 +- database/mdb/rp_chats.go | 2 +- database/mongo.go | 2 +- database/psql/rp.go | 2 +- database/psql/users.go | 3 ++- database/psql/waifus.go | 2 +- database/psql/works.go | 2 +- database/red/rp_chats.go | 2 +- go.mod | 11 ++++++----- go.sum | 16 +++++++++------ laniakea | 1 - main.go | 3 ++- plugins/admin.go | 2 +- plugins/economy.go | 3 +-- plugins/logs.go | 42 +++++++++++++++++++++++----------------- plugins/relations.go | 2 +- plugins/rp.go | 2 +- plugins/service.go | 2 +- plugins/waifus.go | 2 +- utils/ai/openai.go | 2 +- 21 files changed, 59 insertions(+), 48 deletions(-) delete mode 160000 laniakea diff --git a/database/mdb/code.go b/database/mdb/code.go index 3f85b91..bfb4357 100644 --- a/database/mdb/code.go +++ b/database/mdb/code.go @@ -3,9 +3,9 @@ package mdb import ( "context" "kurumibot/database" - "kurumibot/laniakea" "time" + "git.nix13.pw/scuroneko/laniakea" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/database/mdb/logs.go b/database/mdb/logs.go index 87f5b99..4b5ff3b 100644 --- a/database/mdb/logs.go +++ b/database/mdb/logs.go @@ -2,8 +2,8 @@ package mdb import ( "context" + "git.nix13.pw/scuroneko/laniakea" "kurumibot/database" - "kurumibot/laniakea" "time" ) diff --git a/database/mdb/rp_chats.go b/database/mdb/rp_chats.go index 389c93a..21df1f5 100644 --- a/database/mdb/rp_chats.go +++ b/database/mdb/rp_chats.go @@ -3,9 +3,9 @@ package mdb import ( "context" "kurumibot/database" - "kurumibot/laniakea" "time" + "git.nix13.pw/scuroneko/laniakea" "go.mongodb.org/mongo-driver/v2/bson" ) diff --git a/database/mongo.go b/database/mongo.go index ea88d6e..de0a4e2 100644 --- a/database/mongo.go +++ b/database/mongo.go @@ -2,10 +2,10 @@ package database import ( "fmt" - "kurumibot/laniakea" "log" "os" + "git.nix13.pw/scuroneko/laniakea" "go.mongodb.org/mongo-driver/v2/mongo" "go.mongodb.org/mongo-driver/v2/mongo/options" ) diff --git a/database/psql/rp.go b/database/psql/rp.go index 75a8487..0e4057e 100644 --- a/database/psql/rp.go +++ b/database/psql/rp.go @@ -3,8 +3,8 @@ package psql import ( "database/sql" "errors" - "kurumibot/laniakea" + "git.nix13.pw/scuroneko/laniakea" "github.com/vinovest/sqlx" ) diff --git a/database/psql/users.go b/database/psql/users.go index 7803445..b1d8226 100644 --- a/database/psql/users.go +++ b/database/psql/users.go @@ -4,10 +4,11 @@ import ( "context" "database/sql" "errors" - "kurumibot/laniakea" "math" "time" + "git.nix13.pw/scuroneko/laniakea" + "github.com/shopspring/decimal" "github.com/vinovest/sqlx" ) diff --git a/database/psql/waifus.go b/database/psql/waifus.go index 047c767..ef6d20e 100644 --- a/database/psql/waifus.go +++ b/database/psql/waifus.go @@ -2,7 +2,7 @@ package psql import ( "database/sql" - "kurumibot/laniakea" + "git.nix13.pw/scuroneko/laniakea" "github.com/shopspring/decimal" "github.com/vinovest/sqlx" diff --git a/database/psql/works.go b/database/psql/works.go index 4643e5a..a3e4a84 100644 --- a/database/psql/works.go +++ b/database/psql/works.go @@ -1,8 +1,8 @@ package psql import ( + "git.nix13.pw/scuroneko/laniakea" "kurumibot/database" - "kurumibot/laniakea" "github.com/shopspring/decimal" "github.com/vinovest/sqlx" diff --git a/database/red/rp_chats.go b/database/red/rp_chats.go index cca3888..bef0ca6 100644 --- a/database/red/rp_chats.go +++ b/database/red/rp_chats.go @@ -3,7 +3,7 @@ package red import ( "context" "fmt" - "kurumibot/laniakea" + "git.nix13.pw/scuroneko/laniakea" "github.com/google/uuid" "github.com/redis/go-redis/v9" diff --git a/go.mod b/go.mod index 91e544c..e753851 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,25 @@ module kurumibot -go 1.25.5 +go 1.25.6 require ( - github.com/fatih/color v1.18.0 + git.nix13.pw/scuroneko/laniakea v0.2.4 github.com/google/uuid v1.6.0 github.com/joho/godotenv v1.5.1 github.com/lib/pq v1.10.9 - github.com/redis/go-redis/v9 v9.17.2 + github.com/redis/go-redis/v9 v9.17.3 github.com/shopspring/decimal v1.4.0 github.com/vinovest/sqlx v1.7.1 - go.mongodb.org/mongo-driver/v2 v2.4.1 + go.mongodb.org/mongo-driver/v2 v2.4.2 ) require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/fatih/color v1.18.0 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/klauspost/compress v1.18.2 // indirect - github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/muir/sqltoken v0.1.0 // indirect github.com/stretchr/testify v1.11.1 // indirect diff --git a/go.sum b/go.sum index abfd990..a7b89b3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +git.nix13.pw/scuroneko/laniakea v0.2.4 h1:+1rxudD8KSkKo6QTtzJ0G6i4ncYYNfNvUlSXbcobdK4= +git.nix13.pw/scuroneko/laniakea v0.2.4/go.mod h1:aANHsOZ88i0NAfl7ceP3aPnpretDZsx6LZzOq/QLl14= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -26,8 +28,9 @@ github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uq github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= -github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= @@ -36,8 +39,8 @@ github.com/muir/sqltoken v0.1.0 h1:edosEGsOClOZNfgGQNQSgxR9O6LiVefm2rDRqp2InuI= github.com/muir/sqltoken v0.1.0/go.mod h1:lgOIORnKekMsuc/ZwdPOfwz/PtWLPCke43cEbT3uDuY= 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/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI= -github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= +github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4= +github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= @@ -53,8 +56,8 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver/v2 v2.4.1 h1:hGDMngUao03OVQ6sgV5csk+RWOIkF+CuLsTPobNMGNI= -go.mongodb.org/mongo-driver/v2 v2.4.1/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI= +go.mongodb.org/mongo-driver/v2 v2.4.2 h1:HrJ+Auygxceby9MLp3YITobef5a8Bv4HcPFIkml1U7U= +go.mongodb.org/mongo-driver/v2 v2.4.2/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= @@ -72,6 +75,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= diff --git a/laniakea b/laniakea deleted file mode 160000 index 05dadc3..0000000 --- a/laniakea +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 05dadc3de320a18a618e9997c550f407be0408c5 diff --git a/main.go b/main.go index b0b8a51..620bdda 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,9 @@ package main import ( + "git.nix13.pw/scuroneko/laniakea" + "kurumibot/database" - "kurumibot/laniakea" "kurumibot/plugins" "github.com/joho/godotenv" diff --git a/plugins/admin.go b/plugins/admin.go index 55364f9..8f2624d 100644 --- a/plugins/admin.go +++ b/plugins/admin.go @@ -3,7 +3,7 @@ package plugins import ( "kurumibot/database/psql" - "kurumibot/laniakea" + "git.nix13.pw/scuroneko/laniakea" ) func RegisterAdmin(b *laniakea.Bot) { diff --git a/plugins/economy.go b/plugins/economy.go index e726528..bb18493 100644 --- a/plugins/economy.go +++ b/plugins/economy.go @@ -11,8 +11,7 @@ import ( "strings" "time" - "kurumibot/laniakea" - + "git.nix13.pw/scuroneko/laniakea" "github.com/shopspring/decimal" ) diff --git a/plugins/logs.go b/plugins/logs.go index e9bf513..cf89fa8 100644 --- a/plugins/logs.go +++ b/plugins/logs.go @@ -3,9 +3,10 @@ package plugins import ( "fmt" "kurumibot/database/mdb" - "kurumibot/laniakea" "strings" "time" + + "git.nix13.pw/scuroneko/laniakea" ) func InitLogsPlugin() {} @@ -32,22 +33,27 @@ func logMiddleware(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) { } } -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(), - Prefix: prefix, - Traceback: traceback, - Message: strings.Join(laniakea.Map(m, func(el any) string { - return fmt.Sprintf("%v", el) - }), "\n"), - Time: t, - TimeStamp: t.Unix(), - } - err := mdb.WriteConsoleLog(db, entry) - return err - }) +type DatabaseWriter struct { + laniakea.LoggerWriter + db *laniakea.DatabaseContext +} + +func (w *DatabaseWriter) Print(level laniakea.LogLevel, prefix string, traceback []*laniakea.MethodTraceback, messages ...any) error { + t := time.Now() + entry := &mdb.ConsoleLogEntry{ + Level: level.GetName(), + Prefix: prefix, + Traceback: laniakea.FormatFullTraceback(traceback), + Message: strings.Join(laniakea.Map(messages, func(el any) string { + return fmt.Sprintf("%v", el) + }), "\n"), + Time: t, + TimeStamp: t.Unix(), + } + err := mdb.WriteConsoleLog(w.db, entry) + return err +} +func DatabaseLogger(db *laniakea.DatabaseContext) laniakea.LoggerWriter { + w := &DatabaseWriter{db: db} return w } diff --git a/plugins/relations.go b/plugins/relations.go index d3a515d..2f9c487 100644 --- a/plugins/relations.go +++ b/plugins/relations.go @@ -1,6 +1,6 @@ package plugins -import "kurumibot/laniakea" +import "git.nix13.pw/scuroneko/laniakea" func RegisterRelations(b *laniakea.Bot) { diff --git a/plugins/rp.go b/plugins/rp.go index a86eaaf..b09a6e2 100644 --- a/plugins/rp.go +++ b/plugins/rp.go @@ -7,12 +7,12 @@ import ( "kurumibot/database/mdb" "kurumibot/database/psql" "kurumibot/database/red" - "kurumibot/laniakea" "kurumibot/utils" "kurumibot/utils/ai" "strconv" "strings" + "git.nix13.pw/scuroneko/laniakea" "github.com/google/uuid" ) diff --git a/plugins/service.go b/plugins/service.go index d65ad61..6240968 100644 --- a/plugins/service.go +++ b/plugins/service.go @@ -1,6 +1,6 @@ package plugins -import "kurumibot/laniakea" +import "git.nix13.pw/scuroneko/laniakea" func RegisterService(bot *laniakea.Bot) { p := laniakea.NewPlugin("service") diff --git a/plugins/waifus.go b/plugins/waifus.go index 0ae7332..790c78b 100644 --- a/plugins/waifus.go +++ b/plugins/waifus.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "kurumibot/laniakea" + "git.nix13.pw/scuroneko/laniakea" ) func RegisterWaifus(bot *laniakea.Bot) { diff --git a/utils/ai/openai.go b/utils/ai/openai.go index 4c3a16b..046c920 100644 --- a/utils/ai/openai.go +++ b/utils/ai/openai.go @@ -5,8 +5,8 @@ import ( "encoding/json" "errors" "fmt" + "git.nix13.pw/scuroneko/laniakea" "io" - "kurumibot/laniakea" "net/http" "net/url" "os"