Merge branch 'develop'

include/Telegram/Sticker.h

@@ -17,6 +17,7 @@ namespace Telegram {
     Json::Int64 width;
     Json::Int64 height;
     PhotoSize *thumb;
+    std::string emoji;
     Json::Int64 file_size;
   };
 }

src/Sticker.cc

@@ -6,5 +6,6 @@ Telegram::Sticker::Sticker(Json::Value json) {
   this->width = json["width"].asInt64();
   this->height = json["height"].asInt64();
   this->thumb = new PhotoSize(json["thumb"]);
+  this->emoji = json["emoji"].asString();
   this->file_size = json["file_size"].asInt64();
 }

src/TelegramBot.cc

@@ -7,9 +7,9 @@
 #include <curlpp/Infos.hpp>
 #include <curlpp/Options.hpp>
 
-#include "Telegram/http_build_query.h"
+#include "http_build_query.h"
-#include "Telegram/json_encode.h"
+#include "json_encode.h"
-#include "Telegram/std.h"
+#include "std.h"
 
 #include "Telegram/Message.h"
 #include "Telegram/MessageEntity.h"