From d30750a5ffd0541aa14fe9113e969704b512e455 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Thu, 7 Feb 2019 02:50:53 +0100 Subject: [PATCH] get TMessage on sendImage, sendAnimation --- src/de/mrbesen/telegram/objects/TMessage.java | 13 +++++++++++++ src/de/mrbesen/telegram/objects/TUser.java | 18 ++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/de/mrbesen/telegram/objects/TMessage.java b/src/de/mrbesen/telegram/objects/TMessage.java index e1e9369..f6fc146 100644 --- a/src/de/mrbesen/telegram/objects/TMessage.java +++ b/src/de/mrbesen/telegram/objects/TMessage.java @@ -85,4 +85,17 @@ public class TMessage extends JSONBased { public TUser getForward_from() { return forward_from; } + + + public int getMessageID() { + return message_id; + } + + public static void delete(TelegramAPI api, int chatid, int msgid) { + try { + api.request("deleteMessage", "chat_id=" + chatid + "&message_id=" + msgid); + } catch (IOException e) { + e.printStackTrace(); + } + } } diff --git a/src/de/mrbesen/telegram/objects/TUser.java b/src/de/mrbesen/telegram/objects/TUser.java index 3136b79..e3cb85e 100644 --- a/src/de/mrbesen/telegram/objects/TUser.java +++ b/src/de/mrbesen/telegram/objects/TUser.java @@ -123,41 +123,39 @@ public class TUser { } public boolean sendImage(String caption, String url) { - return sendImage(api, id, caption, url, null); + return sendImage(api, id, caption, url, null) != null; } - public static boolean sendImage(TelegramAPI api, int userid, String caption, String url, TReplyMarkup rply) { + public static TMessage sendImage(TelegramAPI api, int userid, String caption, String url, TReplyMarkup rply) { try { String cap = ""; if(caption != null) { if(!caption.isEmpty()) cap = "&caption=" + caption; } - api.request("sendPhoto", "chat_id=" + userid + parseRPMU(rply) + cap + "&photo=" + url); + return new TMessage(api.request("sendPhoto", "chat_id=" + userid + parseRPMU(rply) + cap + "&photo=" + url).getJSONObject("result"), api); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; + return null; } public boolean sendAnimation(String caption, String url) { - return sendAnimation(api, id, caption, url, null); + return sendAnimation(api, id, caption, url, null) != null; } - public static boolean sendAnimation(TelegramAPI api, int userid, String caption, String url, TReplyMarkup rply) { + public static TMessage sendAnimation(TelegramAPI api, int userid, String caption, String url, TReplyMarkup rply) { try { String cap = ""; if(caption != null) { if(!caption.isEmpty()) cap = "&caption=" + caption; } - api.request("sendAnimation", "chat_id=" + userid + parseRPMU(rply) + cap + "&animation=" + url); + return new TMessage(api.request("sendAnimation", "chat_id=" + userid + parseRPMU(rply) + cap + "&animation=" + url).getJSONObject("result"), api); } catch (IOException e) { e.printStackTrace(); - return false; } - return true; + return null; } @Override