From f1a1f29608a51442c1e5a4ebddcfc14eb64af243 Mon Sep 17 00:00:00 2001 From: MrBesen Date: Fri, 18 Oct 2019 22:41:00 +0200 Subject: [PATCH 1/2] removed help message in group chat --- src/main/java/de/mrbesen/telegram/commands/CommandManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/mrbesen/telegram/commands/CommandManager.java b/src/main/java/de/mrbesen/telegram/commands/CommandManager.java index f6029b2..570ab7b 100644 --- a/src/main/java/de/mrbesen/telegram/commands/CommandManager.java +++ b/src/main/java/de/mrbesen/telegram/commands/CommandManager.java @@ -47,7 +47,7 @@ public class CommandManager { } } //do smth. with result - if(!result) { + if(!result && json.getChatID() < 0) { TUser.sendMessage(api, json.getChatID(), api.getHelpMessage(), null, 0, true, null); } } From 356485d2cc4b638e40cdf0a55523d6beaa21f612 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Sun, 20 Oct 2019 17:08:25 +0200 Subject: [PATCH 2/2] added awnser callback --- .../java/de/mrbesen/telegram/TelegramAPI.java | 18 +++++++++++++++++- .../event/events/UserCallbackEvent.java | 7 ++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java index 40a2339..72a00b0 100644 --- a/src/main/java/de/mrbesen/telegram/TelegramAPI.java +++ b/src/main/java/de/mrbesen/telegram/TelegramAPI.java @@ -206,6 +206,21 @@ public class TelegramAPI implements Runnable { }).start(); } + public void answerCallbackQuery(String callbackid, String text, boolean async) { + if(callbackid == null) + return; + + if(async) { + requestAsync("answerCallbackQuery", "callback_query_id=" + callbackid + "&text=" + text); + } else { + try { + request("answerCallbackQuery", "callback_query_id=" + callbackid + "&text=" + text); + } catch(IOException e) { + e.printStackTrace(); + } + } + } + /** * creates internal APIEror, when message is not modyfied! * @param newCaption @@ -478,8 +493,9 @@ public class TelegramAPI implements Runnable { JSONObject cbq = json.getJSONObject("callback_query"); TUser from = api.getUser(cbq.getJSONObject("from")); String data = cbq.getString("data"); + String id = cbq.getString("id"); TMessage msg = new TMessage(cbq.getJSONObject("message"), api); - getEventManager().callEvent(new UserCallbackEvent(from, data, msg)); + getEventManager().callEvent(new UserCallbackEvent(from, data, id, msg)); } } diff --git a/src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java b/src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java index a6decae..d643bb1 100644 --- a/src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java +++ b/src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java @@ -10,11 +10,13 @@ public class UserCallbackEvent extends Event { private final String data; private final TMessage msg; + private final String id; - public UserCallbackEvent(TUser u, String data, TMessage msg) { + public UserCallbackEvent(TUser u, String data, String id, TMessage msg) { super(u); this.data = data; this.msg = msg; + this.id = id; } public TMessage getMsg() { @@ -29,4 +31,7 @@ public class UserCallbackEvent extends Event { return new JSONObject(data); } + public final String getID() { + return id; + } }