Final release

.clang-tidy

@@ -30,10 +30,12 @@ Checks: "*,
         -cppcoreguidelines-avoid-do-while,
         -bugprone-easily-swappable-parameters,
         -misc-non-private-member-variables-in-classes,
-        -llvm-header-guard,"
+        -llvm-header-guard,
+
+        -misc-include-cleaner"
 CheckOptions:
   cppcoreguidelines-pro-type-member-init.IgnoreArrays: true
   readability-implicit-bool-conversion.AllowPointerConditions: true
   readability-braces-around-statements.ShortStatementLines: 3
+  misc-include-cleaner.MissingIncludes: false
 FormatStyle: none
-

.env.example

@@ -3,3 +3,4 @@ API_URL=localhost:8000
 WEBHOOK_PORT=8443
 WEBHOOK_HOST=https://mydomain.com
 WEBHOOK_SECRET=secret
+WEBHOOK_CERTIFICATE_PATH=cert.pem

.github/actions/build_deps/action.yml

@@ -17,7 +17,7 @@ runs:
           path: |
             ~/.conan2
             /tmp/deps
-          key: ${{ runner.os }}-conan-cpp23-${{ hashFiles('Frontend/conanfile.txt') }}-tgbotstater-0.4.1
+          key: ${{ runner.os }}-conan-cpp23-${{ hashFiles('Frontend/conanfile.txt') }}-tgbotstater-0.4.2
           restore-keys: |
             ${{ runner.os }}-conan-cpp23-
 
@@ -54,9 +54,9 @@ runs:
         run: |
           mkdir -p /tmp/deps
           cd /tmp/deps
-          wget https://github.com/Makcal/TgBotStater/archive/refs/tags/v0.4.1.tar.gz -O tgbotstater.tar.gz
+          wget https://github.com/Makcal/TgBotStater/archive/refs/tags/v0.4.2.tar.gz -O tgbotstater.tar.gz
           tar -xf tgbotstater.tar.gz
-          cd TgBotStater-0.4.1
+          cd TgBotStater-0.4.2
           conan create . --build=missing
 
       - name: Install project dependencies

.github/workflows/ci.yml

@@ -1,3 +1,4 @@
+
 name: ci pipeline for frontend
 
 on:
@@ -23,7 +24,6 @@ jobs:
         working-directory: .
         run: |
           make build-release
-
   clang-format-check:
     runs-on: ubuntu-latest
     needs: build
@@ -40,7 +40,6 @@ jobs:
         run: |
           find src -type f \( -name '*.hpp' -or -name '*.cpp' \) \
             -exec clang-format-19 --dry-run --Werror {} \+
-
   clang-tidy-check:
     runs-on: ubuntu-latest
     needs: build
@@ -56,7 +55,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y clang-tidy-19 parallel
           echo "/usr/lib/llvm-19/bin" >> $GITHUB_PATH
-  
+
       - name: Restore clang-tidy cache
         id: cache-restore
         uses: actions/cache/restore@v4
@@ -65,8 +64,9 @@ jobs:
           key: ${{ runner.os }}-clang-tidy-${{ github.ref }}-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-clang-tidy-${{ github.ref }}-
-            ${{ runner.os }}-clang-tidy-refs/heads/main
-
+            ${{ runner.os }}-clang-tidy-refs/heads/dev-
+            ${{ runner.os }}-clang-tidy-refs/heads/main-
+
       - name: Copy original cache file if exists
         run: |
           if [ -f .clang-tidy-cache.json ]; then
@@ -150,7 +150,6 @@ jobs:
       - name: Run clang-tidy with caching
         run: |
           bash ./run-clang-tidy-cached.sh
-
       - name: Check if cache file changed
         id: cache-changed
         run: |
@@ -166,7 +165,6 @@ jobs:
             echo "No original cache file, assuming changed"
             echo "changed=true" >> $GITHUB_OUTPUT
           fi
-
       - name: Debug cache state
         run: |
           echo "Cache hit: ${{ steps.cache-restore.outputs.cache-hit }}"
@@ -177,7 +175,6 @@ jobs:
           else
             echo "No cache file found"
           fi
-
       - name: Save clang-tidy cache
         if: always() && steps.cache-changed.outputs.changed == 'true'
         uses: actions/cache/save@v4

CMakeLists.txt

@@ -40,6 +40,10 @@ include(src/handlers/CMakeLists.txt)
 include(src/render/CMakeLists.txt)
 include(src/utils/CMakeLists.txt)
 
+# settings
+target_compile_definitions(main PRIVATE
+    TGBOTSTATER_NOT_LOG_HANDLERS_CALLS)
+
 # setup
 target_include_directories(main PRIVATE
     ${CMAKE_SOURCE_DIR}/src

Dockerfile

@@ -17,10 +17,10 @@ RUN conan profile detect \
 RUN conan install --requires=boost/1.83.0 --build=missing
 
 WORKDIR /deps
-RUN wget https://github.com/Makcal/TgBotStater/archive/refs/tags/v0.4.1.tar.gz -O tgbotstater.tar.gz \
+RUN wget https://github.com/Makcal/TgBotStater/archive/refs/tags/v0.4.2.tar.gz -O tgbotstater.tar.gz \
  && tar -xf tgbotstater.tar.gz \
  && rm tgbotstater.tar.gz \
- && cd TgBotStater-0.4.1 \
+ && cd TgBotStater-0.4.2 \
  && conan create . --build=missing
 
 WORKDIR /app

Makefile

@@ -27,7 +27,7 @@ build/Release/CMakeCache.txt: conanfile.txt
 build-debug: build/Debug/CMakeCache.txt
 	cmake --build --preset=conan-debug
 build-debug-j5: build/Release/CMakeCache.txt
-	cmake --build . --preset=conan-debug -- -j5
+	cmake --build . --preset=conan-debug -- -j2
 build-release: build/Release/CMakeCache.txt
 	cmake --build --preset=conan-release
 

conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
-tgbotstater/0.4.1
+tgbotstater/0.4.2
 cpp-httplib/0.19.0
 boost/1.83.0
 

src/backend/CMakeLists.txt

@@ -1,15 +1,20 @@
 target_sources(main PRIVATE
     src/backend/api/base.cpp
 
+    src/backend/api/publicity_filter.cpp
+
     src/backend/api/storages.cpp
     src/backend/api/ingredients.cpp
     src/backend/api/users.cpp
     src/backend/api/recipes.cpp
     src/backend/api/shopping_lists.cpp
+    src/backend/api/moderation.cpp
 
     src/backend/models/storage.cpp
     src/backend/models/ingredient.cpp
     src/backend/models/user.cpp
     src/backend/models/recipe.cpp
     src/backend/models/shopping_list.cpp
+    src/backend/models/publication_request_status.cpp
+    src/backend/models/moderation.cpp
 )

src/backend/api/api.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "backend/api/ingredients.hpp"
-#include "backend/api/recipes.hpp"
-#include "backend/api/shopping_lists.hpp"
-#include "backend/api/storages.hpp"
-#include "backend/api/users.hpp"
+#include "ingredients.hpp"
+#include "moderation.hpp"
+#include "recipes.hpp"
+#include "shopping_lists.hpp"
+#include "storages.hpp"
+#include "users.hpp"
 
 #include <httplib.h>
 
@@ -20,13 +21,16 @@ class ApiClient {
     IngredientsApi ingredients;
     RecipesApi recipes;
     ShoppingListApi shoppingList;
+    ModerationApi moderation;
 
   public:
     explicit ApiClient(const std::string& apiAddress)
-        : api{apiAddress}, users{api}, storages{api}, ingredients{api}, recipes{api}, shoppingList{api} {}
+        : api{apiAddress}, users{api}, storages{api}, ingredients{api}, recipes{api}, shoppingList{api},
+          moderation{api} {}
     ApiClient(const ApiClient&) = delete;
     ApiClient(ApiClient&& other) noexcept
-        : api{std::move(other.api)}, users{api}, storages{api}, ingredients{api}, recipes{api}, shoppingList{api} {}
+        : api{std::move(other.api)}, users{api}, storages{api}, ingredients{api}, recipes{api}, shoppingList{api},
+          moderation{api} {}
     ApiClient& operator=(const ApiClient&) = delete;
     ApiClient& operator=(ApiClient&& other) noexcept {
         if (&other == this)
@@ -37,6 +41,7 @@ class ApiClient {
         ingredients = IngredientsApi{api};
         recipes = RecipesApi{api};
         shoppingList = ShoppingListApi{api};
+        moderation = ModerationApi{api};
         return *this;
     }
     ~ApiClient() = default;
@@ -80,6 +85,16 @@ class ApiClient {
     operator const ShoppingListApi&() const { // NOLINT(*-explicit-*)
         return shoppingList;
     }
+
+    [[nodiscard]] const ModerationApi& getModerationApi() const {
+        return moderation;
+    }
+
+    operator const ModerationApi&() const { // NOLINT(*-explicit-*)
+        return moderation;
+    }
 };
 
+using ApiClientRef = const api::ApiClient&;
+
 } // namespace cookcookhnya::api

src/backend/api/ingredients.cpp

@@ -1,6 +1,6 @@
 #include "backend/api/ingredients.hpp"
 
-#include "backend/api/common.hpp"
+#include "backend/api/publicity_filter.hpp"
 #include "backend/id_types.hpp"
 #include "backend/models/ingredient.hpp"
 #include "utils/parsing.hpp"
@@ -23,11 +23,11 @@ Ingredient IngredientsApi::get(UserId user, IngredientId ingredient) const {
 
 // GET /storages/{storageId}/ingredients
 std::vector<Ingredient>
-IngredientsApi::getStorageIngredients(UserId user, StorageId storage, std::size_t size, std::size_t offset) const {
+IngredientsApi::getStorageIngredients(UserId user, StorageId storage, std::size_t count, std::size_t offset) const {
     return jsonGetAuthed<std::vector<Ingredient>>(
         user,
         std::format("/storages/{}/ingredients", storage),
-        {{"size", utils::to_string(size)}, {"offset", utils::to_string(offset)}});
+        {{"size", utils::to_string(count)}, {"offset", utils::to_string(offset)}});
 }
 
 // PUT /storages/{storageId}/ingredients/{ingredientId}
@@ -46,51 +46,59 @@ void IngredientsApi::deleteMultipleFromStorage(UserId user,
                                                const std::vector<IngredientId>& ingredients) const {
     httplib::Params params = {};
     for (auto id : ingredients)
-        params.insert({"ingredient", utils::to_string(id)});
+        params.emplace("ingredient", utils::to_string(id));
     jsonDeleteAuthed<void>(user, std::format("/storages/{}/ingredients/", storage), params);
 }
 
 // GET /ingredients-for-storage
 IngredientSearchForStorageResponse IngredientsApi::searchForStorage(UserId user,
                                                                     StorageId storage,
                                                                     std::string query,
-                                                                    std::size_t threshold,
-                                                                    std::size_t size,
-                                                                    std::size_t offset) const {
+                                                                    std::size_t count,
+                                                                    std::size_t offset,
+                                                                    unsigned threshold) const {
     return jsonGetAuthed<IngredientSearchForStorageResponse>(user,
                                                              "/ingredients-for-storage",
                                                              {{"query", std::move(query)},
                                                               {"storage-id", utils::to_string(storage)},
-                                                              {"size", utils::to_string(size)},
+                                                              {"size", utils::to_string(count)},
                                                               {"threshold", utils::to_string(threshold)},
                                                               {"offset", utils::to_string(offset)}});
 }
 
-// GET /public/ingredients
-IngredientSearchResponse
-IngredientsApi::publicSearch(std::string query, std::size_t threshold, std::size_t size, std::size_t offset) const {
-    return jsonGet<IngredientSearchResponse>("/public/ingredients",
-                                             {},
-                                             {{"query", std::move(query)},
-                                              {"threshold", utils::to_string(threshold)},
-                                              {"size", utils::to_string(size)},
-                                              {"offset", utils::to_string(offset)}});
-}
-
 // GET /ingredients
 IngredientSearchResponse IngredientsApi::search(UserId user,
+                                                PublicityFilterType filter,
                                                 std::string query,
-                                                std::size_t threshold,
-                                                std::size_t size,
+                                                std::size_t count,
                                                 std::size_t offset,
-                                                filterType filter) const {
+                                                unsigned threshold) const {
     return jsonGetAuthed<IngredientSearchResponse>(user,
                                                    "/ingredients",
                                                    {{"query", std::move(query)},
-                                                    {"size", utils::to_string(size)},
+                                                    {"size", utils::to_string(count)},
                                                     {"offset", utils::to_string(offset)},
                                                     {"threshold", utils::to_string(threshold)},
-                                                    {"filter", filterStr(filter)}});
+                                                    {"filter", utils::to_string(filter)}});
+}
+
+// GET /ingredients
+IngredientList
+IngredientsApi::getList(UserId user, PublicityFilterType filter, std::size_t count, std::size_t offset) const {
+    auto result = search(user, filter, "", count, offset, 0);
+    return {.page = std::move(result.page), .found = result.found};
+}
+
+// GET /ingredients
+CustomIngredientList IngredientsApi::customIngredientsSearch(
+    UserId user, std::string query, std::size_t threshold, std::size_t count, std::size_t offset) const {
+    return jsonGetAuthed<CustomIngredientList>(user,
+                                               "/ingredients",
+                                               {{"query", std::move(query)},
+                                                {"size", utils::to_string(count)},
+                                                {"offset", utils::to_string(offset)},
+                                                {"threshold", utils::to_string(threshold)},
+                                                {"filter", utils::to_string(PublicityFilterType::Custom)}});
 }
 
 // GET /public/ingredients/{ingredientId}
@@ -109,17 +117,13 @@ void IngredientsApi::deleteFromRecipe(UserId user, RecipeId recipe, IngredientId
 }
 
 // GET /ingredients-for-recipe
-IngredientSearchForRecipeResponse IngredientsApi::searchForRecipe(UserId user,
-                                                                  RecipeId recipe,
-                                                                  std::string query,
-                                                                  std::size_t threshold,
-                                                                  std::size_t size,
-                                                                  std::size_t offset) const {
+IngredientSearchForRecipeResponse IngredientsApi::searchForRecipe(
+    UserId user, RecipeId recipe, std::string query, std::size_t count, std::size_t offset, unsigned threshold) const {
     return jsonGetAuthed<IngredientSearchForRecipeResponse>(user,
                                                             "/ingredients-for-recipe",
                                                             {{"query", std::move(query)},
                                                              {"threshold", utils::to_string(threshold)},
-                                                             {"size", utils::to_string(size)},
+                                                             {"size", utils::to_string(count)},
                                                              {"offset", utils::to_string(offset)},
                                                              {"recipe-id", utils::to_string(recipe)}});
 }
@@ -129,6 +133,11 @@ IngredientId IngredientsApi::createCustom(UserId user, const IngredientCreateBod
     return utils::parse<IngredientId>(postWithJsonAuthed(user, "/ingredients", body));
 }
 
+// DELETE /ingredients/{ingredientId}
+void IngredientsApi::deleteCustom(UserId user, IngredientId ingredient) const {
+    jsonDeleteAuthed<void>(user, std::format("/ingredients/{}", ingredient));
+}
+
 // POST /recipes/{ingredientId}/request-publication
 void IngredientsApi::publishCustom(UserId user, IngredientId ingredient) const {
     jsonPostAuthed<void>(user, std::format("/ingredients/{}/request-publication", ingredient));