Merge branch 'master' into api_5.4

Author: mircoianese

README.md

@@ -1,10 +1,10 @@
 # Java Telegram Bot API
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.pengrad/java-telegram-bot-api.svg)](https://search.maven.org/artifact/com.github.pengrad/java-telegram-bot-api)
-[![Build Status](https://travis-ci.org/pengrad/java-telegram-bot-api.svg?branch=master)](https://travis-ci.org/pengrad/java-telegram-bot-api)
+[![Build Status](https://travis-ci.com/pengrad/java-telegram-bot-api.svg?branch=master)](https://app.travis-ci.com/github/pengrad/java-telegram-bot-api)
 [![codecov](https://codecov.io/gh/pengrad/java-telegram-bot-api/branch/master/graph/badge.svg)](https://codecov.io/gh/pengrad/java-telegram-bot-api)
 
 Java library for interacting with [Telegram Bot API](https://core.telegram.org/bots/api)
-- Full support of all Bot API 5.1 methods
+- Full support of all Bot API 5.3 methods
 - Telegram [Passport](https://core.telegram.org/passport) and Decryption API
 - Bot [Payments](https://core.telegram.org/bots/payments)
 - [Gaming Platform](https://telegram.org/blog/games)
@@ -13,14 +13,14 @@ Java library for interacting with [Telegram Bot API](https://core.telegram.org/b
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:5.1.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:5.3.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>5.1.0</version>
+  <version>5.3.0</version>
 </dependency>
 ```
 [JAR with all dependencies on release page](https://github.com/pengrad/java-telegram-bot-api/releases)

README_RU.md

@@ -1,10 +1,10 @@
 # Java Telegram Bot Api
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.pengrad/java-telegram-bot-api.svg)](https://search.maven.org/artifact/com.github.pengrad/java-telegram-bot-api)
-[![Build Status](https://travis-ci.org/pengrad/java-telegram-bot-api.svg?branch=master)](https://travis-ci.org/pengrad/java-telegram-bot-api)
+[![Build Status](https://travis-ci.com/pengrad/java-telegram-bot-api.svg?branch=master)](https://app.travis-ci.com/github/pengrad/java-telegram-bot-api)
 [![codecov](https://codecov.io/gh/pengrad/java-telegram-bot-api/branch/master/graph/badge.svg)](https://codecov.io/gh/pengrad/java-telegram-bot-api)
 
 Java библиотека, созданная для работы с [Telegram Bot API](https://core.telegram.org/bots/api)
-- Полная поддержка всех методов BOT API 5.1
+- Полная поддержка всех методов BOT API 5.3
 - Поддержка Telegram [паспорта](https://core.telegram.org/passport) и дешифровки (Decryption API);
 - Поддержка [платежей](https://core.telegram.org/bots/payments);
 - [Игровая платформа](https://telegram.org/blog/games).
@@ -13,14 +13,14 @@ Java библиотека, созданная для работы с [Telegram B
 
 Gradle:
 ```groovy
-implementation 'com.github.pengrad:java-telegram-bot-api:5.1.0'
+implementation 'com.github.pengrad:java-telegram-bot-api:5.3.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>5.1.0</version>
+  <version>5.3.0</version>
 </dependency>
 ```
 Также JAR со всеми зависимостями можно найти [в релизах](https://github.com/pengrad/java-telegram-bot-api/releases).

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.github.pengrad
-VERSION_NAME=5.1.0
+VERSION_NAME=5.3.0
 
 POM_DESCRIPTION=Java API for Telegram Bot API
 POM_URL=https://github.com/pengrad/java-telegram-bot-api/

library/src/main/java/com/pengrad/telegrambot/TelegramBot.java

@@ -24,6 +24,7 @@
  */
 public class TelegramBot {
 
+    private final String token;
     private final TelegramBotClient api;
     private final FileApi fileApi;
     private final UpdatesHandler updatesHandler;
@@ -33,6 +34,7 @@ public TelegramBot(String botToken) {
     }
 
     TelegramBot(Builder builder) {
+        this.token = builder.botToken;
         this.api = builder.api;
         this.fileApi = builder.fileApi;
         this.updatesHandler = builder.updatesHandler;
@@ -46,6 +48,10 @@ public <T extends BaseRequest<T, R>, R extends BaseResponse> void execute(T requ
         api.send(request, callback);
     }
 
+    public String getToken() {
+        return token;
+    }
+
     public String getFullFilePath(File file) {
         return fileApi.getFullFilePath(file.filePath());
     }
@@ -78,6 +84,10 @@ public void removeGetUpdatesListener() {
         updatesHandler.stop();
     }
 
+    public void shutdown() {
+        api.shutdown();
+    }
+
     public static final class Builder {
 
         static final String API_URL = "https://api.telegram.org/bot";

library/src/main/java/com/pengrad/telegrambot/impl/TelegramBotClient.java

@@ -75,6 +75,10 @@ public <T extends BaseRequest<T, R>, R extends BaseResponse> R send(final BaseRe
         }
     }
 
+    public void shutdown() {
+        client.dispatcher().executorService().shutdown();
+    }
+
     private OkHttpClient getOkHttpClient(BaseRequest<?, ?> request) {
         int timeoutMillis = request.getTimeoutSeconds() * 1000;
 

library/src/main/java/com/pengrad/telegrambot/impl/UpdatesHandler.java

@@ -6,6 +6,7 @@
 import com.pengrad.telegrambot.response.GetUpdatesResponse;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -68,6 +69,7 @@ public void onResponse(GetUpdates request, GetUpdatesResponse response) {
                 }
 
                 List<Update> updates = response.updates();
+                if (updates == null) updates = Collections.emptyList();
                 int lastConfirmedUpdate = listener.process(updates);
 
                 if (lastConfirmedUpdate != CONFIRMED_UPDATES_NONE) {

library/src/main/java/com/pengrad/telegrambot/model/DeleteMyCommands.java

@@ -0,0 +1,32 @@
+package com.pengrad.telegrambot.model;
+
+import com.pengrad.telegrambot.model.botcommandscope.BotCommandScope;
+import com.pengrad.telegrambot.request.BaseRequest;
+import com.pengrad.telegrambot.response.BaseResponse;
+
+public class DeleteMyCommands extends BaseRequest<DeleteMyCommands, BaseResponse> {
+
+    public DeleteMyCommands() {
+        super(BaseResponse.class);
+    }
+
+    /**
+     * 
+     * @param scope An object that extends the BotCommandScope class. For example: new BotCommandScopeAllPrivateChats()
+     * @return
+     */
+    public DeleteMyCommands scope(BotCommandScope scope) {
+        add("scope", scope);
+        return this;
+    }
+
+    /**
+     * 
+     * @param languageCode A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands
+     * @return
+     */
+    public DeleteMyCommands languageCode(String languageCode) {
+        add("language_code", languageCode);
+        return this;
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/InlineQuery.java

@@ -14,6 +14,7 @@ public class InlineQuery implements Serializable {
     private Location location;
     private String query;
     private String offset;
+    private String chat_type;
 
     public String id() {
         return id;
@@ -35,6 +36,10 @@ public String offset() {
         return offset;
     }
 
+    public String chatType() {
+        return chat_type;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -46,8 +51,9 @@ public boolean equals(Object o) {
         if (from != null ? !from.equals(that.from) : that.from != null) return false;
         if (location != null ? !location.equals(that.location) : that.location != null) return false;
         if (query != null ? !query.equals(that.query) : that.query != null) return false;
-        return offset != null ? offset.equals(that.offset) : that.offset == null;
+        if (chat_type != null ? !chat_type.equals(that.chat_type) : that.chat_type != null) return false;
 
+        return offset != null ? offset.equals(that.offset) : that.offset == null;
     }
 
     @Override
@@ -63,6 +69,7 @@ public String toString() {
                 ", location=" + location +
                 ", query='" + query + '\'' +
                 ", offset='" + offset + '\'' +
+                ", chat_type='" + chat_type + '\'' +
                 '}';
     }
 }

library/src/main/java/com/pengrad/telegrambot/model/Message.java

@@ -68,6 +68,7 @@ public class Message implements Serializable {
     private VoiceChatStarted voice_chat_started;
     private VoiceChatEnded voice_chat_ended;
     private VoiceChatParticipantsInvited voice_chat_participants_invited;
+    private VoiceChatScheduled voice_chat_scheduled;
     private InlineKeyboardMarkup reply_markup;
 
     public Integer messageId() {
@@ -286,6 +287,10 @@ public VoiceChatParticipantsInvited voiceChatParticipantsInvited() {
         return voice_chat_participants_invited;
     }
 
+    public VoiceChatScheduled voiceChatScheduled() {
+        return voice_chat_scheduled;
+    }
+
     public InlineKeyboardMarkup replyMarkup() {
         return reply_markup;
     }
@@ -349,6 +354,7 @@ public boolean equals(Object o) {
                 Objects.equals(voice_chat_started, message.voice_chat_started) &&
                 Objects.equals(voice_chat_ended, message.voice_chat_ended) &&
                 Objects.equals(voice_chat_participants_invited, message.voice_chat_participants_invited) &&
+                Objects.equals(voice_chat_scheduled, message.voice_chat_scheduled) &&
                 Objects.equals(reply_markup, message.reply_markup);
     }
 
@@ -414,6 +420,7 @@ public String toString() {
                 ", voice_chat_started=" + voice_chat_started +
                 ", voice_chat_ended=" + voice_chat_ended +
                 ", voice_chat_participants_invited=" + voice_chat_participants_invited +
+                ", voice_chat_scheduled=" + voice_chat_scheduled +
                 ", reply_markup=" + reply_markup +
                 '}';
     }

library/src/main/java/com/pengrad/telegrambot/model/VoiceChatScheduled.java

@@ -0,0 +1,35 @@
+package com.pengrad.telegrambot.model;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class VoiceChatScheduled implements Serializable {
+
+    private final static long serialVersionUID = 0L;
+
+    private Integer start_date;
+
+    public Integer startDate() {
+        return start_date;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        VoiceChatScheduled that = (VoiceChatScheduled) o;
+        return Objects.equals(start_date, that.start_date);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(start_date);
+    }
+
+    @Override
+    public String toString() {
+        return "VoiceChatScheduled{" +
+                "start_date=" + start_date +
+                '}';
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScope.java

@@ -0,0 +1,10 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+import java.io.Serializable;
+
+public abstract class BotCommandScope implements Serializable {
+    private final static long serialVersionUID = 0L;
+
+    protected String type = "default";
+    
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllChatAdministrators.java

@@ -0,0 +1,8 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandScopeAllChatAdministrators extends BotCommandScope {
+    
+    public BotCommandScopeAllChatAdministrators() {
+        this.type = "all_chat_administrators";
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllGroupChats.java

@@ -0,0 +1,8 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandScopeAllGroupChats extends BotCommandScope {
+    
+    public BotCommandScopeAllGroupChats() {
+        this.type = "all_group_chats";
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeAllPrivateChats.java

@@ -0,0 +1,8 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandScopeAllPrivateChats extends BotCommandScope {
+    
+    public BotCommandScopeAllPrivateChats() {
+        this.type = "all_private_chats";
+    }
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandScopeDefault.java

@@ -0,0 +1,9 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandScopeDefault extends BotCommandScope {
+
+    public BotCommandScopeDefault() { 
+        this.type = "default";
+    }
+
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChat.java

@@ -0,0 +1,16 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandsScopeChat extends BotCommandScope {
+    
+    private Object chat_id;
+
+    /**
+     * 
+     * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
+     */
+    public BotCommandsScopeChat(Object chatId) {
+        this.type = "chat";
+        this.chat_id = chatId;
+    }
+
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChatAdministrators.java

@@ -0,0 +1,16 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandsScopeChatAdministrators extends BotCommandScope {
+    
+    private Object chat_id;
+
+    /**
+     * 
+     * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
+     */
+    public BotCommandsScopeChatAdministrators(Object chatId) {
+        this.type = "chat_administrators";
+        this.chat_id = chatId;
+    }
+
+}

library/src/main/java/com/pengrad/telegrambot/model/botcommandscope/BotCommandsScopeChatMember.java

@@ -0,0 +1,19 @@
+package com.pengrad.telegrambot.model.botcommandscope;
+
+public class BotCommandsScopeChatMember extends BotCommandScope {
+    
+    private Object chat_id;
+    private long user_id;
+
+    /**
+     * 
+     * @param chatId Unique identifier for the target chat or username of the target supergroup (in the format @supergroupusername)
+     * @param userId Unique identifier of the target user
+     */
+    public BotCommandsScopeChatMember(Object chatId, long userId) {
+        this.type = "chat_member";
+        this.chat_id = chatId;
+        this.user_id = userId;
+    }
+
+}