From 279dca0286dfb411e7547b2a3763cb8a5cc71f1f Mon Sep 17 00:00:00 2001 From: mrbesen Date: Wed, 20 Jan 2021 23:42:30 +0100 Subject: [PATCH] async getfile --- .../java/de/mrbesen/telegram/TelegramAPI.java | 17 +++++++++++++---- .../de/mrbesen/telegram/objects/TMessage.java | 6 ------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java index b5f8109..6f4cdda 100644 --- a/src/main/java/de/mrbesen/telegram/TelegramAPI.java +++ b/src/main/java/de/mrbesen/telegram/TelegramAPI.java @@ -30,10 +30,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; import java.util.*; -import java.util.function.BiConsumer; -import java.util.function.BinaryOperator; -import java.util.function.Function; -import java.util.function.Supplier; +import java.util.concurrent.Callable; +import java.util.function.*; import java.util.stream.Collector; import static java.util.stream.Collector.Characteristics.IDENTITY_FINISH; @@ -307,6 +305,17 @@ public class TelegramAPI implements Runnable { return new TFile(jfile.getJSONObject("result")); } + public void getFile(final String fileid, Consumer callback) { + async.enque(new Task("getFile", "file_id=" + fileid, 0, new Callback() { + @Override + public Void call(JSONObject j) throws Throwable { + TFile file = new TFile(j.getJSONObject("result")); + callback.accept(file); + return null; + } + })); + } + public void sendTypedMessage(final String msg, final TUser user, final int seconds) { new Thread(new Runnable() { @Override diff --git a/src/main/java/de/mrbesen/telegram/objects/TMessage.java b/src/main/java/de/mrbesen/telegram/objects/TMessage.java index 6927c2e..cc68e11 100644 --- a/src/main/java/de/mrbesen/telegram/objects/TMessage.java +++ b/src/main/java/de/mrbesen/telegram/objects/TMessage.java @@ -29,12 +29,6 @@ public class TMessage extends JSONBased { } else { return TUser.sendMessage(api, chatid != 0 ? chatid : from.getID(), msg, rm, message_id, false, null); } -// try { -// return api.request("sendMessage", "chat_id=" + from.getID() + "&text=" + msg + "&reply_to_message_id=" + message_id ).getBoolean("ok") ; -// } catch (IOException | NullPointerException e) { -// e.printStackTrace(); -// return false; -// } } public boolean reply(String msg) { return reply(msg, null);