Browse Source

finished implementation. Works!

logicp 4 years ago
parent
commit
5b38b33dd2
2 changed files with 16 additions and 18 deletions
  1. 0 3
      include/task/instagram_task.hpp
  2. 16 15
      src/client.cpp

+ 0 - 3
include/task/instagram_task.hpp

@@ -17,8 +17,6 @@ const QString REQUESTED_BY_TYPE = "requested by";
 class InstagramTask : public Scheduler::Task {
  public:
   InstagramTask();
-  InstagramTask(Scheduler::KFileData);
-  InstagramTask(QVector<Scheduler::KFileData>);
   virtual void defineTaskArguments() override;
   virtual const Scheduler::TaskArguments getTaskArguments() override;
   virtual const Scheduler::TypeVariant getTaskArgument(QString name) override;
@@ -36,7 +34,6 @@ class InstagramTask : public Scheduler::Task {
 
  private:
   Scheduler::TaskArguments m_arguments;
-  QVector<Scheduler::KFileData> files;
 };
 
 #endif  // __INSTAGRAM_TASK_HPP

+ 16 - 15
src/client.cpp

@@ -243,31 +243,32 @@ std::string getTaskFileInfo(std::vector<SentFile> files) {
  */
 void Client::sendTaskEncoded(Scheduler::Task* task) {
   if (task->getType() == Scheduler::TaskType::INSTAGRAM) {
-    const auto hashtags = KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("hashtags"))};
     flatbuffers::Offset<IGTask> ig_task =
         CreateIGTask(
             builder,
-            96,
-            builder.CreateString(getTaskFileInfo(sent_files)),
-            builder.CreateString(std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("datetime")).toUtf8().constData()}),
+/*ID*/          96,
             builder.CreateString(
-                std::string{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("description")).toUtf8().constData()}),
-            builder.CreateString(hashtags
-               ),
+/*0*/           getTaskFileInfo(sent_files)),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_phrase"))}),
+/*1*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("datetime"))}),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_phrase"))}),
+/*2*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("description"))}),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("promote_share"))}),
+/*3*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("hashtags_string"))}),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("link_in_bio"))}),
-            std::get<Scheduler::VariantIndex::BOOLEAN>(task->getTaskArgument("is_video")),
-            std::get<Scheduler::VariantIndex::INTEGER>(task->getTaskArgument("mask")),
+/*4*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_string"))}),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("header"))}),
+/*5*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("requested_by_phrase"))}),
             builder.CreateString(
-                KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("user"))}));
+/*6*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("promote_share"))}),
+            builder.CreateString(
+/*7*/           KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("link_in_bio"))}),
+/*8*/                   std::get<Scheduler::VariantIndex::BOOLEAN>(task->getTaskArgument("is_video")),
+/*9*/                   std::get<Scheduler::VariantIndex::INTEGER>(task->getTaskArgument("mask")),
+            builder.CreateString(
+/*10*/          KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("header"))}),
+            builder.CreateString(
+/*11*/          KString{std::get<Scheduler::VariantIndex::QSTRING>(task->getTaskArgument("user"))}));
     builder.Finish(ig_task);
 
     uint8_t* encoded_message_buffer = builder.GetBufferPointer();