From 225faa948d3f8663b062ac85accd3744eecd2685 Mon Sep 17 00:00:00 2001 From: MrBesen Date: Tue, 5 May 2020 17:18:48 +0200 Subject: [PATCH] unit tests, insert videos --- .../java/de/mrbesen/telegram/TelegramAPI.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java index f286bca..0b68e8b 100644 --- a/src/main/java/de/mrbesen/telegram/TelegramAPI.java +++ b/src/main/java/de/mrbesen/telegram/TelegramAPI.java @@ -87,15 +87,11 @@ public class TelegramAPI implements Runnable { * @param apikey */ public TelegramAPI(String apikey) { - botname = ""; - if (!apikey.matches(TOKENREGEX) ) { - throw new IllegalArgumentException("Invalid API key: " + apikey); - } - this.apikey = apikey; + this(apikey, ""); } public TelegramAPI(String apikey, String botname) { - this.botname = botname; + this.botname = botname != null ? botname : ""; if (!apikey.matches(TOKENREGEX) ) { throw new IllegalArgumentException("Invalid API key: " + apikey); @@ -505,8 +501,10 @@ public class TelegramAPI implements Runnable { } else { e = new UserSendMessageEvent(getMsg()); //call feedback cmd first - if(feedbackCmd.onMsg((UserSendMessageEvent) e)) { - e = null; + if(!disableFeedback) { + if (feedbackCmd.onMsg((UserSendMessageEvent) e)) { + e = null; + } } } getEventManager().callEvent(e); @@ -520,8 +518,12 @@ public class TelegramAPI implements Runnable { TMessage msg = new TMessage(cbq.getJSONObject("message"), api); UserCallbackEvent event = new UserCallbackEvent(from, data, id, msg); - if(!feedbackCmd.onCallback(event)) + if(!disableFeedback) { + if (!feedbackCmd.onCallback(event)) + getEventManager().callEvent(event); + } else { getEventManager().callEvent(event); + } } }