From 4d543a2260ceed82d11288a8a79ed537cfdcd0c6 Mon Sep 17 00:00:00 2001
From: ScuroNeko <nix1304@gmail.com>
Date: Thu, 22 Jan 2026 21:21:30 +0300
Subject: [PATCH] some fixes

---
 database/psql/waifus.go | 2 +-
 plugins/rp.go           | 8 ++++----
 utils/ai/utils.go       | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/database/psql/waifus.go b/database/psql/waifus.go
index f3130ee..e8d3b62 100644
--- a/database/psql/waifus.go
+++ b/database/psql/waifus.go
@@ -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
 }
diff --git a/plugins/rp.go b/plugins/rp.go
index 359819f..8973b9d 100644
--- a/plugins/rp.go
+++ b/plugins/rp.go
@@ -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)
diff --git a/utils/ai/utils.go b/utils/ai/utils.go
index d185f2b..bd5c09e 100644
--- a/utils/ai/utils.go
+++ b/utils/ai/utils.go
@@ -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)
 }