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-02-02 16:36:35 +03:00
parent 2a71754c6f
commit f8f3a6c15f
4 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/rp.go
View File

@@ -125,7 +125,20 @@ func rpInfo(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
func rpWaifuList(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
waifuRep := psql.NewWaifuRepository(db)
waifus, err := waifuRep.GetByUserId(ctx.FromID)
waifus := make([]*psql.Waifu, 0)
var err error
userRep := psql.NewUserRepository(db)
user, err := userRep.GetOrCreate(ctx.FromID, ctx.From.FirstName)
if err != nil {
ctx.Error(err)
return
}
if user.Group.IsPremium {
waifus, err = waifuRep.GetAll()
} else {
waifus, err = waifuRep.GetByUserId(ctx.FromID)
}
if err != nil {
ctx.Error(err)
return
@@ -665,14 +678,15 @@ func regenerateResponse(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext)
return
}
// 0(system), 1, 2, ..., N-2(user, count-3), N-1(agent, count-2), N(system, count-1)
answerToDelete := history[count-2]
err = mdb.DeleteChatEntry(db, answerToDelete)
if err != nil {
ctx.Error(err)
if len(messages) == count {
ctx.Bot.Logger().Errorln("len(messages) == count. ")
return
}
// 0(system), 1, 2, ..., N-2(user, count-3), N-1(agent, count-2), N(system, count-1)
answerToDelete := history[count-2]
userReq := messages[count-2]
psqlRep := psql.NewRPRepository(db)
rpUser, err := psqlRep.GetOrCreateUser(int64(ctx.FromID))
if err != nil {
@@ -680,7 +694,6 @@ func regenerateResponse(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext)
return
}
userReq := messages[count-2]
api := ai.NewOpenAIAPI(ai.GPTBaseUrl, "", rpUser.Model.Key)
defer api.Close()
@@ -693,6 +706,12 @@ func regenerateResponse(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext)
return
}
err = mdb.DeleteChatEntry(db, answerToDelete)
if err != nil {
ctx.Error(err)
return
}
m.Delete()
kb := laniakea.NewInlineKeyboard(1)
kb.AddCallbackButton("Перегенерировать", "rp.regenerate", count)