Переименовано в MaxBot

Author: lirik90

.github/workflows/docker-image.yml

@@ -14,8 +14,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build docker image
-        run: docker build -t reo7sp/tgbot-cpp -f Dockerfile .
+        run: docker build -t reo7sp/maxbot-cpp -f Dockerfile .
       - name: Build docker image with examples and unit tests
-        run: docker build -t reo7sp/tgbot-cpp-test -f Dockerfile_test .
+        run: docker build -t reo7sp/maxbot-cpp-test -f Dockerfile_test .
       - name: Run unit tests
-        run: docker run --rm reo7sp/tgbot-cpp-test
+        run: docker run --rm reo7sp/maxbot-cpp-test

.gitignore

@@ -11,7 +11,7 @@ install_manifest.txt
 .sw
 doc/
 Thumbs.db
-TgBot_test
+MaxBot_test
 .idea/
 docs/
 cmake-build-*

CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.10.2)
-project(TgBot)
+project(MaxBot)
 
 if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT variables
 endif()
 
 # options
 option(ENABLE_TESTS "Set to ON to enable building of tests" OFF)
-option(BUILD_SHARED_LIBS "Build tgbot-cpp shared/static library." OFF)
+option(BUILD_SHARED_LIBS "Build maxbot-cpp shared/static library." OFF)
 option(BUILD_DOCUMENTATION "Build doxygen API documentation." OFF)
 
 # sources
@@ -28,12 +28,12 @@ set(SRC_LIST
     src/Api.cpp
     src/Bot.cpp
     src/EventHandler.cpp
-    src/TgException.cpp
-    src/TgTypeParser.cpp
+    src/BotException.cpp
+    src/BotTypeParser.cpp
     src/net/BoostHttpOnlySslClient.cpp
     src/net/CurlHttpClient.cpp
     src/net/HttpParser.cpp
-    src/net/TgLongPoll.cpp
+    src/net/BotLongPoll.cpp
     src/net/Url.cpp
     src/tools/FileTools.cpp
     src/tools/StringTools.cpp

Dockerfile

@@ -5,12 +5,12 @@ RUN apt-get -qq update && \
     apt-get -qq install -y g++ make binutils cmake libssl-dev libboost-system-dev libcurl4-openssl-dev zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-WORKDIR /usr/src/tgbot-cpp
+WORKDIR /usr/src/maxbot-cpp
 COPY include include
 COPY src src
 COPY CMakeLists.txt ./
 
 RUN cmake . && \
     make -j$(nproc) && \
     make install && \
-    rm -rf /usr/src/tgbot-cpp/*
+    rm -rf /usr/src/maxbot-cpp/*

Dockerfile_test

@@ -19,7 +19,7 @@ RUN apt-get -qq update && \
         zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-WORKDIR /usr/src/tgbot-cpp
+WORKDIR /usr/src/maxbot-cpp
 COPY include include
 COPY src src
 COPY test test
@@ -31,51 +31,51 @@ RUN cmake -DENABLE_TESTS=ON . && \
 
 COPY samples samples
 
-WORKDIR /usr/src/tgbot-cpp/samples/echobot
+WORKDIR /usr/src/maxbot-cpp/samples/echobot
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/echobot-curl-client
+WORKDIR /usr/src/maxbot-cpp/samples/echobot-curl-client
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/echobot-setmycommands
+WORKDIR /usr/src/maxbot-cpp/samples/echobot-setmycommands
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp
-RUN rm -rf samples/echobot-submodule/tgbot-cpp/
-COPY include samples/echobot-submodule/tgbot-cpp/include
-COPY src samples/echobot-submodule/tgbot-cpp/src
-COPY CMakeLists.txt samples/echobot-submodule/tgbot-cpp/
-WORKDIR /usr/src/tgbot-cpp/samples/echobot-submodule
+WORKDIR /usr/src/maxbot-cpp
+RUN rm -rf samples/echobot-submodule/maxbot-cpp/
+COPY include samples/echobot-submodule/maxbot-cpp/include
+COPY src samples/echobot-submodule/maxbot-cpp/src
+COPY CMakeLists.txt samples/echobot-submodule/maxbot-cpp/
+WORKDIR /usr/src/maxbot-cpp/samples/echobot-submodule
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/echobot-webhook-server
+WORKDIR /usr/src/maxbot-cpp/samples/echobot-webhook-server
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/inline-keyboard
+WORKDIR /usr/src/maxbot-cpp/samples/inline-keyboard
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/photo
+WORKDIR /usr/src/maxbot-cpp/samples/photo
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/received-text-processing
+WORKDIR /usr/src/maxbot-cpp/samples/received-text-processing
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/reply-keyboard
+WORKDIR /usr/src/maxbot-cpp/samples/reply-keyboard
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp/samples/receive-file
+WORKDIR /usr/src/maxbot-cpp/samples/receive-file
 RUN rm -rf CMakeCache.txt CMakeFiles/ && \
     cmake . && make -j$(nproc)
 
-WORKDIR /usr/src/tgbot-cpp
+WORKDIR /usr/src/maxbot-cpp
 ENV CTEST_OUTPUT_ON_FAILURE=1
 CMD make test

Doxyfile

@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = tgbot-cpp
+PROJECT_NAME           = maxbot-cpp
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2024 GitHub contributors https://github.com/reo7sp/tgbot-cpp/graphs/contributors
+Copyright (c) 2015-2024 GitHub contributors https://github.com/reo7sp/maxbot-cpp/graphs/contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,10 +1,10 @@
-# tgbot-cpp
+# maxbot-cpp
 
-[![GitHub contributors](https://img.shields.io/github/contributors/reo7sp/tgbot-cpp.svg)](https://github.com/reo7sp/tgbot-cpp/graphs/contributors)
+[![GitHub contributors](https://img.shields.io/github/contributors/reo7sp/maxbot-cpp.svg)](https://github.com/reo7sp/maxbot-cpp/graphs/contributors)
 
 C++ library for Telegram bot API.
 
-Documentation is located [here](http://reo7sp.github.io/tgbot-cpp).
+Documentation is located [here](http://reo7sp.github.io/maxbot-cpp).
 
 
 ## State
@@ -22,14 +22,14 @@ Simple echo bot which sends everything it receives:
 
 ```cpp
 #include <stdio.h>
-#include <tgbot/tgbot.h>
+#include <maxbot/maxbot.h>
 
 int main() {
-    TgBot::Bot bot("PLACE YOUR TOKEN HERE");
-    bot.getEvents().onCommand("start", [&bot](TgBot::Message::Ptr message) {
+    MaxBot::Bot bot("PLACE YOUR TOKEN HERE");
+    bot.getEvents().onCommand("start", [&bot](MaxBot::Message::Ptr message) {
         bot.getApi().sendMessage(message->chat->id, "Hi!");
     });
-    bot.getEvents().onAnyMessage([&bot](TgBot::Message::Ptr message) {
+    bot.getEvents().onAnyMessage([&bot](MaxBot::Message::Ptr message) {
         printf("User wrote %s\n", message->text.c_str());
         if (StringTools::startsWith(message->text, "/start")) {
             return;
@@ -38,12 +38,12 @@ int main() {
     });
     try {
         printf("Bot username: %s\n", bot.getApi().getMe()->username.c_str());
-        TgBot::TgLongPoll longPoll(bot);
+        MaxBot::BotLongPoll longPoll(bot);
         while (true) {
             printf("Long poll started\n");
             longPoll.start();
         }
-    } catch (TgBot::TgException& e) {
+    } catch (MaxBot::BotException& e) {
         printf("error: %s\n", e.what());
     }
     return 0;
@@ -79,14 +79,14 @@ sudo apt install libboost-test-dev doxygen
 You can compile and install the library with these commands:
 
 ```sh
-git clone https://github.com/reo7sp/tgbot-cpp
-cd tgbot-cpp
+git clone https://github.com/reo7sp/maxbot-cpp
+cd maxbot-cpp
 cmake .
 make -j4
 sudo make install
 ```
 
-Alternatively, you can use Docker to build and run your bot. Set the base image of your's Dockerfile to [reo7sp/tgbot-cpp](https://hub.docker.com/r/reo7sp/tgbot-cpp/).
+Alternatively, you can use Docker to build and run your bot. Set the base image of your's Dockerfile to [reo7sp/maxbot-cpp](https://hub.docker.com/r/reo7sp/maxbot-cpp/).
 
 
 ## Library installation on MacOS
@@ -102,7 +102,7 @@ You can compile and install the library like Linux instructions.
 
 ## Library installation on Windows
 
-### Download vcpkg and tgbot-cpp
+### Download vcpkg and maxbot-cpp
 
 Taken from [Vcpkg - Quick Start: Windows](https://github.com/Microsoft/vcpkg/#quick-start-windows).
 
@@ -127,13 +127,13 @@ In order to use vcpkg with Visual Studio, run the following command (may require
 To install the libraries for Windows x64, run:
 
 ```cmd
-> .\vcpkg\vcpkg install tgbot-cpp:x64-windows
+> .\vcpkg\vcpkg install maxbot-cpp:x64-windows
 ```
 
 To install for Windows x86, run:
 
 ```cmd
-> .\vcpkg\vcpkg install tgbot-cpp
+> .\vcpkg\vcpkg install maxbot-cpp
 ```
 
 The library will now be installed and Visual Studio should be able to find the vcpkg installation.
@@ -143,7 +143,7 @@ The library will now be installed and Visual Studio should be able to find the v
 Use the [example CMakeLists.txt](samples/echobot/CMakeLists.txt) with changes:
 
 1. Remove `/usr/local/include`
-2. Change `/usr/local/lib/libTgBot.a` to `C:/src/vcpkg/installed/x64-windows/lib/TgBot.lib` or something simmilar according to your own installation path.
+2. Change `/usr/local/lib/libMaxBot.a` to `C:/src/vcpkg/installed/x64-windows/lib/MaxBot.lib` or something simmilar according to your own installation path.
 
 
 ## Bot compilation
@@ -157,7 +157,7 @@ Also, you can treat this repository as a submodule of your project, for example,
 ### Without CMake
 
 ```sh
-g++ telegram_bot.cpp -o telegram_bot --std=c++14 -I/usr/local/include -lTgBot -lboost_system -lssl -lcrypto -lpthread
+g++ telegram_bot.cpp -o telegram_bot --std=c++14 -I/usr/local/include -lMaxBot -lboost_system -lssl -lcrypto -lpthread
 ```
 
 ### Build options
@@ -170,4 +170,4 @@ g++ telegram_bot.cpp -o telegram_bot --std=c++14 -I/usr/local/include -lTgBot -l
 
 
 ## Licence
-[The MIT License](https://github.com/reo7sp/tgbot-cpp/blob/master/LICENSE).
+[The MIT License](https://github.com/reo7sp/maxbot-cpp/blob/master/LICENSE).

include/tgbot/Api.h include/maxbot/Api.hinclude/tgbot/Api.h renamed to include/maxbot/Api.h

@@ -1,32 +1,32 @@
 #ifndef TGBOT_API_H
 #define TGBOT_API_H
 
-#include "tgbot/TgException.h"
-#include "tgbot/TgTypeParser.h"
-#include "tgbot/net/HttpClient.h"
-#include "tgbot/net/HttpReqArg.h"
-#include "tgbot/tools/StringTools.h"
-#include "tgbot/types/User.h"
-#include "tgbot/types/Message.h"
-#include "tgbot/types/MessageId.h"
-#include "tgbot/types/GenericReply.h"
-#include "tgbot/types/InputFile.h"
-#include "tgbot/types/UserProfilePhotos.h"
-#include "tgbot/types/Update.h"
-#include "tgbot/types/InlineQueryResult.h"
-#include "tgbot/types/Venue.h"
-#include "tgbot/types/WebhookInfo.h"
-#include "tgbot/types/ChatMember.h"
-#include "tgbot/types/Sticker.h"
-#include "tgbot/types/StickerSet.h"
-#include "tgbot/types/File.h"
-#include "tgbot/types/InputMedia.h"
-#include "tgbot/types/GameHighScore.h"
-#include "tgbot/types/SentWebAppMessage.h"
-#include "tgbot/types/LabeledPrice.h"
-#include "tgbot/types/ShippingOption.h"
-#include "tgbot/types/BotCommand.h"
-#include "tgbot/types/ForumTopic.h"
+#include "maxbot/BotException.h"
+#include "maxbot/BotTypeParser.h"
+#include "maxbot/net/HttpClient.h"
+#include "maxbot/net/HttpReqArg.h"
+#include "maxbot/tools/StringTools.h"
+#include "maxbot/types/User.h"
+#include "maxbot/types/Message.h"
+#include "maxbot/types/MessageId.h"
+#include "maxbot/types/GenericReply.h"
+#include "maxbot/types/InputFile.h"
+#include "maxbot/types/UserProfilePhotos.h"
+#include "maxbot/types/Update.h"
+#include "maxbot/types/InlineQueryResult.h"
+#include "maxbot/types/Venue.h"
+#include "maxbot/types/WebhookInfo.h"
+#include "maxbot/types/ChatMember.h"
+#include "maxbot/types/Sticker.h"
+#include "maxbot/types/StickerSet.h"
+#include "maxbot/types/File.h"
+#include "maxbot/types/InputMedia.h"
+#include "maxbot/types/GameHighScore.h"
+#include "maxbot/types/SentWebAppMessage.h"
+#include "maxbot/types/LabeledPrice.h"
+#include "maxbot/types/ShippingOption.h"
+#include "maxbot/types/BotCommand.h"
+#include "maxbot/types/ForumTopic.h"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/variant.hpp>
@@ -37,7 +37,7 @@
 #include <utility>
 #include <vector>
 
-namespace TgBot {
+namespace MaxBot {
 
 class Bot;
 
@@ -2244,7 +2244,7 @@ friend class Bot;
     boost::property_tree::ptree sendRequest(const std::string& method, const std::vector<HttpReqArg>& args = std::vector<HttpReqArg>()) const;
 
     const std::string _token;
-    const TgTypeParser _tgTypeParser;
+    const BotTypeParser _botTypeParser;
     const std::string _url;
 };
 }

include/tgbot/Bot.h include/maxbot/Bot.hinclude/tgbot/Bot.h renamed to include/maxbot/Bot.h

@@ -1,14 +1,14 @@
 #ifndef TGBOT_CPP_BOT_H
 #define TGBOT_CPP_BOT_H
 
-#include "tgbot/Api.h"
-#include "tgbot/EventHandler.h"
+#include "maxbot/Api.h"
+#include "maxbot/EventHandler.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
-namespace TgBot {
+namespace MaxBot {
 
 class EventBroadcaster;
 class HttpClient;
@@ -45,7 +45,7 @@ class TGBOT_API Bot {
     }
 
     /**
-     * @return Object which handles new update objects. Usually it's only needed for TgLongPoll, TgWebhookLocalServer and TgWebhookTcpServer objects.
+     * @return Object which handles new update objects. Usually it's only needed for BotLongPoll, BotWebhookLocalServer and BotWebhookTcpServer objects.
      */
     inline const EventHandler& getEventHandler() const {
         return _eventHandler;