many changes; using dev laniakea
This commit is contained in:
@@ -311,7 +311,7 @@ func rpScenarioList(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
out[i] = fmt.Sprintf("*%s* - %s\n", scenario.Name, scenario.Description)
|
||||
}
|
||||
kb.AddCallbackButtonStyle("На главную", laniakea.ButtonStyleDanger, "rp.info")
|
||||
ctx.EditCallback("Список сценариев\n"+strings.Join(out, "\n"), kb)
|
||||
ctx.EditCallbackMarkdown("Список сценариев\n"+laniakea.EscapePunctuation(strings.Join(out, "\n")), kb)
|
||||
ctx.AnswerCbQuery()
|
||||
}
|
||||
func rpSettingList(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
@@ -328,7 +328,7 @@ func rpSettingList(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
}
|
||||
kb := laniakea.NewInlineKeyboard(1)
|
||||
kb.AddCallbackButtonStyle("На главную", laniakea.ButtonStyleSuccess, "rp.info")
|
||||
ctx.EditCallback(strings.Join(out, "\n"), kb)
|
||||
ctx.EditCallbackMarkdown(laniakea.EscapePunctuation(strings.Join(out, "\n")), kb)
|
||||
ctx.AnswerCbQuery()
|
||||
}
|
||||
|
||||
@@ -369,7 +369,7 @@ func chatStat(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
if chat.Setting != nil {
|
||||
out = append(out, fmt.Sprintf("*Выбранный сеттинг*: %s (ID: %d)", chat.Setting.Name, chat.Setting.ID))
|
||||
}
|
||||
ctx.EditCallback(strings.Join(out, "\n"), kb)
|
||||
ctx.EditCallbackMarkdown(laniakea.EscapePunctuation(strings.Join(out, "\n")), kb)
|
||||
ctx.AnswerCbQuery()
|
||||
}
|
||||
|
||||
@@ -393,7 +393,7 @@ func newChatStage1(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
kb.AddCallbackButton("Без сеттинга", "rp.new_chat_s2", 0)
|
||||
kb.AddLine()
|
||||
kb.AddCallbackButtonStyle("Назад", laniakea.ButtonStyleDanger, "rp.info")
|
||||
ctx.EditCallback(strings.Join(out, "\n"), kb)
|
||||
ctx.EditCallbackMarkdown(laniakea.EscapePunctuation(strings.Join(out, "\n")), kb)
|
||||
ctx.AnswerCbQuery()
|
||||
}
|
||||
func newChatStage2(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
@@ -424,6 +424,7 @@ func newChatStage2(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
"Выбери сценарий:",
|
||||
}
|
||||
kb := laniakea.NewInlineKeyboard(2)
|
||||
var scenariosIds extypes.Slice[int]
|
||||
for _, scenario := range scenarios {
|
||||
isSelected := selectedScenariosIds.Index(scenario.ID) >= 0
|
||||
prefix := ""
|
||||
@@ -434,23 +435,23 @@ func newChatStage2(ctx *laniakea.MsgContext, db *database.Context) {
|
||||
}
|
||||
out = append(out, fmt.Sprintf("%s*%s* - %s", prefix, scenario.Name, scenario.Description))
|
||||
if isSelected {
|
||||
selectedScenariosIds = selectedScenariosIds.Remove(scenario.ID)
|
||||
scenariosIds = selectedScenariosIds.Remove(scenario.ID)
|
||||
} else {
|
||||
selectedScenariosIds = selectedScenariosIds.Push(scenario.ID)
|
||||
scenariosIds = selectedScenariosIds.Push(scenario.ID)
|
||||
}
|
||||
|
||||
kb.AddCallbackButtonStyle(
|
||||
fmt.Sprintf("%s%s", prefix, scenario.Name), style,
|
||||
"rp.new_chat_s2", utils.AppendToInt(settingId, selectedScenariosIds)...,
|
||||
"rp.new_chat_s2", utils.AppendToInt(settingId, scenariosIds)...,
|
||||
)
|
||||
}
|
||||
if len(selectedScenariosIds) == 0 {
|
||||
selectedScenariosIds = selectedScenariosIds.Push(0)
|
||||
}
|
||||
//if len(scenariosIds) == 0 {
|
||||
// scenariosIds = append(scenariosIds, 0)
|
||||
//}
|
||||
kb.AddCallbackButtonStyle("Создать", laniakea.ButtonStyleSuccess, "rp.new_chat", utils.AppendToInt(settingId, selectedScenariosIds)...)
|
||||
kb.AddLine()
|
||||
kb.AddCallbackButtonStyle("Назад", laniakea.ButtonStyleDanger, "rp.new_chat_s1")
|
||||
ctx.EditCallback(strings.Join(out, "\n"), kb)
|
||||
ctx.EditCallbackMarkdown(laniakea.EscapePunctuation(strings.Join(out, "\n")), kb)
|
||||
|
||||
//setting, err := rep.GetSetting(settingId)
|
||||
//if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user