Fix outdated API from preventing all other updates and messages (#51)

mkotb · web-flow · commit 72988dcdc7e8 · 2020-03-03T20:49:27.000-08:00
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/TelegramBotRegistry.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/TelegramBotRegistry.java
@@ -8,20 +8,20 @@
 import com.jtelegram.api.chat.ChatMemberStatus;
 import com.jtelegram.api.chat.ChatType;
 import com.jtelegram.api.chat.id.ChatId;
+import com.jtelegram.api.ex.TelegramException;
 import com.jtelegram.api.inline.keyboard.InlineKeyboardRow;
 import com.jtelegram.api.inline.result.framework.InlineResultType;
-import com.jtelegram.api.message.entity.MessageEntity;
-import com.jtelegram.api.update.Update;
-import com.jtelegram.api.update.UpdateProvider;
-import com.jtelegram.api.update.UpdateType;
-import com.jtelegram.api.util.LowercaseEnumAdapter;
 import com.jtelegram.api.message.Message;
-import com.jtelegram.api.ex.TelegramException;
+import com.jtelegram.api.message.entity.MessageEntity;
 import com.jtelegram.api.message.input.file.InputFile;
 import com.jtelegram.api.message.input.media.InputMediaType;
 import com.jtelegram.api.message.keyboard.ReplyKeyboardRow;
 import com.jtelegram.api.message.sticker.MaskPoint;
 import com.jtelegram.api.requests.GetMe;
+import com.jtelegram.api.update.Update;
+import com.jtelegram.api.update.UpdateProvider;
+import com.jtelegram.api.update.UpdateType;
+import com.jtelegram.api.util.LowercaseEnumAdapter;
 import lombok.Builder;
 import lombok.Getter;
 import okhttp3.OkHttpClient;
@@ -30,6 +30,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 @Getter
 public class TelegramBotRegistry {
@@ -52,6 +53,7 @@ public class TelegramBotRegistry {
             .registerTypeHierarchyAdapter(InputFile.class, new InputFile.Serializer())
             .registerTypeHierarchyAdapter(ChatId.class, new ChatId.Serializer())
             .create();
+    private static Consumer<TelegramException> minorGsonErrorHandler = (a) -> {};
     private final UpdateProvider updateProvider;
     private String apiUrl = "https://api.telegram.org/bot";
     private String fileApiUrl = "https://api.telegram.org/file/bot";
@@ -79,6 +81,14 @@ private TelegramBotRegistry(UpdateProvider updateProvider, String apiUrl, OkHttp
         }
     }
 
+    public static void setMinorGsonErrorHandler(Consumer<TelegramException> minorGsonErrorHandler) {
+        TelegramBotRegistry.minorGsonErrorHandler = minorGsonErrorHandler;
+    }
+
+    public static Consumer<TelegramException> getMinorGsonErrorHandler() {
+        return minorGsonErrorHandler;
+    }
+
     public void setHttpClient(OkHttpClient client) {
         this.client = client;
         bots.forEach((bot) -> bot.getRequestQueue().setClient(client));
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/Message.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/Message.java
@@ -1,6 +1,7 @@
 package com.jtelegram.api.message;
 
 import com.google.gson.*;
+import com.jtelegram.api.TelegramBotRegistry;
 import com.jtelegram.api.chat.Chat;
 import com.jtelegram.api.ex.InvalidResponseException;
 import com.jtelegram.api.requests.message.DeleteMessage;
@@ -81,10 +82,13 @@ public Message deserialize(JsonElement jsonElement, Type type, JsonDeserializati
                 }
             }
 
-            throw new InvalidResponseException (
-                    "Unfamiliar Message object, update the bot API?",
-                    object.toString()
+            TelegramBotRegistry.getMinorGsonErrorHandler().accept (
+                    new InvalidResponseException (
+                            "Unfamiliar Message object, update the bot API?",
+                            object.toString()
+                    )
             );
+            return null;
         }
     }
 }
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/entity/MessageEntity.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/entity/MessageEntity.java
@@ -1,6 +1,7 @@
 package com.jtelegram.api.message.entity;
 
 import com.google.gson.*;
+import com.jtelegram.api.TelegramBotRegistry;
 import com.jtelegram.api.ex.InvalidResponseException;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -37,10 +38,14 @@ public MessageEntity deserialize(JsonElement json, Type typeOfT, JsonDeserializa
             MessageEntityType type = context.deserialize(object.get("type"), MessageEntityType.class);
 
             if (type == null) {
-                throw new InvalidResponseException (
-                        "Invalid Message Entity Type. Update the API?",
-                        object.toString()
+                TelegramBotRegistry.getMinorGsonErrorHandler().accept (
+                        new InvalidResponseException (
+                                "Invalid Message Entity Type. Update the API?",
+                                object.toString()
+                        )
                 );
+
+                return null;
             }
 
             return context.deserialize(object, type.getImplementationClass());
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/requests/framework/AbstractTelegramRequest.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/requests/framework/AbstractTelegramRequest.java
@@ -25,6 +25,7 @@ public abstract class AbstractTelegramRequest implements TelegramRequest {
     protected void handleError(TelegramException ex) {
         if (errorHandler == null) {
             System.out.println("Uncaught exception for " + getClass().getSimpleName() + "...");
+            ex.printStackTrace();
             return;
         }
 
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/PollingUpdateRunnable.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/PollingUpdateRunnable.java
@@ -1,12 +1,15 @@
 package com.jtelegram.api.update;
 
 import com.jtelegram.api.TelegramBot;
+import com.jtelegram.api.ex.NetworkException;
 import com.jtelegram.api.requests.GetUpdates;
 import com.jtelegram.api.requests.framework.TelegramRequest;
 import lombok.RequiredArgsConstructor;
 import okhttp3.Response;
 
 import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 @RequiredArgsConstructor
@@ -23,7 +26,16 @@ public void run() {
                     .offset(offset)
                     .timeout(owner.getTimeout())
                     .callback(this::handleUpdates)
-                    .errorHandler(owner.getUpdateErrorHandler())
+                    .errorHandler((error) -> {
+                        if (error instanceof NetworkException) {
+                            // this exception is expected for polling
+                            if (((NetworkException) error).getUnderlyingException() instanceof SocketTimeoutException) {
+                                return;
+                            }
+                        }
+
+                        owner.getUpdateErrorHandler().accept(error);
+                    })
                     .build();
 
             try {
@@ -44,10 +56,12 @@ public void run() {
 
     public void handleUpdates(Update[] updates) {
         for (Update update : updates) {
-            handleUpdate(bot, UpdateType.from(update.getClass()), update);
+            if (update != null) {
+                handleUpdate(bot, UpdateType.from(update.getClass()), update);
+            }
         }
 
-        offset = Stream.of(updates).mapToInt(Update::getUpdateId).max().orElse(offset - 1) + 1;
+        offset = Stream.of(updates).filter(Objects::nonNull).mapToInt(Update::getUpdateId).max().orElse(offset - 1) + 1;
     }
 
     public static <T extends Update> void handleUpdate(TelegramBot bot, UpdateType<T> type, Update update) {
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/Update.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/Update.java
@@ -1,6 +1,7 @@
 package com.jtelegram.api.update;
 
 import com.google.gson.*;
+import com.jtelegram.api.TelegramBotRegistry;
 import com.jtelegram.api.ex.InvalidResponseException;
 import com.jtelegram.api.inline.CallbackQuery;
 import com.jtelegram.api.inline.InlineQuery;
@@ -98,10 +99,13 @@ public Update deserialize(JsonElement jsonElement, Type type, JsonDeserializatio
                 }
             }
 
-            throw new InvalidResponseException (
-                    "Unfamiliar update object, update the bot API?",
-                    object.toString()
+            TelegramBotRegistry.getMinorGsonErrorHandler().accept (
+                    new InvalidResponseException (
+                            "Unfamiliar update object, update the bot API?",
+                            object.toString()
+                    )
             );
+            return null;
         }
     }
 }
diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/UpdateType.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/update/UpdateType.java
@@ -3,33 +3,33 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.jtelegram.api.events.Event;
-import com.jtelegram.api.events.location.LocationUpdateEvent;
-import com.jtelegram.api.events.payment.ShippingQueryEvent;
-import com.jtelegram.api.message.CaptionableMessage;
-import com.jtelegram.api.message.Message;
-import com.jtelegram.api.message.impl.LocationMessage;
 import com.jtelegram.api.TelegramBot;
+import com.jtelegram.api.events.Event;
 import com.jtelegram.api.events.channel.ChannelPostEditEvent;
 import com.jtelegram.api.events.channel.ChannelPostEvent;
 import com.jtelegram.api.events.inline.ChosenInlineResultEvent;
 import com.jtelegram.api.events.inline.InlineQueryEvent;
 import com.jtelegram.api.events.inline.keyboard.CallbackQueryEvent;
+import com.jtelegram.api.events.location.LocationUpdateEvent;
 import com.jtelegram.api.events.message.MessageEvent;
 import com.jtelegram.api.events.message.edit.CaptionEditEvent;
 import com.jtelegram.api.events.message.edit.TextMessageEditEvent;
 import com.jtelegram.api.events.payment.PreCheckoutQueryEvent;
+import com.jtelegram.api.events.payment.ShippingQueryEvent;
+import com.jtelegram.api.message.CaptionableMessage;
+import com.jtelegram.api.message.Message;
 import com.jtelegram.api.message.MessageType;
+import com.jtelegram.api.message.impl.LocationMessage;
 import com.jtelegram.api.message.impl.TextMessage;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.ToString;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.function.BiFunction;
-import lombok.ToString;
 
 @Getter
 @ToString
@@ -38,13 +38,25 @@ public class UpdateType<T extends Update> {
     public static final UpdateType<Update.ChannelPostUpdate> CHANNEL_POST = new UpdateType<>(
             "CHANNEL_POST",
             Update.ChannelPostUpdate.class,
-            (bot, update) -> new ChannelPostEvent(bot, update.getChannelPost())
+            (bot, update) -> {
+                if (update.getChannelPost() == null) {
+                    return null;
+                }
+
+                return new ChannelPostEvent(bot, update.getChannelPost());
+            }
     );
 
     public static final UpdateType<Update.EditedChannelPostUpdate> EDITED_CHANNEL_POST = new UpdateType<>(
             "EDITED_CHANNEL_POST",
             Update.EditedChannelPostUpdate.class,
-            (bot, update) -> new ChannelPostEditEvent(bot, update.getEditedChannelPost())
+            (bot, update) -> {
+                if (update.getEditedChannelPost() == null) {
+                    return null;
+                }
+
+                return new ChannelPostEditEvent(bot, update.getEditedChannelPost());
+            }
     );
 
     public static final UpdateType<Update.InlineQueryUpdate> INLINE_QUERY = new UpdateType<>(
@@ -81,6 +93,10 @@ public class UpdateType<T extends Update> {
             "MESSAGE",
             Update.MessageUpdate.class,
             (bot, update) -> {
+                if (update.getMessage() == null) {
+                    return null;
+                }
+
                 MessageType type = MessageType.typeFrom(update.getMessage());
                 Class<? extends MessageEvent> eventClass = type.getReceiveEventClass();
                 Constructor<? extends MessageEvent> constructor;
@@ -112,6 +128,10 @@ public class UpdateType<T extends Update> {
             (bot, update) -> {
                 Message updatedMessage = update.getEditedMessage();
 
+                if (updatedMessage == null) {
+                    return null;
+                }
+
                 if (updatedMessage instanceof TextMessage) {
                     return new TextMessageEditEvent(bot, (TextMessage) updatedMessage);
                 } else if (updatedMessage instanceof LocationMessage) {
diff --git a/jtelegrambotapi-webhooks/src/main/java/com/jtelegram/api/webhooks/WebhookUpdateProvider.java b/jtelegrambotapi-webhooks/src/main/java/com/jtelegram/api/webhooks/WebhookUpdateProvider.java
@@ -78,7 +78,10 @@ public WebhookUpdateProvider(HttpServerOptions serverOptions, File selfSignedCer
                 request.bodyHandler((buffer) -> {
                     try {
                         Update update = TelegramBotRegistry.GSON.fromJson(buffer.toString(), Update.class);
-                        PollingUpdateRunnable.handleUpdate(bot, UpdateType.from(update.getClass()), update);
+
+                        if (update != null) {
+                            PollingUpdateRunnable.handleUpdate(bot, UpdateType.from(update.getClass()), update);
+                        }
                     } catch (TelegramException ex) {
                         this.errorHandler.accept(ex);
                     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.jtelegram.api.message;`
`2`	`2`
`3`	`3`	`import com.google.gson.*;`
	`4`	`+import com.jtelegram.api.TelegramBotRegistry;`
`4`	`5`	`import com.jtelegram.api.chat.Chat;`
`5`	`6`	`import com.jtelegram.api.ex.InvalidResponseException;`
`6`	`7`	`import com.jtelegram.api.requests.message.DeleteMessage;`
`@@ -81,10 +82,13 @@ public Message deserialize(JsonElement jsonElement, Type type, JsonDeserializati`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`
`84`		`- throw new InvalidResponseException (`
`85`		`- "Unfamiliar Message object, update the bot API?",`
`86`		`- object.toString()`
	`85`	`+ TelegramBotRegistry.getMinorGsonErrorHandler().accept (`
	`86`	`+ new InvalidResponseException (`
	`87`	`+ "Unfamiliar Message object, update the bot API?",`
	`88`	`+ object.toString()`
	`89`	`+ )`
`87`	`90`	`);`
	`91`	`+ return null;`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public abstract class AbstractTelegramRequest implements TelegramRequest {`
`25`	`25`	`protected void handleError(TelegramException ex) {`
`26`	`26`	`if (errorHandler == null) {`
`27`	`27`	`System.out.println("Uncaught exception for " + getClass().getSimpleName() + "...");`
	`28`	`+ ex.printStackTrace();`
`28`	`29`	`return;`
`29`	`30`	`}`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.jtelegram.api.update;`
`2`	`2`
`3`	`3`	`import com.google.gson.*;`
	`4`	`+import com.jtelegram.api.TelegramBotRegistry;`
`4`	`5`	`import com.jtelegram.api.ex.InvalidResponseException;`
`5`	`6`	`import com.jtelegram.api.inline.CallbackQuery;`
`6`	`7`	`import com.jtelegram.api.inline.InlineQuery;`
`@@ -98,10 +99,13 @@ public Update deserialize(JsonElement jsonElement, Type type, JsonDeserializatio`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`
`101`		`- throw new InvalidResponseException (`
`102`		`- "Unfamiliar update object, update the bot API?",`
`103`		`- object.toString()`
	`102`	`+ TelegramBotRegistry.getMinorGsonErrorHandler().accept (`
	`103`	`+ new InvalidResponseException (`
	`104`	`+ "Unfamiliar update object, update the bot API?",`
	`105`	`+ object.toString()`
	`106`	`+ )`
`104`	`107`	`);`
	`108`	`+ return null;`
`105`	`109`	`}`
`106`	`110`	`}`
`107`	`111`	`}`