rename new_post_fetcher and make it a standalone struct

manager.cpp

@@ -25,6 +25,10 @@ RepostManager::RepostManager(uv_loop_t *eventLoop, tg::AuthCodeProvider tgCodePr
   m_repostTimer = new uv_timer_t;
   uv_timer_init(eventLoop, m_repostTimer);
   m_repostTimer->data = this;
+
+  m_checkTimer = new uv_timer_t;
+  uv_timer_init(eventLoop, m_checkTimer);
+  m_checkTimer->data = this;
 }
 
 RepostManager::~RepostManager() {
@@ -66,23 +70,7 @@ void RepostManager::start() {
   m_tg.start();
 }
 
-void RepostManager::on_clients_ready() {
+void NewPostFetcher::fetch() {
-  m_appState->vkLastLoadedPostId = m_appState->vkLastPostId;
-  m_appState->tgLastLoadedPostId = m_appState->tgLastPostId;
-
-  struct new_post_fetcher {
-    struct fetcher_state {
-      bool ready = false;
-      bool needRequest = true;
-      long offset = 0, count = 3;
-      std::vector<AbstractPost> posts;
-    };
-    RepostManager *mgr;
-    fetcher_state vkState, tgState;
-    new_post_fetcher(RepostManager *m) : mgr(m) {}
-    std::function<void(std::vector<AbstractPost> &&vkPosts, std::vector<AbstractPost> &&tgPosts)> onDone;
-    std::function<void()> onError;
-    void fetch() {
   if (vkState.ready && tgState.ready) {
     onDone(std::move(vkState.posts), std::move(tgState.posts));
     return;
@@ -146,12 +134,12 @@ void RepostManager::on_clients_ready() {
     }
   }
 }
-    void check_vk_posts(std::vector<vk::Post> posts) {
+
+void NewPostFetcher::check_vk_posts(std::vector<vk::Post> posts) {
   spdlog::info("fetched {} VK posts", posts.size());
   long oldLastPostId = mgr->m_appState->vkLastLoadedPostId;
   if (posts.size() > 0) {
     spdlog::info("last vk post id is now {}", posts[0].id);
-        //mgr->m_appState->vkLastLoadedPostId = posts[0].id;
   }
   std::vector<AbstractPost> aposts = mgr->to_abstract_posts(posts);
   spdlog::info("looking for id {}, have {} - {}", oldLastPostId, aposts[0].id, aposts[aposts.size() - 1].id);
@@ -170,12 +158,12 @@ void RepostManager::on_clients_ready() {
   }
   fetch();
 }
-    void check_tg_posts(std::vector<td::tl::unique_ptr<td_api::message>> posts) {
+
+void NewPostFetcher::check_tg_posts(std::vector<td::tl::unique_ptr<td_api::message>> posts) {
   spdlog::info("fetched {} TG posts", posts.size());
   long oldLastPostId = mgr->m_appState->tgLastLoadedPostId;
   if (posts.size() > 0) {
     spdlog::info("last telegram post id is now {}", posts[0]->id_);
-        //mgr->m_appState->tgLastLoadedPostId = posts[0]->id_;
   }
   std::vector<AbstractPost> aposts = mgr->to_abstract_posts(posts);
   if (mgr->drop_posts_older_than(aposts, oldLastPostId)) {
@@ -193,8 +181,12 @@ void RepostManager::on_clients_ready() {
   }
   fetch();
 }
-  };
+
-  new_post_fetcher *f = new new_post_fetcher(this);
+void RepostManager::on_clients_ready() {
+  m_appState->vkLastLoadedPostId = m_appState->vkLastPostId;
+  m_appState->tgLastLoadedPostId = m_appState->tgLastPostId;
+
+  NewPostFetcher *f = new NewPostFetcher(this);
 
   f->onDone = [this, f](auto vkPosts, auto tgPosts){
     delete f;
@@ -364,6 +356,10 @@ void RepostManager::repost_timer_callback(uv_timer_t *h) {
   }
 }
 
+void RepostManager::check_timer_callback(uv_timer_t *h) {
+  auto self = reinterpret_cast<RepostManager*>(h->data);
+}
+
 void RepostManager::repost(AbstractPost &post) {
   spdlog::debug("reposting (post length {})", post.text.length());
   std::string_view signature = posts::add_signature(post, m_appConfig);

manager.h

@@ -14,7 +14,29 @@ namespace manager {
 
   using posts::AbstractPost;
 
+  class RepostManager;
+
+  struct NewPostFetcher {
+    struct fetcher_state {
+      bool ready = false;
+      bool needRequest = true;
+      long offset = 0, count = 3;
+      std::vector<AbstractPost> posts;
+    };
+
+    RepostManager *mgr;
+    fetcher_state vkState, tgState;
+    std::function<void(std::vector<AbstractPost> &&vkPosts, std::vector<AbstractPost> &&tgPosts)> onDone;
+    std::function<void()> onError;
+
+    inline NewPostFetcher(RepostManager *m) : mgr(m) {}
+    void fetch();
+    void check_vk_posts(std::vector<vk::Post> posts);
+    void check_tg_posts(std::vector<td::tl::unique_ptr<td_api::message>> posts);
+  };
+
   class RepostManager {
+    friend struct NewPostFetcher;
   public:
     RepostManager(uv_loop_t *eventLoop, tg::AuthCodeProvider tgCodeProvider, tg::PasswordProvider tgPasswordProvider, state::AppState *appState, config::AppConfig *config);
     RepostManager(RepostManager&) = delete;
@@ -41,6 +63,7 @@ namespace manager {
 
     void enqueue_for_repost(std::vector<AbstractPost> posts);
     static void repost_timer_callback(uv_timer_t *h);
+    static void check_timer_callback(uv_timer_t *h);
     void repost(AbstractPost &post);
 
     state::AppState *m_appState;