From 397a3a87c6945cbd044644d8a3f6f1d57619dac8 Mon Sep 17 00:00:00 2001
From: Kowalski Prime <kowalski.7cc@xspacesoft.com>
Date: Sun, 3 Mar 2019 22:24:29 +0100
Subject: [PATCH] Fix advertisement contact id, closes #8

---
 pom.xml                                         |  2 +-
 .../io/github/unixmib/mercatino/BotLogic.java   |  5 +++--
 .../java/io/github/unixmib/mercatino/Main.java  | 17 ++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 899af84..7c2819b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
         <dependency>
             <groupId>com.xspacesoft.kowalski7cc</groupId>
             <artifactId>BotRevolution</artifactId>
-            <version>5.0a-Snapshot</version>
+            <version>5.0b-Snapshot</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/src/main/java/io/github/unixmib/mercatino/BotLogic.java b/src/main/java/io/github/unixmib/mercatino/BotLogic.java
index b4fd85a..731689e 100644
--- a/src/main/java/io/github/unixmib/mercatino/BotLogic.java
+++ b/src/main/java/io/github/unixmib/mercatino/BotLogic.java
@@ -64,8 +64,9 @@ public static StatesManager<Message> load(StatesManager<Message> statesManager,
         });
 
         statesManager.newState("new_advertisement", message -> {
-            message.getFrom()
-                    .ifPresent(user -> statesManager.store.put("advertisement", new Advertisement(user)));
+            message.getChat().getPrivateChat()
+                    .ifPresent(privateChat -> statesManager.store
+                            .put("advertisement", new Advertisement(privateChat.toUser())));
             telegramBot.sendMessage()
                     .setChatID(message.getChat())
                     .setText("Inviami il titolo della tua inserzione")
diff --git a/src/main/java/io/github/unixmib/mercatino/Main.java b/src/main/java/io/github/unixmib/mercatino/Main.java
index 5ca5581..e01ba61 100644
--- a/src/main/java/io/github/unixmib/mercatino/Main.java
+++ b/src/main/java/io/github/unixmib/mercatino/Main.java
@@ -22,6 +22,7 @@
 import com.kowalski7cc.botrevolution.types.Update;
 import com.kowalski7cc.botrevolution.types.chat.Chat;
 import com.kowalski7cc.botrevolution.types.repymarkups.inlinekeyboard.InlineKeyboardBuilder;
+import com.kowalski7cc.botrevolution.utils.decoder.TelegramException;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -135,11 +136,17 @@ private static void apply(Update update, TelegramBot tg) {
                                         .setChatID(message.getChat())
                                         .setMessageID(message)
                                         .send());
-                                tg.answerCallbackQuery()
-                                        .setCallbackQueryID(callbackQuery)
-                                        .setText("Annuncio pubblicato")
-                                        .setCacheTime(1)
-                                        .send();
+                                try {
+                                    tg.answerCallbackQuery()
+                                            .setCallbackQueryID(callbackQuery)
+                                            .setText("Annuncio pubblicato")
+                                            .setCacheTime(1)
+                                            .send();
+                                } catch (TelegramException e) {
+                                    // Query timed out
+                                    System.out.println("QueryManager: " + e.toString() + ", Query ID: " +
+                                            callbackQuery.getId());
+                                }
                                 return null;
                             });
                             break;