Merge branch 'dev' of https://github.com/Endpool/CookCookhNya-frontend into dev

Author: Ilyhadev

src/handlers/commands/start.cpp

@@ -44,7 +44,6 @@ void handleStartCmd(MessageRef m, BotRef bot, SMRef stateManager, api::ApiClient
         return;
     }
     const std::string_view payload = std::string_view{m.text}.substr("/start "sv.size());
-
     if (payload.starts_with("invite_")) {
         const std::string_view hash = payload.substr("invite_"sv.size());
         auto storage = api.getStoragesApi().activate(userId, api::InvitationId{hash});

src/render/storage/ingredients/delete.cpp

@@ -19,7 +19,7 @@ std::vector<TgBot::InlineKeyboardButton::Ptr> constructNavigationButtons(std::si
     auto forward = makeCallbackButton(u8"▶️", "next");
     auto backward = makeCallbackButton(u8"◀️", "prev");
     auto dont_handle = makeCallbackButton(u8"ㅤ", "dont_handle");
-    auto page = makeCallbackButton(std::format("{} из {}", (pageNo + 1), (maxPageNum + 1)), "dont_handle");
+    auto page = makeCallbackButton(std::format("{} из {}", (pageNo + 1), maxPageNum), "dont_handle");
     if (pageNo == maxPageNum) {
         buttons.push_back(backward);
         buttons.push_back(page);
@@ -71,7 +71,7 @@ constructMessage(std::vector<api::models::ingredient::Ingredient>& selectedIngre
         else
             buttonRows += 2; // + back + navig
     } else {
-        if (ingSize <= numOfIngredientsOnPage) {
+        if (ingSize <= numOfIngredientsOnPage && pageNo == 0) {
             if (withoutPutToShoppingListButton)
                 buttonRows += 2; // + back + delete
             else

src/render/storage/members/add.cpp

@@ -4,8 +4,10 @@
 #include "backend/id_types.hpp"
 #include "message_tracker.hpp"
 #include "render/common.hpp"
+#include "utils/u8format.hpp"
 #include "utils/utils.hpp"
 
+#include <boost/url/url.hpp>
 #include <tgbot/types/InlineKeyboardButton.h>
 
 #include <cstddef>
@@ -39,11 +41,16 @@ void renderShareLinkMemberAddition(
 
     auto inviteButton = std::make_shared<TgBot::InlineKeyboardButton>();
     inviteButton->text = utils::utf8str(u8"📤 Поделиться");
+    const std::string botAlias = bot.getUnderlying().getMe()->username;
     const api::InvitationId hash = storageApi.inviteMember(userId, storageId);
-    const std::string telegramBotAlias = bot.getUnderlying().getMe()->username;
-    const std::string inviteText = "Нажми на ссылку, чтобы стать участником хранилища 🍱**" + storage.name +
-                                   "** в CookCookhNya!\nhttps://t.me/" + telegramBotAlias + "?start=invite_" + hash;
-    inviteButton->url = "https://t.me/share/url?url=" + inviteText;
+    const std::string storageUrl = std::format("https://t.me/{}?start=invite_{}", botAlias, hash);
+    const std::string shareText = utils::u8format(
+        "{} **{}** {}", u8"Нажми на ссылку, чтобы стать участником хранилища 🍱", storage.name, "в CookCookhNya!");
+
+    boost::urls::url url{"https://t.me/share/url"};
+    url.params().append({"url", storageUrl});
+    url.params().append({"text", shareText});
+    inviteButton->url = url.buffer();
 
     keyboard[0].push_back(std::move(inviteButton));
     keyboard[1].push_back(makeCallbackButton(u8"↩️ Назад", "back"));