ScuroNeko/YaeMikoBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
ScuroNeko
2026-01-20 10:06:37 +03:00
parent fec89b5305
commit 02437946ed
4 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
database/mdb/logs.go
View File

@@ -2,8 +2,8 @@ package mdb
import (
"context"
"kurumibot/database"
"kurumibot/laniakea"
"os"
"time"
)
@@ -19,7 +19,7 @@ type ConsoleLogEntry struct {
func WriteConsoleLog(db *laniakea.DatabaseContext, e *ConsoleLogEntry) error {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
col := db.MongoDB.Database(os.Getenv("MONGO_NAME")).Collection("logs")
col := database.GetMongoCollection(db, "logs")
_, err := col.InsertOne(ctx, e)
return err
}
@@ -35,7 +35,7 @@ type MessageLogEntry struct {
func WriteMessageLog(db *laniakea.DatabaseContext, e *MessageLogEntry) error {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
collection := db.MongoDB.Database(os.Getenv("MONGO_NAME")).Collection("msg_logs")
_, err := collection.InsertOne(ctx, e)
col := database.GetMongoCollection(db, "msg_logs")
_, err := col.InsertOne(ctx, e)
return err
}

4
database/psql/fraction.go
View File

@@ -22,12 +22,12 @@ func NewFractionRepository(db *sqlx.DB) *FractionRepository {
return &FractionRepository{db: db}
}
func (rep *FractionRepository) GetAllFractions() ([]*Fraction, error) {
func (rep *FractionRepository) GetAll() ([]*Fraction, error) {
fractions := make([]*Fraction, 0)
err := rep.db.Select(&fractions, "SELECT * FROM fractions ORDER BY id DESC;")
return fractions, err
}
func (rep *FractionRepository) GetFraction(id int32) (*Fraction, error) {
func (rep *FractionRepository) GetById(id int32) (*Fraction, error) {
fraction := new(Fraction)
err := rep.db.Get(fraction, "SELECT * FROM fractions WHERE id = $1", id)
return fraction, err

2
database/psql/users.go
View File

@@ -119,7 +119,7 @@ func GetUser(telegramId int) (*User, error) {
}
if user.FractionID.Valid {
fractionRep := NewFractionRepository(database.PostgresDatabase)
user.Fraction, err = fractionRep.GetFraction(user.FractionID.Int32)
user.Fraction, err = fractionRep.GetById(user.FractionID.Int32)
if err != nil {
return err
}