diff --git a/src/main/java/de/mrbesen/telegram/AsyncHandler.java b/src/main/java/de/mrbesen/telegram/AsyncHandler.java index d15ed43..6ae5fed 100644 --- a/src/main/java/de/mrbesen/telegram/AsyncHandler.java +++ b/src/main/java/de/mrbesen/telegram/AsyncHandler.java @@ -79,6 +79,7 @@ public class AsyncHandler implements Runnable { } catch(Throwable t) { if(current.exceptionhandl == null) throw t; + System.out.println(String.format("Exception {} handled by {}", t.getClass().getSimpleName(), current.exceptionhandl.getClass().getSimpleName())); current.exceptionhandl.call(t); } } catch(Throwable t) { diff --git a/src/main/java/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java index 5df95fc..3f34688 100644 --- a/src/main/java/de/mrbesen/telegram/TelegramAPI.java +++ b/src/main/java/de/mrbesen/telegram/TelegramAPI.java @@ -156,7 +156,7 @@ public class TelegramAPI implements Runnable { if (response == 200) { return new JSONObject(readfromIS(con.getInputStream())); } else { - System.out.println("request " + request + " " + parameter); + log.log("Request failed - detailed request: " + request + "?" + parameter); String errdesc = "[No description available]"; try { //try to read error message diff --git a/src/main/java/de/mrbesen/telegram/commands/FeedbackCommand.java b/src/main/java/de/mrbesen/telegram/commands/FeedbackCommand.java index 3c84915..c985fb5 100644 --- a/src/main/java/de/mrbesen/telegram/commands/FeedbackCommand.java +++ b/src/main/java/de/mrbesen/telegram/commands/FeedbackCommand.java @@ -57,7 +57,6 @@ public class FeedbackCommand implements JSONCommandHandler { public boolean onMsg(UserSendMessageEvent e) { TUser user = e.getUser(); TMessage msg = e.getMessage(); - System.out.println("msg: " + msg.getText()); if (awaitingFeedback.containsKey(user.getID())) { removeMsg(user.getID(), e.getMessage()); if(isFeedback(msg.getText())) { @@ -74,7 +73,7 @@ public class FeedbackCommand implements JSONCommandHandler { Long[] rplymsg = awnser.remove(user.getID()); if(rplymsg != null) { if(admins.contains(user.getID())) { - System.out.println("is admin!"); + System.out.println("admin awnsered feedback!"); //admin to user -> copy text send as new msg from bot to disguise admin TInlineKeyboardMarkup mu = new TInlineKeyboardMarkup(1); mu.addCallbackButton("↩ reply", buildRplyCallback(user.getID(), msg.getMessageID()), 1); @@ -85,7 +84,7 @@ public class FeedbackCommand implements JSONCommandHandler { awnser.put(rplymsg[0], new Long[]{user.getID(), Long.valueOf(msg.getMessageID())}); } else { - System.out.println("is user!"); + System.out.println("user awnsered feedback!"); //user to admin -> fwd message TMessage.forwardAsync(api, rplymsg[0], msg);