small fixes

plugins/rp.go

@@ -73,7 +73,7 @@ func rpInfo(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
 		return
 	}
 
-	var waifu psql.Waifu
+	var waifu *psql.Waifu
 	waifuId := rpRepRed.GetSelectedWaifu(ctx.FromID)
 	if waifuId == 0 {
 		waifus, err := waifuRep.GetByUserId(ctx.FromID)
@@ -130,8 +130,7 @@ func rpInfo(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
 
 func rpWaifuList(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
 	waifuRep := psql.NewWaifuRepository(db)
-	waifus := make(extypes.Slice[psql.Waifu], 0)
-	var err error
+	var waifus extypes.Slice[*psql.Waifu]
 
 	userRep := psql.NewUserRepository(db)
 	user, err := userRep.GetOrCreate(ctx.FromID, ctx.From.FirstName)
@@ -148,7 +147,7 @@ func rpWaifuList(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
 		ctx.Error(err)
 		return
 	}
-	waifus = waifus.Filter(func(w psql.Waifu) bool {
+	waifus = waifus.Filter(func(w *psql.Waifu) bool {
 		return len(w.RpPrompt) > 0
 	})
 
@@ -156,7 +155,7 @@ func rpWaifuList(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) {
 	kb := laniakea.NewInlineKeyboard(2)
 	for i, waifu := range waifus {
 		owner := "нет"
-		if waifu.OwnerID.Valid {
+		if waifu.OwnerID.Valid && waifu.Owner != nil {
 			owner = waifu.Owner.Name
 		}
 		out[i] = fmt.Sprintf(
@@ -598,12 +597,19 @@ func _getChatHistory(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) ([]
 	if user.UserPrompt != "" {
 		userPrompt = fmt.Sprintf("Вот описание моего персонажа %s.", user.UserPrompt)
 	}
+	//waifuPrompt, err := psqlRep.GetWaifuPrompts(waifuId)
+	//if err != nil {
+	//	return messages, err
+	//}
 	beforeHistory := ai.Message{
 		Role: "system",
 		Content: fmt.Sprintf(
 			"%s %s %s %s",
 			ai.FormatPrompt(preset.PreHistory, waifu.Name, ctx.From.FirstName),
-			fmt.Sprintf("Вот краткое описание твоего персонажа: %s.", waifu.RpPrompt),
+			fmt.Sprintf(
+				"Вот краткое описание твоего персонажа: %s.",
+				waifu.RpPrompt,
+			),
 			redRep.GetChatPrompt(ctx.FromID, waifuId),
 			userPrompt,
 		),