From 44964b6498e1bbf47b266f952d0485417e6e4816 Mon Sep 17 00:00:00 2001 From: ScuroNeko Date: Mon, 16 Feb 2026 15:52:18 +0300 Subject: [PATCH] dev --- plugins/admin.go | 9 +++++++++ plugins/rp.go | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/admin.go b/plugins/admin.go index 5503007..28241a0 100644 --- a/plugins/admin.go +++ b/plugins/admin.go @@ -13,6 +13,7 @@ func RegisterAdmin(b *laniakea.Bot) { p := laniakea.NewPlugin("Admin") p.Command(uploadPhoto, "uploadPhoto") p.Command(emojiId, "emojiId") + p.Command(getProxy, "proxy") p.Command(test, "test") p.AddMiddleware(AdminMiddleware()) @@ -33,6 +34,14 @@ func AdminMiddleware() *laniakea.PluginMiddleware { func test(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) { ctx.Answer("Ok") } +func getProxy(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) { + ruProxy := "tg://proxy?port=3128&secret=7qaZyfQN-IQ7ZMwrR_zWnHBvem9uLnJ1&server=185.231.245.25" + fiProxy := "tg://proxy?port=3128&secret=7vmNtw_233xvIRFvImm2PLtvem9uLnJ1&server=46.243.6.125" + kb := laniakea.NewInlineKeyboard(1) + kb.AddUrlButtonStyle("🇷🇺Russia", laniakea.ButtonStylePrimary, ruProxy) + kb.AddUrlButtonStyle("🇫🇮Finland", laniakea.ButtonStylePrimary, fiProxy) + ctx.Keyboard("Доступные прокси", kb) +} func emojiId(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) { var id string for _, e := range ctx.Msg.Entities { diff --git a/plugins/rp.go b/plugins/rp.go index 51d9366..321aaf1 100644 --- a/plugins/rp.go +++ b/plugins/rp.go @@ -764,8 +764,8 @@ func regenerateResponse(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) //} // 0(system), 1, 2, ..., N-2(user, count-3), N-1(agent, count-2), N(system, count-1) - answerToDelete := history[count-3] - userReq := messages[count-4] + answerToDelete := history[count-1] + userReq := messages[count-3] psqlRep := psql.NewRPRepository(db) rpUser, err := psqlRep.GetOrCreateUser(int64(ctx.FromID)) @@ -777,8 +777,8 @@ func regenerateResponse(ctx *laniakea.MsgContext, db *laniakea.DatabaseContext) api := ai.NewOpenAIAPI(ai.GPTBaseUrl, "", rpUser.Model.Key) defer api.Close() - messages = messages.Pop(count - 1) - messages = messages.Pop(count - 4) + messages = messages.Pop(count - 2) + messages = messages.Pop(count - 2) ctx.EditCallback("Генерация запущена...", nil) res, err := api.CreateCompletion(messages, userReq.Content, 1.0)