fix

.gitignore

@@ -1,3 +1,4 @@
 obj/*
 PyMenu
-src/config.h
+src/config.h
+core

Dockerfile

@@ -10,7 +10,6 @@ RUN yes y | apt install g++
 
 # install the dpp lib
 RUN yes y | apt install cmake
-RUN yes y | apt install wget
 RUN yes y | apt install libsodium23
 RUN yes y | apt install libopus0
 RUN wget -O dpp.deb https://dl.dpp.dev/
@@ -18,12 +17,10 @@ RUN dpkg -i dpp.deb
 
 RUN mkdir /app
 
-COPY . /app
+RUN git clone https://git.chauvet.pro/starnakin/PyMenuBOT /app
 
 WORKDIR /app
 
 RUN make
 
-COPY src/config.h src/config.h
-
 ENTRYPOINT ["./PyMenu"]

README.md

@@ -5,16 +5,15 @@ PyMenu is a discord bot to create grocery list
 - Add items to your list by sending a message to a channel within the `GROCERY_LIST` category.
 - Support for multiple lists, one for each channel.
 - Easily remove items from your list by clicking on the check mark reaction.
+- Set prices for items.
+- Specify quantities for items.
 
 ## Screenshots
 ![](https://media.discordapp.net/attachments/501841539161522176/1161285342914170970/image.png?ex=6537be41&is=65254941&hm=3ace3096fd0a5d66cb8bfc8c744dbd79dcba84fc02cbaf7a02b01ffbcc7ed58d&=)
 
 ## Planned feature
-- Set prices for items.
-- Specify quantities for items.
 - Customize the category name.
 - Add images.
-- Complete the Dockerfile for easy deployment
 - Implement statistics for nerd
 
 ## Requirements
@@ -46,15 +45,19 @@ make
 git clone https://git.chauvet.pro/starnakin/PyMenuBOT/
 cd PyMenuBOT
 ```
-- Config the bot
-Edit the `src/config.h` file and set the discord bot token
 - Build the docker image.
 ``` bash
 docker build -t pymenu .
 ```
+- Config the bot
+Edit the `docker-compose.yml` file and set the discord bot token
 - Run the docker
 ```bash
-docker run --restart=always --name=pymenu -d pymenu
+docker-compose up -d
+```
+- Run the docker - alternative without docker-compose
+```bash
+docker run --restart=always --name=pymenu -e BOT_TOKEN=token -d pymenu
 ```
 
 ## Setting up on Your Discord Server

docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  pymenu:
+    container_name: pymenu
+    image: pymenu
+    build: .
+    restart: always
+    environment:
+      - BOT_TOKEN=TOKEN

src/config.h

@@ -1,3 +1,4 @@
+#pragma once
 #include <string>
 
 const std::string   BOT_TOKEN = "token";

src/grocery.cpp

@@ -0,0 +1,70 @@
+#include <dpp/cluster.h>
+#include <dpp/unicode_emoji.h>
+#include <dpp/dpp.h>
+
+#include <string>
+
+#include "config.h"
+#include "utils.hpp"
+
+void on_message(dpp::cluster& bot)
+{
+    bot.on_message_create([&bot](const dpp::message_create_t& event)
+    {
+        if (event.msg.author.id == bot.me.id)
+        {
+            bot.message_add_reaction(event.msg, dpp::unicode_emoji::white_check_mark);
+        }
+        else
+        {
+            dpp::channel channel = bot.channel_get_sync(event.msg.channel_id);
+            dpp::channel category = bot.channel_get_sync(channel.parent_id);
+
+            if (category.is_category() == false || category.name != GROCERY_LIST_CATEGORY)
+                return;
+
+            dpp::embed embed = dpp::embed()
+                .set_color(dpp::colors::sea_green)
+                .set_title(event.msg.content)
+                .set_author(event.msg.author.username, "", "")
+                .set_footer(dpp::embed_footer().set_text("PyMenuVersion:2.0"));
+            
+            std::string str = event.msg.content;
+
+            std::string quantity, price;
+
+            get_article_data(str, quantity, price);
+
+            if (!quantity.empty())
+                embed.add_field("Quantity", quantity);
+
+            if (!price.empty())
+                embed.add_field("Price", price);
+
+            embed.set_title(str);
+
+            dpp::message msg(event.msg.channel_id, embed);
+            event.send(msg);
+
+            bot.message_delete(event.msg.id, event.msg.channel_id);
+        }
+    });
+}
+
+void on_react(dpp::cluster& bot)
+{
+    bot.on_message_reaction_add([&bot](const dpp::message_reaction_add_t& event)
+    {
+        dpp::channel channel = bot.channel_get_sync(event.channel_id);
+        dpp::channel category = bot.channel_get_sync(channel.parent_id);
+
+        if (category.is_category() == false || category.name != GROCERY_LIST_CATEGORY)
+            return;
+
+        if (event.reacting_user.id == bot.me.id)
+            return;
+        dpp::emoji emoji = event.reacting_emoji;
+        if (emoji.name == dpp::unicode_emoji::white_check_mark)
+            bot.message_delete(event.message_id, event.channel_id);
+    });
+}

src/main.cpp

@@ -1,60 +1,19 @@
 #include <string>
 #include <dpp/dpp.h>
 #include <dpp/channel.h>
-#include <dpp/unicode_emoji.h>
 
-#include "config.h"
+#include "utils.hpp"
+#include "pymenu.hpp"
 
-int main()
+int main(int ac, char **av, char** env)
 {
-    dpp::cluster bot(BOT_TOKEN, dpp::i_default_intents | dpp::i_message_content);
+    (void) ac;
+    dpp::cluster bot(get_token(av, env), dpp::i_default_intents | dpp::i_message_content);
 
     bot.on_log(dpp::utility::cout_logger());
 
-    bot.on_message_create([&bot](const dpp::message_create_t& event)
-    {
-        if (event.msg.author.id == bot.me.id)
-        {
-            bot.message_add_reaction(event.msg, dpp::unicode_emoji::white_check_mark);
-        }
-        else
-        {
-            dpp::channel channel = bot.channel_get_sync(event.msg.channel_id);
-            dpp::channel category = bot.channel_get_sync(channel.parent_id);
-
-
-            if (category.is_category() == false || category.name != GROCERY_LIST_CATEGORY)
-                return;
-
-            dpp::embed embed = dpp::embed()
-                .set_color(dpp::colors::sea_green)
-                .set_title(event.msg.content)
-                //.add_field("Quantite", "1", true)
-                //.add_field("Prix", "3.29")
-                .set_author(event.msg.author.username, "", "")
-                .set_footer(dpp::embed_footer().set_text("PyMenuVersion:2.0"));
-
-            dpp::message msg(event.msg.channel_id, embed);
-            event.send(msg);
-
-            bot.message_delete(event.msg.id, event.msg.channel_id);
-        }
-    });
-
-    bot.on_message_reaction_add([&bot](const dpp::message_reaction_add_t& event)
-    {
-        dpp::channel channel = bot.channel_get_sync(event.channel_id);
-        dpp::channel category = bot.channel_get_sync(channel.parent_id);
-
-        if (category.is_category() == false || category.name != GROCERY_LIST_CATEGORY)
-            return;
-
-        if (event.reacting_user.id == bot.me.id)
-            return;
-        dpp::emoji emoji = event.reacting_emoji;
-        if (emoji.name == dpp::unicode_emoji::white_check_mark)
-            bot.message_delete(event.message_id, event.channel_id);
-    });
+    on_react(bot);
+    on_message(bot);
 
     bot.on_ready([&bot](const dpp::ready_t& event)
     {

src/pymenu.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <dpp/cluster.h>
+
+void on_react(dpp::cluster& bot);
+void on_message(dpp::cluster& bot);

src/utils.cpp

@@ -0,0 +1,70 @@
+#include <cctype>
+#include <cstddef>
+#include <cstring>
+#include <string>
+#include <iostream>
+
+#include "config.h"
+
+static std::string get_price(std::string& str)
+{
+    std::string price;
+    size_t i;
+
+    for (i = 0; i != str.size(); i++)
+    {
+        if (std::strcmp(str.substr(i, 3).c_str(), "€") == 0)
+        {
+            if (price.empty())
+            {
+                price = "";
+                continue;
+            }
+            price += "€";
+            str.erase(i - (price.size() - 3), price.size());
+            return price;
+        }
+        else if (std::isdigit(str[i]) || str[i] == '.')
+            price += str[i];
+    }
+    return "";
+}
+
+static std::string get_quantity(std::string& str)
+{
+    size_t i;
+    std::string quantity;
+
+    for (i = 0; i != str.size(); i++)
+    {
+        if (!std::isdigit(str[i]))
+        {
+            if (quantity.empty())
+                continue;
+            break;
+        }
+        quantity += str[i];
+    }
+    str.erase(i - quantity.size(), quantity.size());
+    return quantity;
+}
+
+int get_article_data(std::string& str, std::string& quantity, std::string& price)
+{
+    price = get_price(str);
+    quantity = get_quantity(str);
+
+    return 0;
+}
+
+std::string get_token(char** av, char** env)
+{
+    if (av[1] != NULL)
+        return av[1];
+    for (size_t i = 0; env[i] != NULL; ++i)
+    {
+        if (std::strncmp("BOT_TOKEN", env[i], 9) == 0)
+            return env[i] + 10;
+    }
+    return BOT_TOKEN;
+}

src/utils.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <string>
+
+int get_article_data(std::string& str, std::string& quantity, std::string& price);
+std::string get_token(char** av, char** env);