Merge branch 'master' into nicholascw-master

3 files changed, 41 insertions, 36 deletions

diff --git a/samples/photo/CMakeLists.txt b/samples/photo/CMakeLists.txt
index de6f12f..ae4b2eb 100644
--- a/samples/photo/CMakeLists.txt
+++ b/samples/photo/CMakeLists.txt
@@ -7,8 +7,13 @@ set(Boost_USE_MULTITHREADED ON)
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(Boost COMPONENTS system REQUIRED)
+find_package(CURL)
 include_directories(/usr/local/include ${OPENSSL_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
+if (CURL_FOUND)
+    include_directories(${CURL_INCLUDE_DIRS})
+    add_definitions(-DHAVE_CURL)
+endif()
 
 add_executable(photo src/main.cpp)
 
-target_link_libraries(photo /usr/local/lib/libTgBot.a ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(photo /usr/local/lib/libTgBot.a ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES})
diff --git a/samples/photo/Dockerfile b/samples/photo/Dockerfile
index 2bdbe1f..ea9993a 100644
--- a/samples/photo/Dockerfile
+++ b/samples/photo/Dockerfile
@@ -1,7 +1,7 @@
 FROM reo7sp/tgbot-cpp
 MAINTAINER Oleg Morozenkov <a@reo7sp.ru>
 
-WORKDIR /tmp/photo
+WORKDIR /usr/src/photo
 COPY . .
 RUN cmake .
 RUN make -j4
diff --git a/samples/photo/src/main.cpp b/samples/photo/src/main.cpp
index 1b81f27..03ca437 100644
--- a/samples/photo/src/main.cpp
+++ b/samples/photo/src/main.cpp
@@ -1,9 +1,6 @@
-//
-// Created by Oleg Morozenkov on 25.01.17.
-//
-
-#include <signal.h>
-#include <stdio.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
 #include <exception>
 
 #include <tgbot/tgbot.h>
@@ -14,32 +11,35 @@ using namespace TgBot;
 bool sigintGot = false;
 
 int main() {
-	const string photoFilePath = "example.jpg";
-	const string photoMimeType = "image/jpeg";
-
-	Bot bot("PLACE YOUR TOKEN HERE");
-	bot.getEvents().onCommand("start", [&bot](Message::Ptr message) {
-		bot.getApi().sendMessage(message->chat->id, "Hi!");
-	});
-	bot.getEvents().onCommand("photo", [&bot, &photoFilePath, &photoMimeType](Message::Ptr message) {
-		bot.getApi().sendPhoto(message->chat->id, InputFile::fromFile(photoFilePath, photoMimeType));
-	});
-
-	signal(SIGINT, [](int s) {
-		printf("SIGINT got");
-		sigintGot = true;
-	});
-	try {
-		printf("Bot username: %s\n", bot.getApi().getMe()->username.c_str());
-
-		TgLongPoll longPoll(bot);
-		while (!sigintGot) {
-			printf("Long poll started\n");
-			longPoll.start();
-		}
-	} catch (exception& e) {
-		printf("error: %s\n", e.what());
-	}
-
-	return 0;
+    string token(getenv("TOKEN"));
+    printf("Token: %s\n", token.c_str());
+
+    const string photoFilePath = "example.jpg";
+    const string photoMimeType = "image/jpeg";
+
+    Bot bot(token);
+    bot.getEvents().onCommand("start", [&bot](Message::Ptr message) {
+        bot.getApi().sendMessage(message->chat->id, "Hi!");
+    });
+    bot.getEvents().onCommand("photo", [&bot, &photoFilePath, &photoMimeType](Message::Ptr message) {
+        bot.getApi().sendPhoto(message->chat->id, InputFile::fromFile(photoFilePath, photoMimeType));
+    });
+
+    signal(SIGINT, [](int s) {
+        printf("SIGINT got\n");
+        sigintGot = true;
+    });
+    try {
+        printf("Bot username: %s\n", bot.getApi().getMe()->username.c_str());
+
+        TgLongPoll longPoll(bot);
+        while (!sigintGot) {
+            printf("Long poll started\n");
+            longPoll.start();
+        }
+    } catch (exception& e) {
+        printf("error: %s\n", e.what());
+    }
+
+    return 0;
 }