Use dependency ejection to remove json include from API

reo7sp · Oct 15, 2024 · fe6ebca · fe6ebca
1 parent 787774c
commit fe6ebca
Show file tree

Hide file tree

Showing 7 changed files with 2,578 additions and 368 deletions.
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
diff --git a/include/tgbot/ApiImpl.h b/include/tgbot/ApiImpl.h
diff --git a/include/tgbot/Bot.h b/include/tgbot/Bot.h
@@ -34,7 +34,7 @@ class TGBOT_API Bot {
      * @return Object which can execute Telegram Bot API methods.
      */
     inline const Api& getApi() const {
-        return _api;
+        return *_api;
     }
 
     /**
@@ -55,7 +55,7 @@ class TGBOT_API Bot {
     static HttpClient &_getDefaultHttpClient();
 
     const std::string _token;
-    const Api _api;
+    const std::shared_ptr<Api> _api;
     std::unique_ptr<EventBroadcaster> _eventBroadcaster;
     const EventHandler _eventHandler;
 };

diff --git a/include/tgbot/net/TgLongPoll.h b/include/tgbot/net/TgLongPoll.h
@@ -1,7 +1,7 @@
 #ifndef TGBOT_TGLONGPOLL_H
 #define TGBOT_TGLONGPOLL_H
 
-#include "tgbot/Api.h"
+#include "tgbot/ApiImpl.h"
 #include "tgbot/export.h"
 
 #include <cstdint>
@@ -22,7 +22,7 @@ class EventHandler;
 class TGBOT_API TgLongPoll {
 
 public:
-    TgLongPoll(const Api* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates);
+    TgLongPoll(const ApiImpl* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates);
     TgLongPoll(const Bot& bot, std::int32_t limit = 100, std::int32_t timeout = 10, const std::shared_ptr<std::vector<std::string>>& allowUpdates = nullptr);
 
     /**
@@ -31,7 +31,7 @@ class TGBOT_API TgLongPoll {
     void start();
 
 private:
-    const Api* _api;
+    const ApiImpl* _api;
     const EventHandler* _eventHandler;
     std::int32_t _lastUpdateId = 0;
     std::int32_t _limit;