tdlight-team/TDLightTelegramBots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

API 5.1

Browse Source
This commit is contained in:
rubenlagus 2021-03-09 10:59:28 +00:00 committed by Ruben Bermudez
parent ecca28cedc
commit 6653ffe937
58 changed files with 915 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TelegramBots.wiki/Changelog.md
View File

@ -1,6 +1,14 @@
### <a id="5.1.0"></a>5.1.0 ###
1. Update Api version [5.1](https://core.telegram.org/bots/api-changelog#march-9-2021)
2. Bug fixing: #832, #841, #844, #851, #857
3. Update Spring boot version 2.4.3
4. Update Gradle docs
5. Added CommandMessage to extensions
6. Abilities: Inject bot instance to reply update consumer support for multiple reply declarations.
### <a id="5.0.1"></a>5.0.1 ### ### <a id="5.0.1"></a>5.0.1 ###
1. Fixing couple of bugs from 5.0.0 1. Fixing couple of bugs from 5.0.0
2. Buf fixing: #794 2. Bug fixing: #794
3. Docs updated to reflect usage for version 5.0.0 3. Docs updated to reflect usage for version 5.0.0
4. EditMessageText setChatIId(Long) is removed to keep consistency 4. EditMessageText setChatIId(Long) is removed to keep consistency

3
TelegramBots.wiki/How-To-Update.md
View File

@ -1,3 +1,6 @@
### <a id="5.1.0"></a>To version 5.1.0 ###
1. All users IDs fields are now Long type as per API guidelines.
### <a id="5.0.0"></a>To version 5.0.0 ### ### <a id="5.0.0"></a>To version 5.0.0 ###
1. ApiContextInitializer.init(); has been removed and is not required anymore, instead: 1. ApiContextInitializer.init(); has been removed and is not required anymore, instead:
```java ```java

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>5.0.1</version> <version>5.1.0</version>
<modules> <modules>
<module>telegrambots</module> <module>telegrambots</module>

4
telegrambots-abilities/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambots-abilities</artifactId> <artifactId>telegrambots-abilities</artifactId>
@ -84,7 +84,7 @@
<dependency> <dependency>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>

24
telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/BaseAbilityBot.java
View File

@ -113,7 +113,7 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
// Reply registry // Reply registry
private List<Reply> replies; private List<Reply> replies;
public abstract int creatorId(); public abstract long creatorId();
protected BaseAbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) { protected BaseAbilityBot(String botToken, String botUsername, DBContext db, AbilityToggle toggle, DefaultBotOptions botOptions) {
super(botOptions); super(botOptions);
@ -155,28 +155,28 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
/** /**
* @return the map of <ID,User> * @return the map of <ID,User>
*/ */
public Map<Integer, User> users() { public Map<Long, User> users() {
return db.getMap(USERS); return db.getMap(USERS);
} }
/** /**
* @return the map of <Username,ID> * @return the map of <Username,ID>
*/ */
public Map<String, Integer> userIds() { public Map<String, Long> userIds() {
return db.getMap(USER_ID); return db.getMap(USER_ID);
} }
/** /**
* @return a blacklist containing all the IDs of the banned users * @return a blacklist containing all the IDs of the banned users
*/ */
public Set<Integer> blacklist() { public Set<Long> blacklist() {
return db.getSet(BLACKLIST); return db.getSet(BLACKLIST);
} }
/** /**
* @return an admin set of all the IDs of bot administrators * @return an admin set of all the IDs of bot administrators
*/ */
public Set<Integer> admins() { public Set<Long> admins() {
return db.getSet(ADMINS); return db.getSet(ADMINS);
} }
@ -246,29 +246,29 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
return botUsername; return botUsername;
} }
public Privacy getPrivacy(Update update, int id) { public Privacy getPrivacy(Update update, long id) {
return isCreator(id) ? return isCreator(id) ?
CREATOR : isAdmin(id) ? CREATOR : isAdmin(id) ?
ADMIN : (isGroupUpdate(update) || isSuperGroupUpdate(update)) && isGroupAdmin(update, id) ? ADMIN : (isGroupUpdate(update) || isSuperGroupUpdate(update)) && isGroupAdmin(update, id) ?
GROUP_ADMIN : PUBLIC; GROUP_ADMIN : PUBLIC;
} }
public boolean isGroupAdmin(Update update, int id) { public boolean isGroupAdmin(Update update, long id) {
return isGroupAdmin(getChatId(update), id); return isGroupAdmin(getChatId(update), id);
} }
public boolean isGroupAdmin(long chatId, int id) { public boolean isGroupAdmin(long chatId, long id) {
GetChatAdministrators admins = GetChatAdministrators.builder().chatId(Long.toString(chatId)).build(); GetChatAdministrators admins = GetChatAdministrators.builder().chatId(Long.toString(chatId)).build();
return silent.execute(admins) return silent.execute(admins)
.orElse(new ArrayList<>()).stream() .orElse(new ArrayList<>()).stream()
.anyMatch(member -> member.getUser().getId() == id); .anyMatch(member -> member.getUser().getId() == id);
} }
public boolean isCreator(int id) { public boolean isCreator(long id) {
return id == creatorId(); return id == creatorId();
} }
public boolean isAdmin(Integer id) { public boolean isAdmin(long id) {
return admins().contains(id); return admins().contains(id);
} }
@ -508,7 +508,7 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
return true; return true;
} }
int id = user.getId(); long id = user.getId();
return id == creatorId() || !blacklist().contains(id); return id == creatorId() || !blacklist().contains(id);
} }
@ -549,7 +549,7 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
Update update = trio.a(); Update update = trio.a();
User user = AbilityUtils.getUser(update); User user = AbilityUtils.getUser(update);
Privacy privacy; Privacy privacy;
int id = user.getId(); long id = user.getId();
privacy = getPrivacy(update, id); privacy = getPrivacy(update, id);

26
telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/DefaultAbilities.java
View File

@ -293,7 +293,7 @@ public final class DefaultAbilities implements AbilityExtension {
.input(1) .input(1)
.action(ctx -> { .action(ctx -> {
String username = stripTag(ctx.firstArg()); String username = stripTag(ctx.firstArg());
int userId = getUserIdSendError(username, ctx); long userId = getUserIdSendError(username, ctx);
String bannedUser; String bannedUser;
// Protection from abuse // Protection from abuse
@ -304,7 +304,7 @@ public final class DefaultAbilities implements AbilityExtension {
bannedUser = addTag(username); bannedUser = addTag(username);
} }
Set<Integer> blacklist = bot.blacklist(); Set<Long> blacklist = bot.blacklist();
if (blacklist.contains(userId)) if (blacklist.contains(userId))
sendMd(ABILITY_BAN_FAIL, ctx, escape(bannedUser)); sendMd(ABILITY_BAN_FAIL, ctx, escape(bannedUser));
else { else {
@ -328,9 +328,9 @@ public final class DefaultAbilities implements AbilityExtension {
.input(1) .input(1)
.action(ctx -> { .action(ctx -> {
String username = stripTag(ctx.firstArg()); String username = stripTag(ctx.firstArg());
Integer userId = getUserIdSendError(username, ctx); Long userId = getUserIdSendError(username, ctx);
Set<Integer> blacklist = bot.blacklist(); Set<Long> blacklist = bot.blacklist();
if (!blacklist.remove(userId)) if (!blacklist.remove(userId))
bot.silent.sendMd(getLocalizedMessage(ABILITY_UNBAN_FAIL, ctx.user().getLanguageCode(), escape(username)), ctx.chatId()); bot.silent.sendMd(getLocalizedMessage(ABILITY_UNBAN_FAIL, ctx.user().getLanguageCode(), escape(username)), ctx.chatId());
@ -352,9 +352,9 @@ public final class DefaultAbilities implements AbilityExtension {
.input(1) .input(1)
.action(ctx -> { .action(ctx -> {
String username = stripTag(ctx.firstArg()); String username = stripTag(ctx.firstArg());
Integer userId = getUserIdSendError(username, ctx); Long userId = getUserIdSendError(username, ctx);
Set<Integer> admins = bot.admins(); Set<Long> admins = bot.admins();
if (admins.contains(userId)) if (admins.contains(userId))
sendMd(ABILITY_PROMOTE_FAIL, ctx, escape(username)); sendMd(ABILITY_PROMOTE_FAIL, ctx, escape(username));
else { else {
@ -376,9 +376,9 @@ public final class DefaultAbilities implements AbilityExtension {
.input(1) .input(1)
.action(ctx -> { .action(ctx -> {
String username = stripTag(ctx.firstArg()); String username = stripTag(ctx.firstArg());
Integer userId = getUserIdSendError(username, ctx); Long userId = getUserIdSendError(username, ctx);
Set<Integer> admins = bot.admins(); Set<Long> admins = bot.admins();
if (admins.remove(userId)) { if (admins.remove(userId)) {
sendMd(ABILITY_DEMOTE_SUCCESS, ctx, escape(username)); sendMd(ABILITY_DEMOTE_SUCCESS, ctx, escape(username));
} else { } else {
@ -400,8 +400,8 @@ public final class DefaultAbilities implements AbilityExtension {
.privacy(CREATOR) .privacy(CREATOR)
.input(0) .input(0)
.action(ctx -> { .action(ctx -> {
Set<Integer> admins = bot.admins(); Set<Long> admins = bot.admins();
int id = bot.creatorId(); long id = bot.creatorId();
if (admins.contains(id)) if (admins.contains(id))
send(ABILITY_CLAIM_FAIL, ctx); send(ABILITY_CLAIM_FAIL, ctx);
@ -420,7 +420,7 @@ public final class DefaultAbilities implements AbilityExtension {
* @return the user * @return the user
*/ */
private User getUser(String username) { private User getUser(String username) {
Integer id = bot.userIds().get(username.toLowerCase()); Long id = bot.userIds().get(username.toLowerCase());
if (id == null) { if (id == null) {
throw new IllegalStateException(format("Could not find ID corresponding to username [%s]", username)); throw new IllegalStateException(format("Could not find ID corresponding to username [%s]", username));
} }
@ -434,7 +434,7 @@ public final class DefaultAbilities implements AbilityExtension {
* @param id the id of the required user * @param id the id of the required user
* @return the user * @return the user
*/ */
private User getUser(int id) { private User getUser(long id) {
User user = bot.users().get(id); User user = bot.users().get(id);
if (user == null) { if (user == null) {
throw new IllegalStateException(format("Could not find user corresponding to id [%d]", id)); throw new IllegalStateException(format("Could not find user corresponding to id [%d]", id));
@ -450,7 +450,7 @@ public final class DefaultAbilities implements AbilityExtension {
* @param ctx the message context with the originating user * @param ctx the message context with the originating user
* @return the id of the user * @return the id of the user
*/ */
private int getUserIdSendError(String username, MessageContext ctx) { private long getUserIdSendError(String username, MessageContext ctx) {
try { try {
return getUser(username).getId(); return getUser(username).getId();
} catch (IllegalStateException ex) { } catch (IllegalStateException ex) {

3
telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java
View File

@ -29,6 +29,9 @@ public enum Flag implements Predicate<Update> {
PRECHECKOUT_QUERY(Update::hasPreCheckoutQuery), PRECHECKOUT_QUERY(Update::hasPreCheckoutQuery),
POLL(Update::hasPoll), POLL(Update::hasPoll),
POLL_ANSWER(Update::hasPollAnswer), POLL_ANSWER(Update::hasPollAnswer),
MY_CHAT_MEMBER(Update::hasMyChatMember),
CHAT_MEMBER(Update::hasChatMember),
// Message Flags // Message Flags
REPLY(upd -> MESSAGE.test(upd) && upd.getMessage().isReply()), REPLY(upd -> MESSAGE.test(upd) && upd.getMessage().isReply()),

22
telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java
View File

@ -25,7 +25,7 @@ import static org.telegram.abilitybots.api.objects.Flag.*;
* Helper and utility methods * Helper and utility methods
*/ */
public final class AbilityUtils { public final class AbilityUtils {
public static User EMPTY_USER = new User(0, "", false); public static User EMPTY_USER = new User(0L, "", false);
private AbilityUtils() { private AbilityUtils() {
@ -82,6 +82,10 @@ public final class AbilityUtils {
return update.getPreCheckoutQuery().getFrom(); return update.getPreCheckoutQuery().getFrom();
} else if (POLL_ANSWER.test(update)) { } else if (POLL_ANSWER.test(update)) {
return update.getPollAnswer().getUser(); return update.getPollAnswer().getUser();
} else if (MY_CHAT_MEMBER.test(update)) {
return update.getMyChatMember().getFrom();
} else if (CHAT_MEMBER.test(update)) {
return update.getChatMember().getFrom();
} else if (POLL.test(update)) { } else if (POLL.test(update)) {
return EMPTY_USER; return EMPTY_USER;
} else { } else {
@ -146,7 +150,7 @@ public final class AbilityUtils {
} else if (CALLBACK_QUERY.test(update)) { } else if (CALLBACK_QUERY.test(update)) {
return update.getCallbackQuery().getMessage().getChatId(); return update.getCallbackQuery().getMessage().getChatId();
} else if (INLINE_QUERY.test(update)) { } else if (INLINE_QUERY.test(update)) {
return (long) update.getInlineQuery().getFrom().getId(); return update.getInlineQuery().getFrom().getId();
} else if (CHANNEL_POST.test(update)) { } else if (CHANNEL_POST.test(update)) {
return update.getChannelPost().getChatId(); return update.getChannelPost().getChatId();
} else if (EDITED_CHANNEL_POST.test(update)) { } else if (EDITED_CHANNEL_POST.test(update)) {
@ -154,15 +158,19 @@ public final class AbilityUtils {
} else if (EDITED_MESSAGE.test(update)) { } else if (EDITED_MESSAGE.test(update)) {
return update.getEditedMessage().getChatId(); return update.getEditedMessage().getChatId();
} else if (CHOSEN_INLINE_QUERY.test(update)) { } else if (CHOSEN_INLINE_QUERY.test(update)) {
return (long) update.getChosenInlineQuery().getFrom().getId(); return update.getChosenInlineQuery().getFrom().getId();
} else if (SHIPPING_QUERY.test(update)) { } else if (SHIPPING_QUERY.test(update)) {
return (long) update.getShippingQuery().getFrom().getId(); return update.getShippingQuery().getFrom().getId();
} else if (PRECHECKOUT_QUERY.test(update)) { } else if (PRECHECKOUT_QUERY.test(update)) {
return (long) update.getPreCheckoutQuery().getFrom().getId(); return update.getPreCheckoutQuery().getFrom().getId();
} else if (POLL_ANSWER.test(update)) { } else if (POLL_ANSWER.test(update)) {
return (long) update.getPollAnswer().getUser().getId(); return update.getPollAnswer().getUser().getId();
} else if (POLL.test(update)) { } else if (POLL.test(update)) {
return (long) EMPTY_USER.getId(); return EMPTY_USER.getId();
} else if (MY_CHAT_MEMBER.test(update)) {
return update.getMyChatMember().getChat().getId();
} else if (CHAT_MEMBER.test(update)) {
return update.getChatMember().getChat().getId();
} else { } else {
throw new IllegalStateException("Could not retrieve originating chat ID from update"); throw new IllegalStateException("Could not retrieve originating chat ID from update");
} }

6
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotI18nTest.java
View File

@ -19,8 +19,8 @@ import static org.telegram.abilitybots.api.bot.TestUtils.mockContext;
import static org.telegram.abilitybots.api.db.MapDBContext.offlineInstance; import static org.telegram.abilitybots.api.db.MapDBContext.offlineInstance;
class AbilityBotI18nTest { class AbilityBotI18nTest {
private static final User NO_LANGUAGE_USER = new User(1, "first", false, "last", "username", null, false, false, false); private static final User NO_LANGUAGE_USER = new User(1L, "first", false, "last", "username", null, false, false, false);
private static final User ITALIAN_USER = new User(2, "first", false, "last", "username", "it-IT", false, false, false); private static final User ITALIAN_USER = new User(2L, "first", false, "last", "username", "it-IT", false, false, false);
private DBContext db; private DBContext db;
private NoPublicCommandsBot bot; private NoPublicCommandsBot bot;
@ -76,7 +76,7 @@ class AbilityBotI18nTest {
} }
@Override @Override
public int creatorId() { public long creatorId() {
return 1; return 1;
} }
} }

34
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotTest.java
View File

@ -234,8 +234,8 @@ public class AbilityBotTest {
defaultAbs.demoteAdmin().action().accept(context); defaultAbs.demoteAdmin().action().accept(context);
Set<Integer> actual = bot.admins(); Set<Long> actual = bot.admins();
Set<Integer> expected = emptySet(); Set<Long> expected = emptySet();
assertEquals(expected, actual, "Could not sudont super-admin"); assertEquals(expected, actual, "Could not sudont super-admin");
} }
@ -247,8 +247,8 @@ public class AbilityBotTest {
defaultAbs.promoteAdmin().action().accept(context); defaultAbs.promoteAdmin().action().accept(context);
Set<Integer> actual = bot.admins(); Set<Long> actual = bot.admins();
Set<Integer> expected = newHashSet(USER.getId()); Set<Long> expected = newHashSet(USER.getId());
assertEquals(expected, actual, "Could not sudo user"); assertEquals(expected, actual, "Could not sudo user");
} }
@ -259,8 +259,8 @@ public class AbilityBotTest {
defaultAbs.banUser().action().accept(context); defaultAbs.banUser().action().accept(context);
Set<Integer> actual = bot.blacklist(); Set<Long> actual = bot.blacklist();
Set<Integer> expected = newHashSet(USER.getId()); Set<Long> expected = newHashSet(USER.getId());
assertEquals(expected, actual, "The ban was not emplaced"); assertEquals(expected, actual, "The ban was not emplaced");
} }
@ -273,8 +273,8 @@ public class AbilityBotTest {
defaultAbs.unbanUser().action().accept(context); defaultAbs.unbanUser().action().accept(context);
Set<Integer> actual = bot.blacklist(); Set<Long> actual = bot.blacklist();
Set<Integer> expected = newHashSet(); Set<Long> expected = newHashSet();
assertEquals(expected, actual, "The ban was not lifted"); assertEquals(expected, actual, "The ban was not lifted");
} }
@ -290,8 +290,8 @@ public class AbilityBotTest {
defaultAbs.banUser().action().accept(context); defaultAbs.banUser().action().accept(context);
Set<Integer> actual = bot.blacklist(); Set<Long> actual = bot.blacklist();
Set<Integer> expected = newHashSet(USER.getId()); Set<Long> expected = newHashSet(USER.getId());
assertEquals(expected, actual, "Impostor was not added to the blacklist"); assertEquals(expected, actual, "Impostor was not added to the blacklist");
} }
@ -308,8 +308,8 @@ public class AbilityBotTest {
defaultAbs.claimCreator().action().accept(context); defaultAbs.claimCreator().action().accept(context);
Set<Integer> actual = bot.admins(); Set<Long> actual = bot.admins();
Set<Integer> expected = newHashSet(CREATOR.getId()); Set<Long> expected = newHashSet(CREATOR.getId());
assertEquals(expected, actual, "Creator was not properly added to the super admins set"); assertEquals(expected, actual, "Creator was not properly added to the super admins set");
} }
@ -335,8 +335,8 @@ public class AbilityBotTest {
bot.addUser(update); bot.addUser(update);
Map<String, Integer> expectedUserIds = ImmutableMap.of(USER.getUserName(), USER.getId()); Map<String, Long> expectedUserIds = ImmutableMap.of(USER.getUserName(), USER.getId());
Map<Integer, User> expectedUsers = ImmutableMap.of(USER.getId(), USER); Map<Long, User> expectedUsers = ImmutableMap.of(USER.getId(), USER);
assertEquals(expectedUserIds, bot.userIds(), "User was not added"); assertEquals(expectedUserIds, bot.userIds(), "User was not added");
assertEquals(expectedUsers, bot.users(), "User was not added"); assertEquals(expectedUsers, bot.users(), "User was not added");
} }
@ -350,15 +350,15 @@ public class AbilityBotTest {
String newUsername = USER.getUserName() + "-test"; String newUsername = USER.getUserName() + "-test";
String newFirstName = USER.getFirstName() + "-test"; String newFirstName = USER.getFirstName() + "-test";
String newLastName = USER.getLastName() + "-test"; String newLastName = USER.getLastName() + "-test";
int sameId = USER.getId(); long sameId = USER.getId();
User changedUser = new User(sameId, newFirstName, false, newLastName, newUsername, "en", false, false, false); User changedUser = new User(sameId, newFirstName, false, newLastName, newUsername, "en", false, false, false);
mockAlternateUser(update, message, changedUser); mockAlternateUser(update, message, changedUser);
bot.addUser(update); bot.addUser(update);
Map<String, Integer> expectedUserIds = ImmutableMap.of(changedUser.getUserName(), changedUser.getId()); Map<String, Long> expectedUserIds = ImmutableMap.of(changedUser.getUserName(), changedUser.getId());
Map<Integer, User> expectedUsers = ImmutableMap.of(changedUser.getId(), changedUser); Map<Long, User> expectedUsers = ImmutableMap.of(changedUser.getId(), changedUser);
assertEquals(bot.userIds(), expectedUserIds, "User was not properly edited"); assertEquals(bot.userIds(), expectedUserIds, "User was not properly edited");
assertEquals(expectedUsers, expectedUsers, "User was not properly edited"); assertEquals(expectedUsers, expectedUsers, "User was not properly edited");
} }

4
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/ContinuousTextTest.java
View File

@ -22,7 +22,7 @@ import static org.telegram.abilitybots.api.objects.Locality.ALL;
import static org.telegram.abilitybots.api.objects.Privacy.PUBLIC; import static org.telegram.abilitybots.api.objects.Privacy.PUBLIC;
public class ContinuousTextTest { public class ContinuousTextTest {
private static final User USER = new User(1, "first", false); private static final User USER = new User(1L, "first", false);
private DBContext db; private DBContext db;
@ -71,7 +71,7 @@ public class ContinuousTextTest {
} }
@Override @Override
public int creatorId() { public long creatorId() {
return 1337; return 1337;
} }

4
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/DefaultBot.java
View File

@ -38,8 +38,8 @@ public class DefaultBot extends AbilityBot {
} }
@Override @Override
public int creatorId() { public long creatorId() {
return 1337; return 1337L;
} }
public Ability defaultAbility() { public Ability defaultAbility() {

2
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/ExtensionTest.java
View File

@ -47,7 +47,7 @@ class ExtensionTest {
} }
@Override @Override
public int creatorId() { public long creatorId() {
return 0; return 0;
} }

2
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/ReplyFlowTest.java
View File

@ -158,7 +158,7 @@ public class ReplyFlowTest {
} }
@Override @Override
public int creatorId() { public long creatorId() {
return 0; return 0;
} }

4
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/TestUtils.java
View File

@ -11,8 +11,8 @@ import static org.mockito.Mockito.when;
import static org.telegram.abilitybots.api.objects.MessageContext.newContext; import static org.telegram.abilitybots.api.objects.MessageContext.newContext;
public final class TestUtils { public final class TestUtils {
public static final User USER = new User(1, "first", false, "last", "username", null, false, false, false); public static final User USER = new User(1L, "first", false, "last", "username", null, false, false, false);
public static final User CREATOR = new User(1337, "creatorFirst", false, "creatorLast", "creatorUsername", null, false, false, false); public static final User CREATOR = new User(1337L, "creatorFirst", false, "creatorLast", "creatorUsername", null, false, false, false);
private TestUtils() { private TestUtils() {

9
telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/db/MapDBContextTest.java
View File

@ -12,7 +12,6 @@ import java.util.Set;
import static com.google.common.collect.Maps.newHashMap; import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.Sets.newHashSet; import static com.google.common.collect.Sets.newHashSet;
import static com.google.common.collect.Sets.toImmutableEnumSet;
import static java.lang.String.format; import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
@ -59,22 +58,22 @@ class MapDBContextTest {
@Test @Test
void canRecoverDB() { void canRecoverDB() {
Map<Integer, User> users = db.getMap(USERS); Map<Long, User> users = db.getMap(USERS);
Map<String, Integer> userIds = db.getMap(USER_ID); Map<String, Long> userIds = db.getMap(USER_ID);
users.put(CREATOR.getId(), CREATOR); users.put(CREATOR.getId(), CREATOR);
users.put(USER.getId(), USER); users.put(USER.getId(), USER);
userIds.put(CREATOR.getUserName(), CREATOR.getId()); userIds.put(CREATOR.getUserName(), CREATOR.getId());
userIds.put(USER.getUserName(), USER.getId()); userIds.put(USER.getUserName(), USER.getId());
db.getSet("AYRE").add(123123); db.getSet("AYRE").add(123123);
Map<Integer, User> originalUsers = newHashMap(users); Map<Long, User> originalUsers = newHashMap(users);
String beforeBackupInfo = db.info(USERS); String beforeBackupInfo = db.info(USERS);
Object jsonBackup = db.backup(); Object jsonBackup = db.backup();
db.clear(); db.clear();
boolean recovered = db.recover(jsonBackup); boolean recovered = db.recover(jsonBackup);
Map<Integer, User> recoveredUsers = db.getMap(USERS); Map<Long, User> recoveredUsers = db.getMap(USERS);
String afterRecoveryInfo = db.info(USERS); String afterRecoveryInfo = db.info(USERS);
assertTrue(recovered, "Could not recover database successfully"); assertTrue(recovered, "Could not recover database successfully");

4
telegrambots-chat-session-bot/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambots-chat-session-bot</artifactId> <artifactId>telegrambots-chat-session-bot</artifactId>
@ -84,7 +84,7 @@
<dependency> <dependency>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core --> <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core -->

4
telegrambots-extensions/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambotsextensions</artifactId> <artifactId>telegrambotsextensions</artifactId>
@ -75,7 +75,7 @@
<dependency> <dependency>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
telegrambots-meta/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambots-meta</artifactId> <artifactId>telegrambots-meta</artifactId>

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java
View File

@ -41,7 +41,7 @@ public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Unique identifier of the target user private Long userId; ///< Unique identifier of the target user
/** /**
* Optional. Sequential number of the first photo to be returned. By default, all photos are returned. * Optional. Sequential number of the first photo to be returned. By default, all photos are returned.
*/ */

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java
View File

@ -41,7 +41,7 @@ public class SetPassportDataErrors extends BotApiMethod<Boolean> {
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
@NonNull @NonNull
private Integer userId; ///< User identifier private Long userId; ///< User identifier
@JsonProperty(ERRORS_FIELD) @JsonProperty(ERRORS_FIELD)
@NonNull @NonNull
@Singular @Singular

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java
View File

@ -74,7 +74,7 @@ public class GetGameHighScores extends BotApiMethod<ArrayList<GameHighScore>> {
private String inlineMessageId; ///< Optional Required if chat_id and message_id are not specified. Identifier of the inline message private String inlineMessageId; ///< Optional Required if chat_id and message_id are not specified. Identifier of the inline message
@JsonProperty(USER_ID_FIELD) @JsonProperty(USER_ID_FIELD)
@NonNull @NonNull
private Integer userId; ///<Target user id private Long userId; ///<Target user id
@Override @Override
public String getMethod() { public String getMethod() {

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java
View File

@ -77,7 +77,7 @@ public class SetGameScore extends BotApiMethod<Serializable> {
private Boolean disableEditMessage; ///< Optional Pass True, if the game message should not be automatically edited to include the current scoreboard. Defaults to False private Boolean disableEditMessage; ///< Optional Pass True, if the game message should not be automatically edited to include the current scoreboard. Defaults to False
@JsonProperty(USER_ID_FIELD) @JsonProperty(USER_ID_FIELD)
@NonNull @NonNull
private Integer userId; ///< User identifier private Long userId; ///< User identifier
@JsonProperty(SCORE_FIELD) @JsonProperty(SCORE_FIELD)
@NonNull @NonNull
private Integer score; ///< New score, must be positive private Integer score; ///< New score, must be positive

90
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/CreateChatInviteLink.java Normal file
View File

@ -0,0 +1,90 @@
package org.telegram.telegrambots.meta.api.methods.groupadministration;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.methods.BotApiMethod;
import org.telegram.telegrambots.meta.api.objects.ApiResponse;
import org.telegram.telegrambots.meta.api.objects.ChatInviteLink;
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
import java.io.IOException;
/**
* @author Ruben Bermudez
* @version 5.1
*
* Use this method to create an additional invite link for a chat.
*
* The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
*
* The link can be revoked using the method revokeChatInviteLink. Returns the new invite link as ChatInviteLink object.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
@Builder
public class CreateChatInviteLink extends BotApiMethod<ChatInviteLink> {
public static final String PATH = "createChatInviteLink";
private static final String CHATID_FIELD = "chat_id";
private static final String EXPIREDATE_FIELD = "expire_date";
private static final String MEMBERLIMIT_FIELD = "member_limit";
@JsonProperty(CHATID_FIELD)
@NonNull
private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@JsonProperty(EXPIREDATE_FIELD)
private Integer expireDate; ///< Optional. Point in time (Unix timestamp) when the link will expire
/**
* Optional.
*
* Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
*/
@JsonProperty(MEMBERLIMIT_FIELD)
private Integer memberLimit;
@Override
public String getMethod() {
return PATH;
}
@Override
public ChatInviteLink deserializeResponse(String answer) throws TelegramApiRequestException {
try {
ApiResponse<ChatInviteLink> result = OBJECT_MAPPER.readValue(answer,
new TypeReference<ApiResponse<ChatInviteLink>>(){});
if (result.getOk()) {
return result.getResult();
} else {
throw new TelegramApiRequestException("Error creating invite link", result);
}
} catch (IOException e) {
throw new TelegramApiRequestException("Unable to deserialize response", e);
}
}
@Override
public void validate() throws TelegramApiValidationException {
if (chatId == null || chatId.isEmpty()) {
throw new TelegramApiValidationException("ChatId can't be empty", this);
}
if (memberLimit != null && (memberLimit < 1 || memberLimit > 99999)) {
throw new TelegramApiValidationException("MemberLimit must be between 1 and 99999", this);
}
}
}

98
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/EditChatInviteLink.java Normal file
View File

@ -0,0 +1,98 @@
package org.telegram.telegrambots.meta.api.methods.groupadministration;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Strings;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.methods.BotApiMethod;
import org.telegram.telegrambots.meta.api.objects.ApiResponse;
import org.telegram.telegrambots.meta.api.objects.ChatInviteLink;
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
import java.io.IOException;
/**
* @author Ruben Bermudez
* @version 5.1
*
* Use this method to edit a non-primary invite link created by the bot.
*
* The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
*
* Returns the edited invite link as a ChatInviteLink object.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
@RequiredArgsConstructor
@Builder
public class EditChatInviteLink extends BotApiMethod<ChatInviteLink> {
public static final String PATH = "createChatInviteLink";
private static final String CHATID_FIELD = "chat_id";
private static final String INVITELINK_FIELD = "invite_link";
private static final String EXPIREDATE_FIELD = "expire_date";
private static final String MEMBERLIMIT_FIELD = "member_limit";
@JsonProperty(CHATID_FIELD)
@NonNull
private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@JsonProperty(INVITELINK_FIELD)
@NonNull
private String inviteLink; ///< The invite link to edit
@JsonProperty(EXPIREDATE_FIELD)
private Integer expireDate; ///< Optional. Point in time (Unix timestamp) when the link will expire
/**
* Optional.
*
* Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
*/
@JsonProperty(MEMBERLIMIT_FIELD)
private Integer memberLimit;
@Override
public String getMethod() {
return PATH;
}
@Override
public ChatInviteLink deserializeResponse(String answer) throws TelegramApiRequestException {
try {
ApiResponse<ChatInviteLink> result = OBJECT_MAPPER.readValue(answer,
new TypeReference<ApiResponse<ChatInviteLink>>(){});
if (result.getOk()) {
return result.getResult();
} else {
throw new TelegramApiRequestException("Error creating invite link", result);
}
} catch (IOException e) {
throw new TelegramApiRequestException("Unable to deserialize response", e);
}
}
@Override
public void validate() throws TelegramApiValidationException {
if (Strings.isNullOrEmpty(chatId)) {
throw new TelegramApiValidationException("ChatId can't be empty", this);
}
if (Strings.isNullOrEmpty(inviteLink)) {
throw new TelegramApiValidationException("InviteLink can't be empty", this);
}
if (memberLimit != null && (memberLimit < 1 || memberLimit > 99999)) {
throw new TelegramApiValidationException("MemberLimit must be between 1 and 99999", this);
}
}
}

14
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java
View File

@ -20,8 +20,16 @@ import java.io.IOException;
/** /**
* @author Ruben Bermudez * @author Ruben Bermudez
* @version 3.1 * @version 3.1
* Use this method to export an invite link to a supergroup or a channel. The bot must be an administrator in the * Use this method to generate a new primary invite link for a chat; any previously generated primary link is revoked.
* chat for this to work and must have the appropriate admin rights. Returns exported invite link as String on success. *
* The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
*
* Returns the new invite link as String on success.
*
* @apiNote Each administrator in a chat generates their own invite links.
* Bots can't use invite links generated by other administrators.
* If you want your bot to work with invite links, it will need to generate its own link using exportChatInviteLink or by calling the getChat method.
* If your bot needs to generate a new primary invite link replacing its previous one, use exportChatInviteLink again.
*/ */
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Getter @Getter
@ -37,7 +45,7 @@ public class ExportChatInviteLink extends BotApiMethod<String> {
@JsonProperty(CHATID_FIELD) @JsonProperty(CHATID_FIELD)
@NonNull @NonNull
private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@Override @Override
public String getMethod() { public String getMethod() {

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java
View File

@ -42,7 +42,7 @@ public class GetChatMember extends BotApiMethod<ChatMember> {
private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Unique identifier of the target user private Long userId; ///< Unique identifier of the target user
@Override @Override
public String getMethod() { public String getMethod() {

15
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/KickChatMember.java
View File

@ -47,15 +47,28 @@ public class KickChatMember extends BotApiMethod<Boolean> {
private static final String CHATID_FIELD = "chat_id"; private static final String CHATID_FIELD = "chat_id";
private static final String USER_ID_FIELD = "user_id"; private static final String USER_ID_FIELD = "user_id";
private static final String UNTILDATE_FIELD = "until_date"; private static final String UNTILDATE_FIELD = "until_date";
private static final String REVOKEMESSAGES_FIELD = "revoke_messages";
@JsonProperty(CHATID_FIELD) @JsonProperty(CHATID_FIELD)
@NonNull @NonNull
private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels)
@JsonProperty(USER_ID_FIELD) @JsonProperty(USER_ID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Required. Unique identifier of the target user private Long userId; ///< Required. Unique identifier of the target user
@JsonProperty(UNTILDATE_FIELD) @JsonProperty(UNTILDATE_FIELD)
private Integer untilDate; ///< Optional. Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever private Integer untilDate; ///< Optional. Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
/**
* Optional
*
* Pass True to delete all messages from the chat for the user that is being removed.
*
* If False, the user will be able to see messages in the group that were sent before the user was removed.
*
* Always True for supergroups and channels.
*/
@JsonProperty(REVOKEMESSAGES_FIELD)
private Boolean revokeMessages;
@JsonIgnore @JsonIgnore
public void setUntilDateInstant(Instant instant) { public void setUntilDateInstant(Instant instant) {

21
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java
View File

@ -48,13 +48,15 @@ public class PromoteChatMember extends BotApiMethod<Boolean> {
private static final String CANPINMESSAGES_FIELD = "can_pin_messages"; private static final String CANPINMESSAGES_FIELD = "can_pin_messages";
private static final String CANPROMOTEMEMBERS_FIELD = "can_promote_members"; private static final String CANPROMOTEMEMBERS_FIELD = "can_promote_members";
private static final String ISANONYMOUS_FIELD = "is_anonymous"; private static final String ISANONYMOUS_FIELD = "is_anonymous";
private static final String CANMANAGECHAT_FIELD = "can_manage_chat";
private static final String CANMANAGEVOICECHATS_FIELD = "can_manage_voice_chats";
@JsonProperty(CHATID_FIELD) @JsonProperty(CHATID_FIELD)
@NonNull @NonNull
private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels)
@JsonProperty(USER_ID_FIELD) @JsonProperty(USER_ID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Required. Unique identifier of the target user private Long userId; ///< Required. Unique identifier of the target user
@JsonProperty(CANCHANGEINFORMATION_FIELD) @JsonProperty(CANCHANGEINFORMATION_FIELD)
private Boolean canChangeInformation; ///< Optional. Pass True, if the administrator can change chat title, photo and other settings private Boolean canChangeInformation; ///< Optional. Pass True, if the administrator can change chat title, photo and other settings
@JsonProperty(CANPOSTMESSAGES_FIELD) @JsonProperty(CANPOSTMESSAGES_FIELD)
@ -73,6 +75,23 @@ public class PromoteChatMember extends BotApiMethod<Boolean> {
private Boolean canPromoteMembers; ///< Optional. Pass True, if the administrator can add new administrators with a subset of his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administators that were appointed by the him) private Boolean canPromoteMembers; ///< Optional. Pass True, if the administrator can add new administrators with a subset of his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administators that were appointed by the him)
@JsonProperty(ISANONYMOUS_FIELD) @JsonProperty(ISANONYMOUS_FIELD)
private Boolean isAnonymous; ///< Optional. Pass True, if the administrator's presence in the chat is hidden private Boolean isAnonymous; ///< Optional. Pass True, if the administrator's presence in the chat is hidden
/**
* Optional
*
* Pass True, if the administrator can access the chat event log, chat statistics, message statistics in channels,
* see channel members, see anonymous administrators in supergoups and ignore slow mode.
*
* Implied by any other administrator privilege
*/
@JsonProperty(CANMANAGECHAT_FIELD)
private Boolean canManageChat;
/**
* Optional.
*
* Pass True, if the administrator can manage voice chats, supergroups only
*/
@JsonProperty(CANMANAGEVOICECHATS_FIELD)
private Boolean canManageVoiceChats;
@Override @Override
public String getMethod() { public String getMethod() {

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java
View File

@ -57,7 +57,7 @@ public class RestrictChatMember extends BotApiMethod<Boolean> {
private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels)
@JsonProperty(USER_ID_FIELD) @JsonProperty(USER_ID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Required. Unique identifier of the target user private Long userId; ///< Required. Unique identifier of the target user
/** /**
* Optional * Optional
* Date when restrictions will be lifted for the user, unix time. * Date when restrictions will be lifted for the user, unix time.

83
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RevokeChatInviteLink.java Normal file
View File

@ -0,0 +1,83 @@
package org.telegram.telegrambots.meta.api.methods.groupadministration;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Strings;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.methods.BotApiMethod;
import org.telegram.telegrambots.meta.api.objects.ApiResponse;
import org.telegram.telegrambots.meta.api.objects.ChatInviteLink;
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
import java.io.IOException;
/**
* @author Ruben Bermudez
* @version 5.1
*
* Use this method to revoke an invite link created by the bot.
*
* If the primary link is revoked, a new link is automatically generated.
*
* The bot must be an administrator in the chat for this to work and must have the appropriate admin rights.
*
* Returns the revoked invite link as ChatInviteLink object.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class RevokeChatInviteLink extends BotApiMethod<ChatInviteLink> {
public static final String PATH = "createChatInviteLink";
private static final String CHATID_FIELD = "chat_id";
private static final String INVITELINK_FIELD = "invite_link";
@JsonProperty(CHATID_FIELD)
@NonNull
private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@JsonProperty(INVITELINK_FIELD)
@NonNull
private String inviteLink; ///< The invite link to revoke
@Override
public String getMethod() {
return PATH;
}
@Override
public ChatInviteLink deserializeResponse(String answer) throws TelegramApiRequestException {
try {
ApiResponse<ChatInviteLink> result = OBJECT_MAPPER.readValue(answer,
new TypeReference<ApiResponse<ChatInviteLink>>(){});
if (result.getOk()) {
return result.getResult();
} else {
throw new TelegramApiRequestException("Error creating invite link", result);
}
} catch (IOException e) {
throw new TelegramApiRequestException("Unable to deserialize response", e);
}
}
@Override
public void validate() throws TelegramApiValidationException {
if (Strings.isNullOrEmpty(chatId)) {
throw new TelegramApiValidationException("ChatId can't be empty", this);
}
if (Strings.isNullOrEmpty(inviteLink)) {
throw new TelegramApiValidationException("InviteLink can't be empty", this);
}
}
}

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatAdministratorCustomTitle.java
View File

@ -42,7 +42,7 @@ public class SetChatAdministratorCustomTitle extends BotApiMethod<Boolean> {
private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername) private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Unique identifier of the target user private Long userId; ///< Unique identifier of the target user
@JsonProperty(CUSTOMTITLE_FIELD) @JsonProperty(CUSTOMTITLE_FIELD)
@NonNull @NonNull
private String customTitle; ///< New custom title for the administrator; 0-16 characters, emoji are not allowed private String customTitle; ///< New custom title for the administrator; 0-16 characters, emoji are not allowed

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java
View File

@ -50,7 +50,7 @@ public class UnbanChatMember extends BotApiMethod<Boolean> {
private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels) private String chatId; ///< Required. Unique identifier for the chat to send the message to (Or username for channels)
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
@NonNull @NonNull
private Integer userId; ///< Required. Unique identifier of the target user private Long userId; ///< Required. Unique identifier of the target user
@JsonProperty(ONLYISBANNED_FIELD) @JsonProperty(ONLYISBANNED_FIELD)
private Boolean onlyIfBanned; ///< Optional. Do nothing if the user is not banned private Boolean onlyIfBanned; ///< Optional. Do nothing if the user is not banned

12
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDice.java
View File

@ -37,7 +37,7 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@Builder @Builder
public class SendDice extends BotApiMethod<Message> { public class SendDice extends BotApiMethod<Message> {
private static final List<String> VALIDEMOJIS = Collections.unmodifiableList(Arrays.asList("🎲", "🎯", "🏀", "⚽", "🎰")); private static final List<String> VALIDEMOJIS = Collections.unmodifiableList(Arrays.asList("🎲", "🎯", "🏀", "⚽", "🎳", "🎰"));
public static final String PATH = "sendDice"; public static final String PATH = "sendDice";
@ -52,13 +52,17 @@ public class SendDice extends BotApiMethod<Message> {
@NonNull @NonNull
private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername) private String chatId; ///< Unique identifier for the target chat or username of the target channel (in the format @channelusername)
/** /**
* Optional.
*
* Emoji on which the dice throw animation is based. * Emoji on which the dice throw animation is based.
* Currently, must be one of “🎲”, “🎯”, “🏀”, “⚽”, or “🎰”. *
* Dice can have values 1-6 for “🎲” and “🎯”, values 1-5 for “🏀” and “⚽”, and values 1-64 for “🎰”. * Currently, must be one of “🎲”, “🎯”, “🏀”, “⚽”, “🎳”, or “🎰”.
*
* Dice can have values 1-6 for “🎲”, “🎯” and “🎳”, values 1-5 for “🏀” and “⚽”, and values 1-64 for “🎰”.
*
* Defaults to “🎲” * Defaults to “🎲”
*/ */
@JsonProperty(EMOJI_FIELD) @JsonProperty(EMOJI_FIELD)
@NonNull
private String emoji; private String emoji;
@JsonProperty(DISABLENOTIFICATION_FIELD) @JsonProperty(DISABLENOTIFICATION_FIELD)
private Boolean disableNotification; ///< Optional. Sends the message silently. Users will receive a notification with no sound. private Boolean disableNotification; ///< Optional. Sends the message silently. Users will receive a notification with no sound.

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/AddStickerToSet.java
View File

@ -48,7 +48,7 @@ public class AddStickerToSet extends PartialBotApiMethod<Boolean> {
public static final String MASKPOSITION_FIELD = "mask_position"; public static final String MASKPOSITION_FIELD = "mask_position";
@NonNull @NonNull
private Integer userId; ///< User identifier of sticker set owner private Long userId; ///< User identifier of sticker set owner
@NonNull @NonNull
private String name; ///< Sticker set name private String name; ///< Sticker set name
@NonNull @NonNull

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/CreateNewStickerSet.java
View File

@ -47,7 +47,7 @@ public class CreateNewStickerSet extends PartialBotApiMethod<Boolean> {
public static final String MASKPOSITION_FIELD = "mask_position"; public static final String MASKPOSITION_FIELD = "mask_position";
@NonNull @NonNull
private Integer userId; ///< User identifier of created sticker set owner private Long userId; ///< User identifier of created sticker set owner
/** /**
* Name of sticker set, to be used in t.me/addstickers/<name> URLs. * Name of sticker set, to be used in t.me/addstickers/<name> URLs.
* Can contain only english letters, digits and underscores. * Can contain only english letters, digits and underscores.

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/SetStickerSetThumb.java
View File

@ -40,7 +40,7 @@ public class SetStickerSetThumb extends BotApiMethod<Boolean> {
@NonNull @NonNull
private String name; ///< Sticker set name private String name; ///< Sticker set name
@NonNull @NonNull
private Integer userId; ///< User identifier of the sticker set owner private Long userId; ///< User identifier of the sticker set owner
/** /**
* A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, * A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px,
* or a TGS animation with the thumbnail up to 32 kilobytes in size; * or a TGS animation with the thumbnail up to 32 kilobytes in size;

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/UploadStickerFile.java
View File

@ -38,7 +38,7 @@ public class UploadStickerFile extends PartialBotApiMethod<File> {
public static final String PNGSTICKER_FIELD = "png_sticker"; public static final String PNGSTICKER_FIELD = "png_sticker";
@NonNull @NonNull
private Integer userId; ///< User identifier of sticker file owner private Long userId; ///< User identifier of sticker file owner
/** /**
* Png image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, * Png image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px,
* and either width or height must be exactly 512px. More info on Sending Files » * and either width or height must be exactly 512px. More info on Sending Files »

12
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java
View File

@ -45,6 +45,7 @@ public class Chat implements BotApiObject {
private static final String SLOWMODEDELAY_FIELD = "slow_mode_delay"; private static final String SLOWMODEDELAY_FIELD = "slow_mode_delay";
private static final String LINKEDCHATID_FIELD = "linked_chat_id"; private static final String LINKEDCHATID_FIELD = "linked_chat_id";
private static final String LOCATION_FIELD = "location"; private static final String LOCATION_FIELD = "location";
private static final String MESSAGEAUTODELETETIME_FIELD = "message_auto_delete_time";
private static final String USERCHATTYPE = "private"; private static final String USERCHATTYPE = "private";
private static final String GROUPCHATTYPE = "group"; private static final String GROUPCHATTYPE = "group";
@ -80,14 +81,8 @@ public class Chat implements BotApiObject {
private ChatPhoto photo; ///< Optional. Chat photo. Returned only in getChat. private ChatPhoto photo; ///< Optional. Chat photo. Returned only in getChat.
@JsonProperty(DESCRIPTION_FIELD) @JsonProperty(DESCRIPTION_FIELD)
private String description; ///< Optional. Description, for groups, supergroups and channel chats. Returned only in getChat. private String description; ///< Optional. Description, for groups, supergroups and channel chats. Returned only in getChat.
/**
* Optional. Chat invite link, for groups, supergroups and channel chats.
* Each administrator in a chat generates their own invite links, so the bot must first generate the link using
* exportChatInviteLink.
* Each Returned only in getChat.
*/
@JsonProperty(INVITELINK_FIELD) @JsonProperty(INVITELINK_FIELD)
private String inviteLink; private String inviteLink; ///< Optional. Primary invite link, for groups, supergroups and channel chats. Returned only in getChat.
@JsonProperty(PINNEDMESSAGE_FIELD) @JsonProperty(PINNEDMESSAGE_FIELD)
private Message pinnedMessage; ///< Optional. The most recent pinned message (by sending date). Returned only in getChat. private Message pinnedMessage; ///< Optional. The most recent pinned message (by sending date). Returned only in getChat.
@JsonProperty(STICKERSETNAME_FIELD) @JsonProperty(STICKERSETNAME_FIELD)
@ -119,6 +114,9 @@ public class Chat implements BotApiObject {
private Long linkedChatId; private Long linkedChatId;
@JsonProperty(LOCATION_FIELD) @JsonProperty(LOCATION_FIELD)
private ChatLocation location; ///< Optional. For supergroups, the location to which the supergroup is connected. Returned only in getChat. private ChatLocation location; ///< Optional. For supergroups, the location to which the supergroup is connected. Returned only in getChat.
@JsonProperty(MESSAGEAUTODELETETIME_FIELD)
private Integer messageAutoDeleteTime; ///< Optional. The time after which all messages sent to the chat will be automatically deleted; in seconds. Returned only in getChat.
@JsonIgnore @JsonIgnore
public Boolean isGroupChat() { public Boolean isGroupChat() {

53
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatInviteLink.java Normal file
View File

@ -0,0 +1,53 @@
package org.telegram.telegrambots.meta.api.objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
/**
* @author Ruben Bermudez
* @version 5.1
*
* Represents an invite link for a chat.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class ChatInviteLink implements BotApiObject {
private static final String INVITELINK_FIELD = "invite_link";
private static final String CREATOR_FIELD = "creator";
private static final String ISPRIMARY_FIELD = "is_primary";
private static final String ISREVOKED_FIELD = "is_revoked";
private static final String EXPIREDATE_FIELD = "expire_date";
private static final String MEMBERLIMIT_FIELD = "member_limit";
/**
* The invite link.
* If the link was created by another chat administrator, then the second part of the link will be replaced with “…”.
*/
@JsonProperty(INVITELINK_FIELD)
private String inviteLink;
@JsonProperty(CREATOR_FIELD)
private User creator; ///< Creator of the link
@JsonProperty(ISPRIMARY_FIELD)
private Boolean isPrimary; ///< True, if the link is primary
@JsonProperty(ISREVOKED_FIELD)
private Boolean isRevoked; ///< True, if the link is revoked
@JsonProperty(EXPIREDATE_FIELD)
private Integer expireDate; ///< Optional. Point in time (Unix timestamp) when the link will expire or has been expired
/**
* Optional.
*
* Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
*/
@JsonProperty(MEMBERLIMIT_FIELD)
private Integer memberLimit;
}

23
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMember.java
View File

@ -43,6 +43,8 @@ public class ChatMember implements BotApiObject {
private static final String ISMEMBER_FIELD = "is_member"; private static final String ISMEMBER_FIELD = "is_member";
private static final String CUSTOMTITLE_FIELD = "custom_title"; private static final String CUSTOMTITLE_FIELD = "custom_title";
private static final String ISANONYMOUS_FIELD = "is_anonymous"; private static final String ISANONYMOUS_FIELD = "is_anonymous";
private static final String CANMANAGECHAT_FIELD = "can_manage_chat";
private static final String CANMANAGEVOICECHATS_FIELD = "can_manage_voice_chats";
@JsonProperty(USER_FIELD) @JsonProperty(USER_FIELD)
private User user; ///< Information about the user private User user; ///< Information about the user
@ -84,6 +86,27 @@ public class ChatMember implements BotApiObject {
private String customTitle; ///< Optional. Owner and administrators only. Custom title for this user private String customTitle; ///< Optional. Owner and administrators only. Custom title for this user
@JsonProperty(ISANONYMOUS_FIELD) @JsonProperty(ISANONYMOUS_FIELD)
private Boolean isAnonymous; ///< Optional. Owner and administrators only. True, if the user's presence in the chat is hidden private Boolean isAnonymous; ///< Optional. Owner and administrators only. True, if the user's presence in the chat is hidden
/**
* Optional.
*
* Administrators only.
*
* True, if the administrator can access the chat event log, chat statistics, message statistics in channels,
* see channel members, see anonymous administrators in supergoups and ignore slow mode.
*
* Implied by any other administrator privilege
*/
@JsonProperty(CANMANAGECHAT_FIELD)
private Boolean canManageChat;
/**
* Optional.
*
* Administrators only.
*
* True, if the administrator can manage voice chats; groups and supergroups only
*/
@JsonProperty(CANMANAGEVOICECHATS_FIELD)
private Boolean canManageVoiceChats;
public Instant getUntilDateAsInstant() { public Instant getUntilDateAsInstant() {
if (untilDate == null) { if (untilDate == null) {

44
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMemberUpdated.java Normal file
View File

@ -0,0 +1,44 @@
package org.telegram.telegrambots.meta.api.objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
/**
* @author Ruben Bermudez
* @version 5.1
* This object represents changes in the status of a chat member.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class ChatMemberUpdated implements BotApiObject {
private static final String CHAT_FIELD = "chat";
private static final String FROM_FIELD = "from";
private static final String DATE_FIELD = "date";
private static final String OLDCHATMEMBER_FIELD = "old_chat_member";
private static final String NEWCHATMEMBER_FIELD = "new_chat_member";
private static final String INVITELINK_FIELD = "invite_link";
@JsonProperty(CHAT_FIELD)
private Chat chat; ///< Chat the user belongs to
@JsonProperty(FROM_FIELD)
private User from; ///< Performer of the action, which resulted in the change
@JsonProperty(DATE_FIELD)
private Integer date; ///< Date the change was done in Unix time
@JsonProperty(OLDCHATMEMBER_FIELD)
private ChatMember oldChatMember; ///< Previous information about the chat member
@JsonProperty(NEWCHATMEMBER_FIELD)
private ChatMember newChatMember; ///< New information about the chat member
@JsonProperty(INVITELINK_FIELD)
private ChatInviteLink inviteLink; ///< Optional. Chat invite link, which was used by the user to join the chat; for joining by invite link events only.
}

9
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Contact.java
View File

@ -34,8 +34,15 @@ public class Contact implements BotApiObject {
private String firstName; ///< Contact's first name private String firstName; ///< Contact's first name
@JsonProperty(LASTNAME_FIELD) @JsonProperty(LASTNAME_FIELD)
private String lastName; ///< Optional. Contact's last name private String lastName; ///< Optional. Contact's last name
/**
* Optional.
* Contact's user identifier in Telegram.
*
* @apiNote This number may have more than 32 significant bits and some programming languages may have difficulty/silent defects in interpreting it.
* But it has at most 52 significant bits, so a 64-bit integer or double-precision float type are safe for storing this identifier.
*/
@JsonProperty(USERID_FIELD) @JsonProperty(USERID_FIELD)
private Integer userID; ///< Optional. Contact's user identifier in Telegram private Long userId; ///< Optional. Contact's user identifier in Telegram
@JsonProperty(VCARD_FIELD) @JsonProperty(VCARD_FIELD)
private String vCard; ///< Optional. Additional data about the contact in the form of a vCard private String vCard; ///< Optional. Additional data about the contact in the form of a vCard
} }

6
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Dice.java
View File

@ -25,9 +25,9 @@ public class Dice implements BotApiObject {
private static final String EMOJI_FIELD = "emoji"; private static final String EMOJI_FIELD = "emoji";
/** /**
* Value of the dice: * Value of the dice,
* 1-6 for “🎲” and “🎯” base emoji * 1-6 for “🎲”, “🎯” and “🎳” base emoji,
* 1-5 for “🏀” and “⚽” base emoji * 1-5 for “🏀” and “⚽” base emoji,
* 1-64 for “🎰” base emoji * 1-64 for “🎰” base emoji
*/ */
@JsonProperty(VALUE_FIELD) @JsonProperty(VALUE_FIELD)

36
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Message.java
View File

@ -17,6 +17,9 @@ import org.telegram.telegrambots.meta.api.objects.payments.SuccessfulPayment;
import org.telegram.telegrambots.meta.api.objects.polls.Poll; import org.telegram.telegrambots.meta.api.objects.polls.Poll;
import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
import org.telegram.telegrambots.meta.api.objects.stickers.Sticker; import org.telegram.telegrambots.meta.api.objects.stickers.Sticker;
import org.telegram.telegrambots.meta.api.objects.voicechat.VoiceChatEnded;
import org.telegram.telegrambots.meta.api.objects.voicechat.VoiceChatParticipantsInvited;
import org.telegram.telegrambots.meta.api.objects.voicechat.VoiceChatStarted;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -84,6 +87,10 @@ public class Message implements BotApiObject {
private static final String VIABOT_FIELD = "via_bot"; private static final String VIABOT_FIELD = "via_bot";
private static final String SENDERCHAT_FIELD = "sender_chat"; private static final String SENDERCHAT_FIELD = "sender_chat";
private static final String PROXIMITYALERTTRIGGERED_FIELD = "proximity_alert_triggered"; private static final String PROXIMITYALERTTRIGGERED_FIELD = "proximity_alert_triggered";
private static final String MESSAGEAUTODELETETIMERCHANGED_FIELD = "message_auto_delete_timer_changed\t";
private static final String VOICECHATSTARTED_FIELD = "voice_chat_started";
private static final String VOICECHATENDED_FIELD = "voice_chat_ended";
private static final String VOICECHATPARTICIPANTSINVITED_FIELD = "voice_chat_participants_invited";
@JsonProperty(MESSAGEID_FIELD) @JsonProperty(MESSAGEID_FIELD)
private Integer messageId; ///< Integer Unique message identifier private Integer messageId; ///< Integer Unique message identifier
@ -251,6 +258,15 @@ public class Message implements BotApiObject {
*/ */
@JsonProperty(PROXIMITYALERTTRIGGERED_FIELD) @JsonProperty(PROXIMITYALERTTRIGGERED_FIELD)
private ProximityAlertTriggered proximityAlertTriggered; private ProximityAlertTriggered proximityAlertTriggered;
@JsonProperty(MESSAGEAUTODELETETIMERCHANGED_FIELD)
private MessageAutoDeleteTimerChanged messageAutoDeleteTimerChanged; ///< Optional. Service message: auto-delete timer settings changed in the chat
@JsonProperty(VOICECHATSTARTED_FIELD)
private VoiceChatStarted voiceChatStarted; ///< Optional. Service message: voice chat started
@JsonProperty(VOICECHATENDED_FIELD)
private VoiceChatEnded voiceChatEnded; ///< Optional. Service message: voice chat ended
@JsonProperty(VOICECHATPARTICIPANTSINVITED_FIELD)
private VoiceChatParticipantsInvited voiceChatParticipantsInvited; ///< Optional. Service message: new members invited to a voice chat
public List<MessageEntity> getEntities() { public List<MessageEntity> getEntities() {
if (entities != null) { if (entities != null) {
@ -413,4 +429,24 @@ public class Message implements BotApiObject {
public boolean hasReplyMarkup() { public boolean hasReplyMarkup() {
return replyMarkup != null; return replyMarkup != null;
} }
@JsonIgnore
private boolean hasMessageAutoDeleteTimerChanged() {
return messageAutoDeleteTimerChanged != null;
}
@JsonIgnore
private boolean hasVoiceChatStarted() {
return voiceChatStarted != null;
}
@JsonIgnore
private boolean hasVoiceChatEnded() {
return voiceChatEnded != null;
}
@JsonIgnore
private boolean hasVoiceChatParticipantsInvited() {
return voiceChatParticipantsInvited != null;
}
} }

29
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageAutoDeleteTimerChanged.java Normal file
View File

@ -0,0 +1,29 @@
package org.telegram.telegrambots.meta.api.objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
/**
* @author Ruben Bermudez
* @version 5.1
*
* This object represents a service message about a change in auto-delete timer settings.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class MessageAutoDeleteTimerChanged implements BotApiObject {
private static final String MESSAGEAUTODELETETIME_FIELD = "message_auto_delete_time";
@JsonProperty(MESSAGEAUTODELETETIME_FIELD)
private Integer messageAutoDeleteTime; ///< New auto-delete time for messages in the chat
}

26
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Update.java
View File

@ -42,6 +42,8 @@ public class Update implements BotApiObject {
private static final String PRE_CHECKOUT_QUERY_FIELD = "pre_checkout_query"; private static final String PRE_CHECKOUT_QUERY_FIELD = "pre_checkout_query";
private static final String POLL_FIELD = "poll"; private static final String POLL_FIELD = "poll";
private static final String POLLANSWER_FIELD = "poll_answer"; private static final String POLLANSWER_FIELD = "poll_answer";
private static final String MYCHATMEMBER_FIELD = "my_chat_member";
private static final String CHATMEMBER_FIELD = "chat_member";
@JsonProperty(UPDATEID_FIELD) @JsonProperty(UPDATEID_FIELD)
private Integer updateId; private Integer updateId;
@ -73,6 +75,22 @@ public class Update implements BotApiObject {
*/ */
@JsonProperty(POLLANSWER_FIELD) @JsonProperty(POLLANSWER_FIELD)
private PollAnswer pollAnswer; private PollAnswer pollAnswer;
/**
* Optional.
*
* The bot's chat member status was updated in a chat.
* For private chats, this update is received only when the bot is blocked or unblocked by the user.
*/
@JsonProperty(MYCHATMEMBER_FIELD)
private ChatMemberUpdated myChatMember;
/**
* Optional.
*
* A chat member's status was updated in a chat.
* The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowed_updates to receive these updates.
*/
@JsonProperty(CHATMEMBER_FIELD)
private ChatMemberUpdated chatMember;
public boolean hasMessage() { public boolean hasMessage() {
return message != null; return message != null;
@ -117,4 +135,12 @@ public class Update implements BotApiObject {
public boolean hasPollAnswer() { public boolean hasPollAnswer() {
return pollAnswer != null; return pollAnswer != null;
} }
public boolean hasMyChatMember() {
return myChatMember != null;
}
public boolean hasChatMember() {
return chatMember != null;
}
} }

8
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java
View File

@ -35,9 +35,15 @@ public class User implements BotApiObject {
private static final String CANREADALLGROUPMESSAGES_FIELD = "can_read_all_group_messages"; private static final String CANREADALLGROUPMESSAGES_FIELD = "can_read_all_group_messages";
private static final String SUPPORTINLINEQUERIES_FIELD = "supports_inline_queries"; private static final String SUPPORTINLINEQUERIES_FIELD = "supports_inline_queries";
/**
* Unique identifier for this user or bot.
*
* @apiNote This number may have more than 32 significant bits and some programming languages may have difficulty/silent defects in interpreting it.
* But it has at most 52 significant bits, so a 64-bit integer or double-precision float type are safe for storing this identifier.
*/
@JsonProperty(ID_FIELD) @JsonProperty(ID_FIELD)
@NonNull @NonNull
private Integer id; ///< Unique identifier for this user or bot private Long id; ///< Unique identifier for this user or bot
@JsonProperty(FIRSTNAME_FIELD) @JsonProperty(FIRSTNAME_FIELD)
@NonNull @NonNull
private String firstName; ///< User‘s or bot’s first name private String firstName; ///< User‘s or bot’s first name

2
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResult.java
View File

@ -9,6 +9,8 @@ import org.telegram.telegrambots.meta.api.objects.inlinequery.result.serializati
* @author Ruben Bermudez * @author Ruben Bermudez
* @version 1.0 * @version 1.0
* This object represents one result of an inline query. * This object represents one result of an inline query.
*
* @apiNote All URLs passed in inline query results will be available to end users and therefore must be assumed to be public.
*/ */
@JsonDeserialize(using = InlineQueryResultDeserializer.class) @JsonDeserialize(using = InlineQueryResultDeserializer.class)
public interface InlineQueryResult extends Validable, BotApiObject { public interface InlineQueryResult extends Validable, BotApiObject {

29
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/voicechat/VoiceChatEnded.java Normal file
View File

@ -0,0 +1,29 @@
package org.telegram.telegrambots.meta.api.objects.voicechat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
/**
* @author Ruben Bermudez
* @version 5.1
*
* This object represents a service message about a voice chat ended in the chat.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class VoiceChatEnded implements BotApiObject {
private static final String DURATION_FIELD = "duration";
@JsonProperty(DURATION_FIELD)
private Integer duration; ///< Voice chat duration; in seconds
}

33
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/voicechat/VoiceChatParticipantsInvited.java Normal file
View File

@ -0,0 +1,33 @@
package org.telegram.telegrambots.meta.api.objects.voicechat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
import org.telegram.telegrambots.meta.api.objects.User;
import java.util.List;
/**
* @author Ruben Bermudez
* @version 5.1
*
* This object represents a service message about new members invited to a voice chat.
*
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class VoiceChatParticipantsInvited implements BotApiObject {
private static final String USERS_FIELD = "users";
@JsonProperty(USERS_FIELD)
private List<User> users; ///< Optional. New members that were invited to the voice chat
}

24
telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/voicechat/VoiceChatStarted.java Normal file
View File

@ -0,0 +1,24 @@
package org.telegram.telegrambots.meta.api.objects.voicechat;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
/**
* @author Ruben Bermudez
* @version 5.1
*
* This object represents a service message about a voice chat started in the chat.
*
* Currently holds no information.
*/
@EqualsAndHashCode(callSuper = false)
@Getter
@Setter
@ToString
@NoArgsConstructor
public class VoiceChatStarted implements BotApiObject {
}

171
telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestDeserialization.java
View File

@ -1,5 +1,6 @@
package org.telegram.telegrambots.meta.test; package org.telegram.telegrambots.meta.test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -28,7 +29,9 @@ import org.telegram.telegrambots.meta.api.objects.inlinequery.InlineQuery;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
@ -63,12 +66,24 @@ class TestDeserialization {
"\"message\":{\"message_id\":6,\"from\":{\"id\":1234567,\"is_bot\":false,\"first_name\":\"MyFirstName\",\"username\":\"MyUsername\",\"language_code\":\"en\"},\"chat\":{\"id\":-1556359722345678,\"title\":\"test group\",\"type\":\"supergroup\"},\"date\":1604163105,\"new_chat_members\":[{\"id\":123455678,\"is_bot\":true,\"first_name\":\"Testing\",\"username\":\"TestingBot\"}]}}]}"; "\"message\":{\"message_id\":6,\"from\":{\"id\":1234567,\"is_bot\":false,\"first_name\":\"MyFirstName\",\"username\":\"MyUsername\",\"language_code\":\"en\"},\"chat\":{\"id\":-1556359722345678,\"title\":\"test group\",\"type\":\"supergroup\"},\"date\":1604163105,\"new_chat_members\":[{\"id\":123455678,\"is_bot\":true,\"first_name\":\"Testing\",\"username\":\"TestingBot\"}]}}]}";
ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText); ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText);
assertEquals(11, response.size());
JsonNode realArray = mapper.readTree(updateText).get("result"); JsonNode realArray = mapper.readTree(updateText).get("result");
assertUpdates(response, realArray);
}
private void assertUpdates(ArrayList<Update> response, JsonNode realArray) throws JsonProcessingException {
Map<Integer, JsonNode> updateMap = new HashMap<>();
for (int i = 0; i < realArray.size(); i++) { for (int i = 0; i < realArray.size(); i++) {
JsonNode handledUpdate = mapper.readTree(mapper.writeValueAsString(response.get(i))); JsonNode update = realArray.get(i);
JsonNode realUpdate = realArray.get(i); updateMap.put(update.get("update_id").asInt(), update);
}
for (Update update : response) {
Integer updateId = update.getUpdateId();
JsonNode realUpdate = updateMap.get(updateId);
JsonNode handledUpdate = mapper.readTree(mapper.writeValueAsString(update));
assertEquals(realUpdate, handledUpdate); assertEquals(realUpdate, handledUpdate);
} }
} }
@ -84,14 +99,10 @@ class TestDeserialization {
"\"message\":{\"message_id\":106,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"Username\",\"language_code\":\"en\"},\"chat\":{\"id\":12345678,\"first_name\":\"FirstName\",\"username\":\"Username\",\"type\":\"private\"},\"date\":1604226480,\"document\":{\"file_name\":\"aaa.txt\",\"mime_type\":\"text/plain\",\"file_id\":\"FILEID\",\"file_unique_id\":\"AgADiQEAAjTe-VQ\",\"file_size\":2}}}]}"; "\"message\":{\"message_id\":106,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"Username\",\"language_code\":\"en\"},\"chat\":{\"id\":12345678,\"first_name\":\"FirstName\",\"username\":\"Username\",\"type\":\"private\"},\"date\":1604226480,\"document\":{\"file_name\":\"aaa.txt\",\"mime_type\":\"text/plain\",\"file_id\":\"FILEID\",\"file_unique_id\":\"AgADiQEAAjTe-VQ\",\"file_size\":2}}}]}";
ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText); ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText);
assertEquals(6, response.size());
JsonNode realArray = mapper.readTree(updateText).get("result"); JsonNode realArray = mapper.readTree(updateText).get("result");
assertUpdates(response, realArray);
for (int i = 0; i < realArray.size(); i++) {
JsonNode handledUpdate = mapper.readTree(mapper.writeValueAsString(response.get(i)));
JsonNode realUpdate = realArray.get(i);
assertEquals(realUpdate, handledUpdate);
}
} }
@Test @Test
@ -119,14 +130,14 @@ class TestDeserialization {
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282110,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":83,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894322,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282110,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":83,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894322,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282114,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":95,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894323,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282114,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":95,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894323,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282118,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":99,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894324,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282118,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":99,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894324,\n" +
"\"message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"Turing\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800}}},{\"update_id\":259894325,\n" + "\"message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"LastName\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800}}},{\"update_id\":259894325,\n" +
"\"message\":{\"message_id\":10,\"from\":{\"id\":12345678,\"is_bot\":true,\"first_name\":\"Group\",\"username\":\"GroupAnonymousBot\"},\"sender_chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"proximity_alert_triggered\":{\"traveler\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"Turing\",\"username\":\"Username\"},\"watcher\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"distance\":0}}},{\"update_id\":259894326,\n" + "\"message\":{\"message_id\":10,\"from\":{\"id\":12345678,\"is_bot\":true,\"first_name\":\"Group\",\"username\":\"GroupAnonymousBot\"},\"sender_chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"proximity_alert_triggered\":{\"traveler\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"LastName\",\"username\":\"Username\"},\"watcher\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"distance\":0}}},{\"update_id\":259894326,\n" +
"\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"Turing\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282124,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894327,\n" + "\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"LastName\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282124,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894327,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282126,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":104,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894328,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282126,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":104,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894328,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282128,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":100,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894329,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282128,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":100,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894329,\n" +
"\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"Turing\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282128,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"heading\":101,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894330,\n" + "\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"LastName\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282128,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"heading\":101,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894330,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282132,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894331,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282132,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894331,\n" +
"\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"Turing\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282132,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894332,\n" + "\"edited_message\":{\"message_id\":9,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"last_name\":\"LastName\",\"username\":\"Username\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282124,\"edit_date\":1604282132,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":28800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894332,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282136,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":102,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894333,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282136,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":102,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894333,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282140,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894334,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282140,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":106,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894334,\n" +
"\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282144,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":99,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894335,\n" + "\"edited_message\":{\"message_id\":8,\"from\":{\"id\":12345678,\"is_bot\":false,\"first_name\":\"FirstName\",\"username\":\"FirstName\",\"language_code\":\"en\"},\"chat\":{\"id\":-10011869112345,\"title\":\"My new test group\",\"type\":\"supergroup\"},\"date\":1604282102,\"edit_date\":1604282144,\"location\":{\"latitude\":0.004822,\"longitude\":-0.004822,\"live_period\":1800,\"heading\":99,\"horizontal_accuracy\":65.000000}}},{\"update_id\":259894335,\n" +
@ -147,14 +158,134 @@ class TestDeserialization {
ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText); ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText);
assertEquals(47, response.size());
JsonNode realArray = mapper.readTree(updateText).get("result"); JsonNode realArray = mapper.readTree(updateText).get("result");
assertUpdates(response, realArray);
}
for (int i = 0; i < realArray.size(); i++) { @Test
JsonNode handledUpdate = mapper.readTree(mapper.writeValueAsString(response.get(i))); void TestListUpdatesVoiceChat() throws Exception {
JsonNode realUpdate = realArray.get(i); String updateText = "{\n" +
assertEquals(realUpdate, handledUpdate); " \"ok\": true,\n" +
} " \"result\": [\n" +
" {\n" +
" \"update_id\": 259939677,\n" +
" \"message\": {\n" +
" \"message_id\": 1,\n" +
" \"from\": {\n" +
" \"id\": 1111111111111111,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"TestUser\",\n" +
" \"username\": \"TestUser\"\n" +
" },\n" +
" \"chat\": {\n" +
" \"id\": -552721116,\n" +
" \"title\": \"Random test\",\n" +
" \"type\": \"group\",\n" +
" \"all_members_are_administrators\": false\n" +
" },\n" +
" \"date\": 1615072605,\n" +
" \"group_chat_created\": true\n" +
" }\n" +
" },\n" +
" {\n" +
" \"update_id\": 259939678,\n" +
" \"message\": {\n" +
" \"message_id\": 2,\n" +
" \"from\": {\n" +
" \"id\": 1111111111111111,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"TestUser\",\n" +
" \"username\": \"TestUser\"\n" +
" },\n" +
" \"chat\": {\n" +
" \"id\": -552721116,\n" +
" \"title\": \"Random test\",\n" +
" \"type\": \"group\",\n" +
" \"all_members_are_administrators\": false\n" +
" },\n" +
" \"date\": 1615072631,\n" +
" \"migrate_to_chat_id\": -1001308316775\n" +
" }\n" +
" },\n" +
" {\n" +
" \"update_id\": 259939679,\n" +
" \"message\": {\n" +
" \"message_id\": 2,\n" +
" \"from\": {\n" +
" \"id\": 1111111111111111,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"TestUser\",\n" +
" \"username\": \"TestUser\"\n" +
" },\n" +
" \"chat\": {\n" +
" \"id\": -1001308316775,\n" +
" \"title\": \"Random test\",\n" +
" \"type\": \"supergroup\"\n" +
" },\n" +
" \"date\": 1615072662,\n" +
" \"voice_chat_started\": {}\n" +
" }\n" +
" },\n" +
" {\n" +
" \"update_id\": 259939680,\n" +
" \"message\": {\n" +
" \"message_id\": 3,\n" +
" \"from\": {\n" +
" \"id\": 1111111111111111,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"TestUser\",\n" +
" \"username\": \"TestUser\"\n" +
" },\n" +
" \"chat\": {\n" +
" \"id\": -1001308316775,\n" +
" \"title\": \"Random test\",\n" +
" \"type\": \"supergroup\"\n" +
" },\n" +
" \"date\": 1615072671,\n" +
" \"voice_chat_participants_invited\": {\n" +
" \"users\": [\n" +
" {\n" +
" \"id\": 222222222222222,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"Test\",\n" +
" \"last_name\": \"User\",\n" +
" \"username\": \"TestUser\"\n" +
" }\n" +
" ]\n" +
" }\n" +
" }\n" +
" },\n" +
" {\n" +
" \"update_id\": 259939681,\n" +
" \"message\": {\n" +
" \"message_id\": 4,\n" +
" \"from\": {\n" +
" \"id\": 1111111111111111,\n" +
" \"is_bot\": false,\n" +
" \"first_name\": \"TestUser\",\n" +
" \"username\": \"TestUser\"\n" +
" },\n" +
" \"chat\": {\n" +
" \"id\": -1001308316775,\n" +
" \"title\": \"Random test\",\n" +
" \"type\": \"supergroup\"\n" +
" },\n" +
" \"date\": 1615072919,\n" +
" \"voice_chat_ended\": {\n" +
" \"duration\": 257\n" +
" }\n" +
" }\n" +
" }\n" +
" ]\n" +
"}";
ArrayList<Update> response = new GetUpdates().deserializeResponse(updateText);
assertEquals(5, response.size());
JsonNode realArray = mapper.readTree(updateText).get("result");
assertUpdates(response, realArray);
} }
@Test @Test
@ -363,7 +494,7 @@ class TestDeserialization {
assertNotNull(forwardFrom); assertNotNull(forwardFrom);
assertEquals("ForwardLastname", forwardFrom.getLastName()); assertEquals("ForwardLastname", forwardFrom.getLastName());
assertEquals("ForwardFirstname", forwardFrom.getFirstName()); assertEquals("ForwardFirstname", forwardFrom.getFirstName());
assertEquals(Integer.valueOf(222222), forwardFrom.getId()); assertEquals(Long.valueOf(222222), forwardFrom.getId());
} }
private void assertPrivateChat(Chat chat) { private void assertPrivateChat(Chat chat) {
@ -413,7 +544,7 @@ class TestDeserialization {
private void assertFromUser(User from) { private void assertFromUser(User from) {
assertNotNull(from); assertNotNull(from);
assertEquals((Integer) 1111111, from.getId()); assertEquals((Long) 1111111L, from.getId());
assertEquals("Test Lastname", from.getLastName()); assertEquals("Test Lastname", from.getLastName());
assertEquals("Test Firstname", from.getFirstName()); assertEquals("Test Firstname", from.getFirstName());
assertEquals("Testusername", from.getUserName()); assertEquals("Testusername", from.getUserName());

2
telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestSetGameScore.java
View File

@ -30,7 +30,7 @@ class TestSetGameScore {
setGameScore.setDisableEditMessage(true); setGameScore.setDisableEditMessage(true);
setGameScore.setMessageId(54321); setGameScore.setMessageId(54321);
setGameScore.setScore(12); setGameScore.setScore(12);
setGameScore.setUserId(98765); setGameScore.setUserId(98765L);
} }
@Test @Test

4
telegrambots-spring-boot-starter/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambots-spring-boot-starter</artifactId> <artifactId>telegrambots-spring-boot-starter</artifactId>
@ -70,7 +70,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<telegrambots.version>5.0.1</telegrambots.version> <telegrambots.version>5.1.0</telegrambots.version>
<spring-boot.version>2.4.3</spring-boot.version> <spring-boot.version>2.4.3</spring-boot.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>

5
telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotInitializer.java
View File

@ -4,9 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.telegram.telegrambots.meta.TelegramBotsApi; import org.telegram.telegrambots.meta.TelegramBotsApi;
import org.telegram.telegrambots.meta.api.objects.ApiResponse;
import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
import org.telegram.telegrambots.meta.generics.BotSession; import org.telegram.telegrambots.meta.generics.BotSession;
import org.telegram.telegrambots.meta.generics.LongPollingBot; import org.telegram.telegrambots.meta.generics.LongPollingBot;
@ -56,9 +54,6 @@ public class TelegramBotInitializer implements InitializingBean {
private void handleAnnotatedMethod(Object bot, Method method, BotSession session) { private void handleAnnotatedMethod(Object bot, Method method, BotSession session) {
try { try {
TelegramApiRequestException test = new TelegramApiRequestException("Error getting updates", new ApiResponse());
log.error(test.getMessage(), test);
if (method.getParameterCount() > 1) { if (method.getParameterCount() > 1) {
log.warn(format("Method %s of Type %s has too many parameters", log.warn(format("Method %s of Type %s has too many parameters",
method.getName(), method.getDeclaringClass().getCanonicalName())); method.getName(), method.getDeclaringClass().getCanonicalName()));

4
telegrambots/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>Bots</artifactId> <artifactId>Bots</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</parent> </parent>
<artifactId>telegrambots</artifactId> <artifactId>telegrambots</artifactId>
@ -92,7 +92,7 @@
<dependency> <dependency>
<groupId>org.telegram</groupId> <groupId>org.telegram</groupId>
<artifactId>telegrambots-meta</artifactId> <artifactId>telegrambots-meta</artifactId>
<version>5.0.1</version> <version>5.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

12
telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java
View File

@ -155,7 +155,7 @@ public final class BotApiMethodHelperFactory {
return GetChatMember return GetChatMember
.builder() .builder()
.chatId("12345") .chatId("12345")
.userId(98765) .userId(98765L)
.build(); .build();
} }
@ -178,7 +178,7 @@ public final class BotApiMethodHelperFactory {
.builder() .builder()
.chatId("12345") .chatId("12345")
.messageId(67890) .messageId(67890)
.userId(98765) .userId(98765L)
.build(); .build();
} }
@ -189,7 +189,7 @@ public final class BotApiMethodHelperFactory {
public static BotApiMethod<UserProfilePhotos> getGetUserProfilePhotos() { public static BotApiMethod<UserProfilePhotos> getGetUserProfilePhotos() {
return GetUserProfilePhotos return GetUserProfilePhotos
.builder() .builder()
.userId(98765) .userId(98765L)
.limit(10) .limit(10)
.offset(3) .offset(3)
.build(); .build();
@ -203,7 +203,7 @@ public final class BotApiMethodHelperFactory {
return KickChatMember return KickChatMember
.builder() .builder()
.chatId("12345") .chatId("12345")
.userId(98765) .userId(98765L)
.build(); .build();
} }
@ -344,7 +344,7 @@ public final class BotApiMethodHelperFactory {
.inlineMessageId("12345") .inlineMessageId("12345")
.disableEditMessage(true) .disableEditMessage(true)
.score(12) .score(12)
.userId(98765) .userId(98765L)
.build(); .build();
} }
@ -352,7 +352,7 @@ public final class BotApiMethodHelperFactory {
return UnbanChatMember return UnbanChatMember
.builder() .builder()
.chatId("12345") .chatId("12345")
.userId(98765) .userId(98765L)
.build(); .build();
} }