root/tgex-backend
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

обработка обновлений последовательно для каждого юзера благодаря mutex

Browse Source
This commit is contained in:
Artem Tsyrulnikov
2026-01-04 19:35:41 +03:00
parent 5251ec3015
commit 592ade7dce
9 changed files with 235 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
telegram_bot/screens/add_purchase.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
"example.com/m/bot"
"example.com/m/ui"
"github.com/NicoNex/echotron/v3"
"github.com/rs/zerolog/log"
)
@@ -84,26 +85,31 @@ func (s *AddPurchase) renderSelection(b *bot.Bot, mode bot.RenderMode, jwt strin
if len(page.Items) == 0 {
text += "У вас нет проектов. Создайте проект и попробуйте снова.\n\n"
} else {
pageInfo := ""
if page.Pages > 1 {
pageInfo = fmt.Sprintf(" <i>(стр. %d/%d)</i>", page.Page, page.Pages)
}
text += fmt.Sprintf("Проекты%s\n\n", ui.FormatPageInfo(s.ProjectPage, page.Pages))
text += fmt.Sprintf("Проекты%s\n\n", pageInfo)
var slots []echotron.InlineKeyboardButton
for _, project := range page.Items {
buttons = append(buttons, bot.Row(
bot.Button(project.Title, fmt.Sprintf("project:%s", project.ID)),
))
slots = append(slots, bot.Button(project.Title, fmt.Sprintf("project:%s", project.ID)))
}
if page.Pages >= 2 {
for len(slots) < addPurchaseProjectsPerPage {
slots = append(slots, bot.Button(" ", "empty"))
}
}
for i := 0; i < len(slots); i += 2 {
row := []echotron.InlineKeyboardButton{slots[i]}
if i+1 < len(slots) {
row = append(row, slots[i+1])
} else {
row = append(row, bot.Button(" ", "empty"))
}
buttons = append(buttons, row)
}
var navRow []echotron.InlineKeyboardButton
if s.ProjectPage > 0 {
navRow = append(navRow, bot.Button("←", "prev_project"))
}
if s.ProjectPage+1 < page.Pages {
navRow = append(navRow, bot.Button("→", "next_project"))
}
if len(navRow) > 0 {
if navRow := ui.BuildNavigationRow(ui.PaginationConfig{
CurrentPage: s.ProjectPage,
TotalPages: page.Pages,
}); navRow != nil {
buttons = append(buttons, navRow)
}
}
@@ -146,27 +152,31 @@ func (s *AddPurchase) renderSelection(b *bot.Bot, mode bot.RenderMode, jwt strin
Вернитесь назад и создайте креатив в разделе <b>Креативы</b>`
} else {
pageInfo := ""
if page.Pages > 1 {
pageInfo = fmt.Sprintf(" <i>(стр. %d/%d)</i>", page.Page, page.Pages)
}
text += fmt.Sprintf("Креативы%s\n\n", pageInfo)
text += fmt.Sprintf("Креативы%s\n\n", ui.FormatPageInfo(s.CreativePage, page.Pages))
var slots []echotron.InlineKeyboardButton
for _, creative := range page.Items {
buttons = append(buttons, bot.Row(
bot.Button(creative.Name, fmt.Sprintf("creative:%s", creative.ID)),
))
slots = append(slots, bot.Button(creative.Name, fmt.Sprintf("creative:%s", creative.ID)))
}
if page.Pages >= 2 {
for len(slots) < addPurchaseCreativesPerPage {
slots = append(slots, bot.Button(" ", "empty"))
}
}
for i := 0; i < len(slots); i += 2 {
row := []echotron.InlineKeyboardButton{slots[i]}
if i+1 < len(slots) {
row = append(row, slots[i+1])
} else {
row = append(row, bot.Button(" ", "empty"))
}
buttons = append(buttons, row)
}
var navRow []echotron.InlineKeyboardButton
if s.CreativePage > 0 {
navRow = append(navRow, bot.Button("←", "prev_creative"))
}
if s.CreativePage+1 < page.Pages {
navRow = append(navRow, bot.Button("→", "next_creative"))
}
if len(navRow) > 0 {
if navRow := ui.BuildNavigationRow(ui.PaginationConfig{
CurrentPage: s.CreativePage,
TotalPages: page.Pages,
}); navRow != nil {
buttons = append(buttons, navRow)
}
}
@@ -232,27 +242,33 @@ func (s *AddPurchase) HandleCallback(b *bot.Bot, u *echotron.Update) {
s.ActivePicker = ""
s.Enter(b, bot.EditMessage)
case "prev_project":
if s.ProjectPage > 0 {
s.ProjectPage--
case "prev":
if s.ActivePicker == "project_list" {
if s.ProjectPage > 0 {
s.ProjectPage--
}
s.Enter(b, bot.EditMessage)
return
}
s.Enter(b, bot.EditMessage)
case "next_project":
s.ProjectPage++
s.Enter(b, bot.EditMessage)
case "prev_creative":
if s.CreativePage > 0 {
s.CreativePage--
if s.ActivePicker == "creative_list" {
if s.CreativePage > 0 {
s.CreativePage--
}
s.Enter(b, bot.EditMessage)
return
}
s.Enter(b, bot.EditMessage)
case "next_creative":
s.CreativePage++
s.Enter(b, bot.EditMessage)
case "next":
if s.ActivePicker == "project_list" {
s.ProjectPage++
s.Enter(b, bot.EditMessage)
return
}
if s.ActivePicker == "creative_list" {
s.CreativePage++
s.Enter(b, bot.EditMessage)
return
}
if s.ProjectID != "" && s.CreativeID != "" {
b.SetState(&SelectChannelsForPurchase{
WorkspaceID: s.WorkspaceID,