some fixes

This commit is contained in:
2026-01-22 21:21:30 +03:00
parent 331f6854b6
commit 4d543a2260
3 changed files with 7 additions and 6 deletions

View File

@@ -88,6 +88,6 @@ func (rep *WaifuRepository) GetById(id int) (*Waifu, error) {
return waifu, err
}
waifu.Owner = new(User)
err = rep.db.Get(waifu, "SELECT * FROM users WHERE id=$1;", int(waifu.OwnerID.Int64))
err = rep.db.Get(waifu.Owner, "SELECT * FROM users WHERE id=$1;", int(waifu.OwnerID.Int64))
return waifu, err
}

View File

@@ -171,7 +171,7 @@ func rpScenarioList(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
kb.AddCallbackButton("Без сценария", "rp.new_chat", 0)
kb.AddLine()
kb.AddCallbackButton("На главную", "rp.info")
ctx.EditCallback("Выбери сценарий"+strings.Join(out, "\n"), kb)
ctx.EditCallback("Выбери сценарий\n"+strings.Join(out, "\n"), kb)
}
func chatStat(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
@@ -333,15 +333,15 @@ func generate(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
Role: "system",
Content: fmt.Sprintf(
"%s %s %s %s",
ai.FormatPrompt(preset.PreHistory, waifu.Name, ctx.Msg.From.FirstName),
ai.FormatPrompt(preset.PreHistory, waifu.Name, ctx.From.FirstName),
fmt.Sprintf("Вот краткое описание твоего персонажа: %s.", waifu.RpPrompt),
userPrompt,
redisRpRep.GetChatPrompt(ctx.FromID, waifuId),
userPrompt,
),
}
afterHistory := ai.Message{
Role: "system",
Content: ai.FormatPrompt(preset.PostHistory, waifu.Name, ctx.Msg.From.FirstName),
Content: ai.FormatPrompt(preset.PostHistory, waifu.Name, ctx.From.FirstName),
}
history, err := mdb.GetChatHistory(db, chatId)

View File

@@ -3,5 +3,6 @@ package ai
import "strings"
func FormatPrompt(prompt, char, user string) string {
return strings.ReplaceAll(strings.ReplaceAll(prompt, "{{user}}", user), "{{char}}", char)
s := strings.ReplaceAll(prompt, "{{user}}", user)
return strings.ReplaceAll(s, "{{char}}", char)
}