diff --git a/README.md b/README.md index 7a080de0..688eab46 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,18 @@ Just import add the library to your project with one of these options: org.telegram telegrambots - 6.6.0 + 6.7.0 ``` 2. Using Gradle: ```gradle - implementation 'org.telegram:telegrambots:6.6.0' + implementation 'org.telegram:telegrambots:6.7.0' ``` - 3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/6.6.0) - 4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/6.6.0) + 3. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/6.7.0) + 4. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/6.7.0) In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`. diff --git a/TelegramBots.wiki/Getting-Started.md b/TelegramBots.wiki/Getting-Started.md index 44f3c6a6..62aeb066 100644 --- a/TelegramBots.wiki/Getting-Started.md +++ b/TelegramBots.wiki/Getting-Started.md @@ -11,13 +11,13 @@ First you need to acquire the library and add it to your project. There are seve org.telegram telegrambots - 6.6.0 + 6.7.0 ``` * With **Gradle**: ```gradle - implementation 'org.telegram:telegrambots:6.6.0' + implementation 'org.telegram:telegrambots:6.7.0' ``` 2. Don't like the **Maven Central Repository**? It can also be grabbed from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots). diff --git a/TelegramBots.wiki/abilities/Simple-Example.md b/TelegramBots.wiki/abilities/Simple-Example.md index a1bee4c1..51446b6e 100644 --- a/TelegramBots.wiki/abilities/Simple-Example.md +++ b/TelegramBots.wiki/abilities/Simple-Example.md @@ -9,12 +9,12 @@ As with any Java project, you will need to set your dependencies. org.telegram telegrambots-abilities - 6.6.0 + 6.7.0 ``` * **Gradle** ```gradle - implementation 'org.telegram:telegrambots-abilities:6.6.0' + implementation 'org.telegram:telegrambots-abilities:6.7.0' ``` * [JitPack](https://jitpack.io/#rubenlagus/TelegramBots) diff --git a/pom.xml b/pom.xml index 3d65fba6..6678aeba 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 6.6.0 + 6.7.0 telegrambots diff --git a/telegrambots-abilities/README.md b/telegrambots-abilities/README.md index 43f333a1..126e393e 100644 --- a/telegrambots-abilities/README.md +++ b/telegrambots-abilities/README.md @@ -18,14 +18,14 @@ Usage org.telegram telegrambots-abilities - 6.6.0 + 6.7.0 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-abilities:6.6.0' + implementation 'org.telegram:telegrambots-abilities:6.7.0' ``` **JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v5.0.1) diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index 799cf39b..26d6b708 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambots-abilities @@ -84,7 +84,7 @@ org.telegram telegrambots - 6.6.0 + 6.7.0 org.apache.commons diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java index 8b2303b5..37fd8fc7 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java @@ -3,7 +3,7 @@ package org.telegram.abilitybots.api.objects; import org.telegram.abilitybots.api.objects.Ability.AbilityBuilder; import org.telegram.telegrambots.meta.api.objects.Update; -import java.util.function.Consumer; +import java.util.function.BiConsumer; import java.util.function.Predicate; import static java.util.Objects.nonNull; @@ -11,7 +11,7 @@ import static java.util.Objects.nonNull; /** * Flags are an conditions that are applied on an {@link Update}. *

- * They can be used on {@link AbilityBuilder#flag(Predicate[])} and on the post conditions in {@link AbilityBuilder#reply(Consumer, Predicate[])}. + * They can be used on {@link AbilityBuilder#flag(Predicate[])} and on the post conditions in {@link AbilityBuilder#reply(BiConsumer, Predicate[])}. * * @author Abbas Abou Daya */ diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java index 8ba939ab..3cbb47d0 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.BiFunction; -import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; @@ -18,7 +17,7 @@ import static com.google.common.collect.Lists.newArrayList; /** * A reply consists of update conditionals and an action to be applied on the update. *

- * If an update satisfies the {@link Reply#conditions} set by the reply, then it's safe to {@link Reply#actOn(Update)}. + * If an update satisfies the {@link Reply#conditions} set by the reply, then it's safe to {@link Reply#actOn(BaseAbilityBot, Update)}. * * @author Abbas Abou Daya */ diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/ReplyFlow.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/ReplyFlow.java index d2148464..8eeda9e4 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/ReplyFlow.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/ReplyFlow.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; -import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Stream; diff --git a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java index a40fb0c3..219fbea4 100644 --- a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java +++ b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java @@ -14,7 +14,10 @@ import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.only; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; class SilentSenderTest { private SilentSender silent; @@ -55,7 +58,7 @@ class SilentSenderTest { verify(sender, only()).executeAsync(methodObject, callback); } - private class NoOpCallback implements SentCallback { + private static class NoOpCallback implements SentCallback { @Override public void onResult(BotApiMethod method, Message response) { diff --git a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/toggle/CustomToggleTest.java b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/toggle/CustomToggleTest.java index e2b131f3..5ae9a0d1 100644 --- a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/toggle/CustomToggleTest.java +++ b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/toggle/CustomToggleTest.java @@ -7,12 +7,14 @@ import org.telegram.abilitybots.api.bot.DefaultAbilities; import org.telegram.abilitybots.api.bot.DefaultBot; import org.telegram.abilitybots.api.db.DBContext; -import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Properties; import static org.apache.commons.lang3.StringUtils.EMPTY; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.telegram.abilitybots.api.db.MapDBContext.offlineInstance; class CustomToggleTest { @@ -55,7 +57,7 @@ class CustomToggleTest { public void canTurnOffAbilitiesThroughProperties() { Properties properties = new Properties(); try { - properties.load(new FileInputStream(filename)); + properties.load(Files.newInputStream(Paths.get(filename))); toggle = new CustomToggle().config(properties); } catch (IOException e) { System.out.println("No such file"); @@ -71,7 +73,7 @@ class CustomToggleTest { public void canProcessAbilitiesThroughProperties() { Properties properties = new Properties(); try { - properties.load(new FileInputStream(filename)); + properties.load(Files.newInputStream(Paths.get(filename))); toggle = new CustomToggle().config(properties); } catch (IOException e) { System.out.println("No such file"); diff --git a/telegrambots-chat-session-bot/README.md b/telegrambots-chat-session-bot/README.md index dc73fb74..662617f5 100644 --- a/telegrambots-chat-session-bot/README.md +++ b/telegrambots-chat-session-bot/README.md @@ -15,14 +15,14 @@ Usage org.telegram telegrambots-chat-session-bot - 6.6.0 + 6.7.0 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-chat-session-bot:6.6.0' + implementation 'org.telegram:telegrambots-chat-session-bot:6.7.0' ``` Motivation diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml index ae386dda..b2b1f4ab 100644 --- a/telegrambots-chat-session-bot/pom.xml +++ b/telegrambots-chat-session-bot/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambots-chat-session-bot @@ -84,7 +84,7 @@ org.telegram telegrambots - 6.6.0 + 6.7.0 diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md index 29d18fed..b063b563 100644 --- a/telegrambots-extensions/README.md +++ b/telegrambots-extensions/README.md @@ -16,12 +16,12 @@ Just import add the library to your project with one of these options: org.telegram telegrambotsextensions - 6.6.0 + 6.7.0 ``` 2. Using Gradle: ```gradle - implementation 'org.telegram:telegrambotsextensions:6.6.0' + implementation 'org.telegram:telegrambotsextensions:6.7.0' ``` \ No newline at end of file diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index b1289474..bd0c2e98 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambotsextensions @@ -75,7 +75,7 @@ org.telegram telegrambots - 6.6.0 + 6.7.0 diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/commands/helpCommand/HelpCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/commands/helpCommand/HelpCommand.java index cddf610a..a2f0bc81 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/commands/helpCommand/HelpCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/extensions/bots/commandbot/commands/helpCommand/HelpCommand.java @@ -42,7 +42,7 @@ public class HelpCommand extends ManCommand { * @return a formatted String containing command and description for all supplied commands */ public static String getHelpText(Collection botCommands) { - return getHelpText(botCommands.toArray(new IBotCommand[botCommands.size()])); + return getHelpText(botCommands.toArray(new IBotCommand[0])); } /** diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index fac6f7db..d309d5b1 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambots-meta diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java index 8109182a..ab87c0d4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBool @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java index 73c6429e..bd7af115 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java @@ -11,8 +11,10 @@ import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.Singular; import lombok.ToString; +import lombok.extern.jackson.Jacksonized; import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBoolean; import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultsButton; import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.List; @@ -27,9 +29,10 @@ import java.util.regex.Pattern; @Getter @Setter @ToString -@NoArgsConstructor @RequiredArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor +@Jacksonized @Builder public class AnswerInlineQuery extends BotApiMethodBoolean { public static final String PATH = "answerInlineQuery"; @@ -41,6 +44,7 @@ public class AnswerInlineQuery extends BotApiMethodBoolean { private static final String NEXTOFFSET_FIELD = "next_offset"; private static final String SWITCH_PM_TEXT_FIELD = "switch_pm_text"; private static final String SWITCH_PM_PARAMETER_FIELD = "switch_pm_parameter"; + private static final String BUTTON_FIELD = "button"; @JsonProperty(INLINEQUERYID_FIELD) @NonNull @@ -55,19 +59,39 @@ public class AnswerInlineQuery extends BotApiMethodBoolean { private Boolean isPersonal; ///< Pass True, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query @JsonProperty(NEXTOFFSET_FIELD) private String nextOffset; ///< Optional. Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don‘t support pagination. Offset length can’t exceed 64 bytes. + + /** + * Optional. + * If passed, clients will display a button with specified text that switches the user to a private chat with the + * bot and sends the bot a start message with the parameter switch_pm_parameter + * + * @deprecated Use {@link #setButton(InlineQueryResultsButton)} + */ @JsonProperty(SWITCH_PM_TEXT_FIELD) - private String switchPmText; ///< Optional. If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter switch_pm_parameter + @Deprecated + private String switchPmText; + /** + * Optional. + * Parameter for the start message sent to the bot when user presses the switch button + * + * @deprecated Use {@link #setButton(InlineQueryResultsButton)} + */ @JsonProperty(SWITCH_PM_PARAMETER_FIELD) - private String switchPmParameter; ///< Optional. Parameter for the start message sent to the bot when user presses the switch button + @Deprecated + private String switchPmParameter; + + /** + * Optional. + * A JSON serialized object describing a button to be shown above inline query results + */ + @JsonProperty(BUTTON_FIELD) + private InlineQueryResultsButton button; @Override public void validate() throws TelegramApiValidationException { - if (inlineQueryId == null || inlineQueryId.isEmpty()) { + if (inlineQueryId.isEmpty()) { throw new TelegramApiValidationException("InlineQueryId can't be empty", this); } - if (results == null) { - throw new TelegramApiValidationException("Results array can't be null", this); - } if (switchPmText != null) { if (switchPmText.isEmpty()) { throw new TelegramApiValidationException("SwitchPmText can't be empty", this); @@ -85,6 +109,10 @@ public class AnswerInlineQuery extends BotApiMethodBoolean { for (InlineQueryResult result : results) { result.validate(); } + + if (button != null) { + button.validate(); + } } @Override diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java index a5d09487..3d69ac95 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java @@ -28,7 +28,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java index 7b361105..47524f21 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java @@ -30,7 +30,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java index 7a1c6a13..e53c7f1d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java @@ -35,7 +35,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class CopyMessage extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java index 19848fe2..913041d7 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java index 0976e08e..609a568a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetFile extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java index 6209dd3e..1ea3c852 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java @@ -22,7 +22,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java index 63ad12eb..4fdbc4ea 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java @@ -27,7 +27,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetPassportDataErrors extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java index 6f95f271..ef56766a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java @@ -28,7 +28,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetMyCommands extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java index b7fa583d..81a78d4f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class CloseForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseGeneralForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseGeneralForumTopic.java index 57ae59b5..e486de55 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseGeneralForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseGeneralForumTopic.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class CloseGeneralForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CreateForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CreateForumTopic.java index 6173f6d0..0b1e1a7a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CreateForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CreateForumTopic.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/DeleteForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/DeleteForumTopic.java index d926bc5e..682bab69 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/DeleteForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/DeleteForumTopic.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class DeleteForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditForumTopic.java index d1c18042..fd3d2b8f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditForumTopic.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class EditForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditGeneralForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditGeneralForumTopic.java index 7a830846..db485195 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditGeneralForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/EditGeneralForumTopic.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class EditGeneralForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/HideGeneralForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/HideGeneralForumTopic.java index 6a7506fd..2a90452f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/HideGeneralForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/HideGeneralForumTopic.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class HideGeneralForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenForumTopic.java index 3b762c37..09d92801 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenForumTopic.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ReopenForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenGeneralForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenGeneralForumTopic.java index 00962027..e56fa1d5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenGeneralForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/ReopenGeneralForumTopic.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ReopenGeneralForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnhideGeneralForumTopic.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnhideGeneralForumTopic.java index 5cde1ef2..ba31a215 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnhideGeneralForumTopic.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnhideGeneralForumTopic.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnhideGeneralForumTopic extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnpinAllForumTopicMessages.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnpinAllForumTopicMessages.java index 1275e9cd..0aadd941 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnpinAllForumTopicMessages.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/UnpinAllForumTopicMessages.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnpinAllForumTopicMessages extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java index 6fbb016a..581aeb56 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java @@ -51,7 +51,7 @@ import java.util.ArrayList; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java index a1efedc2..cb065e6d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java @@ -48,7 +48,7 @@ import java.io.Serializable; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ApproveChatJoinRequest.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ApproveChatJoinRequest.java index 24d8b7b7..73e5c0e4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ApproveChatJoinRequest.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ApproveChatJoinRequest.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @Builder public class ApproveChatJoinRequest extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatMember.java index a8d30025..95982b31 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatMember.java @@ -34,7 +34,7 @@ import java.time.ZonedDateTime; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatSenderChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatSenderChat.java index b659d190..7e06c58b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatSenderChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/BanChatSenderChat.java @@ -32,7 +32,7 @@ import java.time.ZonedDateTime; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/CreateChatInviteLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/CreateChatInviteLink.java index c27e82aa..b1e909e7 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/CreateChatInviteLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/CreateChatInviteLink.java @@ -30,7 +30,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @RequiredArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeclineChatJoinRequest.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeclineChatJoinRequest.java index 76f4985c..5408b02e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeclineChatJoinRequest.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeclineChatJoinRequest.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @Builder public class DeclineChatJoinRequest extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java index c7d5315c..4d85471c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class DeleteChatPhoto extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatStickerSet.java index ccf2276d..b82d9998 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatStickerSet.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class DeleteChatStickerSet extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/EditChatInviteLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/EditChatInviteLink.java index 3683bd3a..88028bfe 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/EditChatInviteLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/EditChatInviteLink.java @@ -31,7 +31,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @RequiredArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java index c7ba134c..98440620 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java @@ -32,7 +32,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ExportChatInviteLink extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java index 06fafe24..5b7d824e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetChat extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java index f5b2e9c1..c19b87f9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java @@ -30,7 +30,7 @@ import java.util.ArrayList; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetChatAdministrators extends BotApiMethod> { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java index ff1cea72..d39ef395 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetChatMember extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java index 8f963947..4e2fdd3d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java @@ -23,7 +23,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetChatMemberCount extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java index 5965781e..681015f1 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java @@ -22,7 +22,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class LeaveChat extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java index b7986a9f..f2cfa74b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PromoteChatMember extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java index 0983d526..97926a6b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java @@ -33,7 +33,7 @@ import java.time.ZonedDateTime; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RevokeChatInviteLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RevokeChatInviteLink.java index 8fddc94c..65f48adc 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RevokeChatInviteLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RevokeChatInviteLink.java @@ -32,7 +32,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class RevokeChatInviteLink extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatAdministratorCustomTitle.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatAdministratorCustomTitle.java index 078269a1..2f8bf42f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatAdministratorCustomTitle.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatAdministratorCustomTitle.java @@ -23,7 +23,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatAdministratorCustomTitle extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java index d12d168a..7f22c0db 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPermissions.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPermissions.java index 1b3cf57c..0055aefd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPermissions.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPermissions.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatPermissions extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java index cc63c7e3..69cfb9cd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatPhoto extends PartialBotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java index 181f00fb..08cce0d5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatStickerSet extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java index 759ead41..f16add03 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatTitle extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java index dd73a150..65cd2307 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java @@ -31,7 +31,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnbanChatMember extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatSenderChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatSenderChat.java index 63d8b33a..dceda175 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatSenderChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatSenderChat.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnbanChatSenderChat extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java index 4db139cf..d2b3e5c8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java @@ -30,7 +30,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class CreateInvoiceLink extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java index 599d9c65..2535a38e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java @@ -30,7 +30,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendInvoice extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/menubutton/SetChatMenuButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/menubutton/SetChatMenuButton.java index 9548f1ac..df9169d8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/menubutton/SetChatMenuButton.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/menubutton/SetChatMenuButton.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetChatMenuButton extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/GetMyName.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/GetMyName.java new file mode 100644 index 00000000..ac92a901 --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/GetMyName.java @@ -0,0 +1,50 @@ +package org.telegram.telegrambots.meta.api.methods.name; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.name.BotName; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; + +/** + * @author Ruben Bermudez + * @version 6.7 + * Use this method to get the current bot name for the given user language. + * + * Returns BotName on success. + */ +@EqualsAndHashCode(callSuper = false) +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class GetMyName extends BotApiMethod { + public static final String PATH = "getMyDescription"; + + private static final String LANGUAGE_CODE_FIELD = "language_code"; + + /** + * Optional + * A two-letter ISO 639-1 language code or an empty string + */ + @JsonProperty(LANGUAGE_CODE_FIELD) + private String languageCode; + + @Override + public BotName deserializeResponse(String answer) throws TelegramApiRequestException { + return deserializeResponse(answer, BotName.class); + } + + @Override + public String getMethod() { + return PATH; + } +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/SetMyName.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/SetMyName.java new file mode 100644 index 00000000..5887266e --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/name/SetMyName.java @@ -0,0 +1,51 @@ +package org.telegram.telegrambots.meta.api.methods.name; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBoolean; + +/** + * @author Ruben Bermudez + * @version 6.7 + * Use this method to change the bot's name. Returns True on success. + */ +@EqualsAndHashCode(callSuper = false) +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class SetMyName extends BotApiMethodBoolean { + public static final String PATH = "setMyName"; + + private static final String NAME_FIELD = "name"; + private static final String LANGUAGE_CODE_FIELD = "language_code"; + + /** + * Optional + * New bot name; 0-64 characters. + * Pass an empty string to remove the dedicated name for the given language. + */ + @JsonProperty(NAME_FIELD) + private String name; + + /** + * Optional + * A two-letter ISO 639-1 language code. + * If empty, the name will be shown to all users for whose language there is no dedicated name. + */ + @JsonProperty(LANGUAGE_CODE_FIELD) + private String languageCode; + + @Override + public String getMethod() { + return PATH; + } +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java index e6553492..526d7c92 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java @@ -28,7 +28,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PinChatMessage extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinAllChatMessages.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinAllChatMessages.java index c1d10542..5bd89ecf 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinAllChatMessages.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinAllChatMessages.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnpinAllChatMessages extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java index e946536a..f2836829 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java @@ -29,7 +29,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class UnpinChatMessage extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/SendPoll.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/SendPoll.java index 207a02d7..2ac43c44 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/SendPoll.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/SendPoll.java @@ -33,7 +33,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendPoll extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/StopPoll.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/StopPoll.java index 1929920e..bce83e02 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/StopPoll.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/polls/StopPoll.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class StopPoll extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java index ffdb4420..e0dda56c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendChatAction extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java index ea2725ec..8f954f6c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendContact extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDice.java index 1d6c37bd..7467a6d0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDice.java @@ -29,7 +29,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendDice extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java index 2b4a942f..46e140d9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java @@ -42,7 +42,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendGame extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java index 36556f6d..42dfa89b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java @@ -32,7 +32,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder @Deprecated diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java index 16b1d8d4..6d460b16 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendLocation extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java index cf0984cc..5f95413a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java @@ -36,7 +36,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendMediaGroup extends PartialBotApiMethod> { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java index 74c3ace2..9d4b0c2e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java @@ -31,7 +31,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendMessage extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java index 0ecd7877..184286bb 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java @@ -31,7 +31,7 @@ import java.util.Objects; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendPhoto extends SendMediaBotMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java index 0926657e..e948a235 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendVenue extends BotApiMethodMessage { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java index 0936f81f..5230b66f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java @@ -32,7 +32,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SendVoice extends SendMediaBotMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java index 38a81400..18a89892 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java @@ -21,7 +21,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class DeleteStickerFromSet extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetCustomEmojiStickers.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetCustomEmojiStickers.java index 8980eeb7..0a65ed3c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetCustomEmojiStickers.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetCustomEmojiStickers.java @@ -1,10 +1,15 @@ package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.Singular; +import lombok.ToString; import org.telegram.telegrambots.meta.api.methods.BotApiMethod; -import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBoolean; -import org.telegram.telegrambots.meta.api.objects.games.GameHighScore; import org.telegram.telegrambots.meta.api.objects.stickers.Sticker; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java index cdb56ff0..519cad9f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java @@ -23,7 +23,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class GetStickerSet extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java index 57e087c2..de0758ef 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java @@ -33,7 +33,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class SetWebhook extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java index ee611efe..492b2285 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java @@ -31,7 +31,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class DeleteMessage extends BotApiMethodBoolean { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java index 46872d05..f3f897cd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java @@ -29,7 +29,7 @@ import java.io.Serializable; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class EditMessageLiveLocation extends BotApiMethodSerializable { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageMedia.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageMedia.java index 0b1ceb05..bc0036b8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageMedia.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageMedia.java @@ -38,7 +38,7 @@ import java.io.Serializable; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class EditMessageMedia extends PartialBotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java index b1a45a41..761ce371 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java @@ -33,7 +33,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class EditMessageText extends BotApiMethodSerializable { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQuery.java index 8efdadb9..37f124af 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQuery.java @@ -29,7 +29,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class AnswerWebAppQuery extends BotApiMethod { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java index 307abad6..89432362 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java @@ -25,7 +25,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class Chat implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMemberUpdated.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMemberUpdated.java index 52dfe1e4..4513259f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMemberUpdated.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMemberUpdated.java @@ -25,9 +25,10 @@ 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"; + private static final String OLD_CHAT_MEMBER_FIELD = "old_chat_member"; + private static final String NEW_CHAT_MEMBER_FIELD = "new_chat_member"; + private static final String INVITE_LINK_FIELD = "invite_link"; + private static final String VIA_CHAT_FOLDER_INVITE_LINK_FIELD = "via_chat_folder_invite_link"; /** * Chat the user belongs to @@ -47,18 +48,25 @@ public class ChatMemberUpdated implements BotApiObject { /** * Previous information about the chat member */ - @JsonProperty(OLDCHATMEMBER_FIELD) + @JsonProperty(OLD_CHAT_MEMBER_FIELD) private ChatMember oldChatMember; /** * New information about the chat member */ - @JsonProperty(NEWCHATMEMBER_FIELD) + @JsonProperty(NEW_CHAT_MEMBER_FIELD) private ChatMember newChatMember; /** * Optional. * Chat invite link, which was used by the user to join the chat; for joining by invite link events only. */ - @JsonProperty(INVITELINK_FIELD) + @JsonProperty(INVITE_LINK_FIELD) private ChatInviteLink inviteLink; + /** + * Optional. + * True, if the user joined the chat via a chat folder invite link + */ + @JsonProperty(VIA_CHAT_FOLDER_INVITE_LINK_FIELD) + private Boolean viaChatFolderInviteLink; + } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java index c80530ef..bdb9161a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java @@ -20,7 +20,7 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; @Setter @ToString @AllArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) public class Location implements BotApiObject { private static final String LONGITUDE_FIELD = "longitude"; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/LoginUrl.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/LoginUrl.java index b9c5514e..49885e20 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/LoginUrl.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/LoginUrl.java @@ -27,7 +27,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java index 3c41685e..66f3cb18 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class MessageEntity implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java index bb8164de..54c80520 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java @@ -20,7 +20,7 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @RequiredArgsConstructor public class User implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WriteAccessAllowed.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WriteAccessAllowed.java index 9c835e96..3ed2a83c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WriteAccessAllowed.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WriteAccessAllowed.java @@ -1,5 +1,6 @@ package org.telegram.telegrambots.meta.api.objects; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -9,7 +10,7 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * This object represents a service message about a user allowing a bot added to the attachment menu to write messages. - * Currently holds no information. + * * @author Ruben Bermudez * @version 6.4 */ @@ -19,4 +20,13 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; @ToString @AllArgsConstructor public class WriteAccessAllowed implements BotApiObject { + + private static final String WEB_APP_NAME_FIELD = "web_app_name"; + + /** + * Optional. + * Name of the Web App which was launched from a link + */ + @JsonProperty(WEB_APP_NAME_FIELD) + private String webAppName; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/adminrights/ChatAdministratorRights.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/adminrights/ChatAdministratorRights.java index 80c4cd03..9225fc41 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/adminrights/ChatAdministratorRights.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/adminrights/ChatAdministratorRights.java @@ -14,7 +14,7 @@ import org.telegram.telegrambots.meta.api.interfaces.Validable; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ChatAdministratorRights implements BotApiObject, Validable { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/BotCommand.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/BotCommand.java index d9ba0ce7..3768be61 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/BotCommand.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/BotCommand.java @@ -22,7 +22,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class BotCommand implements BotApiObject, Validable { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChat.java index d91e5a05..5bd59313 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChat.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class BotCommandScopeChat implements BotCommandScope { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatAdministrators.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatAdministrators.java index f6558e20..1f73887e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatAdministrators.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatAdministrators.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class BotCommandScopeChatAdministrators implements BotCommandScope { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatMember.java index 769f7d96..fe1ce7b3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/commands/scope/BotCommandScopeChatMember.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class BotCommandScopeChatMember implements BotCommandScope { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java index 539674d4..4e8933ad 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java @@ -42,7 +42,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class Game implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java index 6d99f768..2cf2d9f3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java @@ -37,7 +37,7 @@ import org.telegram.telegrambots.meta.api.objects.User; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class GameHighScore implements BotApiObject { private static final String POSITION_FIELD = "position"; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java index 54a2d168..1ab3ca2f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.api.objects.User; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ChosenInlineQuery implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java index ff96ed46..96647894 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.api.objects.User; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQuery implements BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java index d4cf28e3..3fd5dd36 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InputContactMessageContent implements InputMessageContent { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputInvoiceMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputInvoiceMessageContent.java index e381c948..2f6e1d1a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputInvoiceMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputInvoiceMessageContent.java @@ -29,7 +29,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InputInvoiceMessageContent implements InputMessageContent { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java index ebd6fbfd..be1f98ca 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InputLocationMessageContent implements InputMessageContent { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java index 16447111..22fb15d2 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java @@ -27,7 +27,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InputTextMessageContent implements InputMessageContent { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java index 4ed97bc5..b3eff1e3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InputVenueMessageContent implements InputMessageContent { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java index 84e50485..04969f28 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java @@ -35,7 +35,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultAudio implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java index 597eed96..675f27ee 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java @@ -46,7 +46,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultGame implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java index c080e696..5a97b1b6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java @@ -35,7 +35,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultVoice implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultsButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultsButton.java new file mode 100644 index 00000000..bf84ff20 --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultsButton.java @@ -0,0 +1,89 @@ +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +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.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.api.objects.webapp.WebAppInfo; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; + +import java.util.regex.Pattern; + +/** + * @author Ruben Bermudez + * @version 6.7 + * This object represents a button to be shown above inline query results. + * + * You must use exactly one of the optional fields. + */ +@JsonDeserialize +@EqualsAndHashCode(callSuper = false) +@Getter +@Setter +@ToString +@RequiredArgsConstructor +@NoArgsConstructor(force = true) +@AllArgsConstructor +@Builder +public class InlineQueryResultsButton implements Validable, BotApiObject { + + private static final String TEXT_FIELD = "text"; + private static final String WEB_APP_FIELD = "web_app"; + private static final String START_PARAMETER_FIELD = "start_parameter"; + + /** + * Label text on the button + */ + @NonNull + @JsonProperty(TEXT_FIELD) + private String text; + /** + * Optional. + * Description of the Web App that will be launched when the user presses the button. + * The Web App will be able to switch back to the inline mode using the method web_app_switch_inline_query inside the Web App. + */ + @JsonProperty(WEB_APP_FIELD) + private WebAppInfo webApp; + + /** + * Optional. + * Deep-linking parameter for the /start message sent to the bot when a user presses the button. 1-64 characters, + * only A-Z, a-z, 0-9, _ and - are allowed. + */ + @JsonProperty(START_PARAMETER_FIELD) + private String startParameter; + + @Override + public void validate() throws TelegramApiValidationException { + if (text.isEmpty()) { + throw new TelegramApiValidationException("Text can't be empty", this); + + } + + if (startParameter != null && webApp != null) { + throw new TelegramApiValidationException("Only one of Start Parameter or Web App is allowed", this); + } + + if (startParameter != null) { + if (startParameter.isEmpty() || startParameter.length() > 64) { + throw new TelegramApiValidationException("SwitchPmParameter can't be longer than 64 chars", this); + } + if (!Pattern.matches("[A-Za-z0-9_\\-]+", startParameter.trim())) { + throw new TelegramApiValidationException("SwitchPmParameter only allows A-Z, a-z, 0-9, _ and - characters", this); + } + } + + if (webApp != null) { + webApp.validate(); + } + } +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedAudio.java index 85bc8cfb..70a7367d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedAudio.java @@ -35,7 +35,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedAudio implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedDocument.java index a461c13d..c54a7425 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedDocument.java @@ -37,7 +37,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedDocument implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedGif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedGif.java index 508ba30e..689f34e9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedGif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedGif.java @@ -36,7 +36,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedGif implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedMpeg4Gif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedMpeg4Gif.java index 1d00f30b..02884c48 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedMpeg4Gif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedMpeg4Gif.java @@ -34,7 +34,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedMpeg4Gif implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedPhoto.java index 452f29c3..ab37b05e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedPhoto.java @@ -34,7 +34,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedPhoto implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedSticker.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedSticker.java index 50949114..1b81e2f0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedSticker.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedSticker.java @@ -32,7 +32,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedSticker implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVideo.java index 9ff70b89..757a0bde 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVideo.java @@ -34,7 +34,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedVideo implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVoice.java index e59cdd5d..0de4fedd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/cached/InlineQueryResultCachedVoice.java @@ -36,7 +36,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineQueryResultCachedVoice implements InlineQueryResult { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java index b2150eab..0e0c924d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java @@ -36,7 +36,7 @@ import java.util.List; @Setter @ToString @RequiredArgsConstructor -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public abstract class InputMedia implements Validable, BotApiObject { public static final String TYPE_FIELD = "type"; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/name/BotName.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/name/BotName.java new file mode 100644 index 00000000..d6d70865 --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/name/BotName.java @@ -0,0 +1,31 @@ +package org.telegram.telegrambots.meta.api.objects.name; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; + +/** + * @author Ruben Bermudez + * @version 6.7 + * This object represents the bot's name. + */ +@EqualsAndHashCode(callSuper = false) +@Getter +@Setter +@ToString +@AllArgsConstructor +@Builder +public class BotName implements BotApiObject { + private static final String NAME_FIELD = "name"; + + /** + * The bot's name + */ + @JsonProperty(NAME_FIELD) + private String name; +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorDataField.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorDataField.java index d2c562d9..25b98a8d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorDataField.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorDataField.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorDataField implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFile.java index b914afe9..cf6eb21e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFile.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFile.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorFile implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFiles.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFiles.java index cacb04c5..c3e9fb3b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFiles.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFiles.java @@ -27,7 +27,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorFiles implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFrontSide.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFrontSide.java index 4ff2dd54..17bb42bf 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFrontSide.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorFrontSide.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorFrontSide implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorReverseSide.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorReverseSide.java index 16775565..a2716b56 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorReverseSide.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorReverseSide.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorReverseSide implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorSelfie.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorSelfie.java index 413c922e..5e64efa9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorSelfie.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorSelfie.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorSelfie implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFile.java index 60da8efc..9104c5c0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFile.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFile.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorTranslationFile implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFiles.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFiles.java index 61212a33..f313588a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFiles.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorTranslationFiles.java @@ -27,7 +27,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorTranslationFiles implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorUnspecified.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorUnspecified.java index 77357707..68a3d86c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorUnspecified.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/passport/dataerror/PassportElementErrorUnspecified.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class PassportElementErrorUnspecified implements PassportElementError { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java index 904bde8e..df93caf3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java @@ -22,7 +22,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class LabeledPrice implements Validable, BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java index 1e3a16e8..0900a948 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java @@ -26,7 +26,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class ShippingOption implements Validable, BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java index 2ed56cd4..4d5de8af 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java @@ -27,7 +27,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class InlineKeyboardMarkup implements ReplyKeyboard { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java index 6155f729..bd1aafc9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java @@ -27,7 +27,7 @@ import java.util.List; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java index ac2f4748..a91bfae3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java index 690feac1..a8ab06e5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java @@ -29,7 +29,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java index 2e2e949c..1d926ea8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java @@ -33,7 +33,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestChat.java index ba6833d7..1e6bca1c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestChat.java @@ -26,7 +26,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder @@ -40,6 +40,7 @@ public class KeyboardButtonRequestChat implements Validable, BotApiObject { private static final String USERADMINISTRATORRIGHTS_FIELD = "user_administrator_rights"; private static final String BOTADMINISTRATORRIGHTS_FIELD = "bot_administrator_rights"; private static final String BOTISMEMBER_FIELD = "bot_is_member"; + private static final String SWITCH_INLINE_QUERY_CHOSEN_CHAT_FIELD = "switch_inline_query_chosen_chat"; /** * Signed 32-bit identifier of the request @@ -96,6 +97,13 @@ public class KeyboardButtonRequestChat implements Validable, BotApiObject { */ @JsonProperty(BOTISMEMBER_FIELD) private Boolean botIsMember; + /** + * Optional. + * If set, pressing the button will prompt the user to select one of their chats of the specified type, + * open that chat and insert the bot's username and the specified inline query in the input field + */ + @JsonProperty(SWITCH_INLINE_QUERY_CHOSEN_CHAT_FIELD) + private SwitchInlineQueryChosenChat switchInlineQueryChosenChat; @Override @@ -109,5 +117,8 @@ public class KeyboardButtonRequestChat implements Validable, BotApiObject { if (botAdministratorRights != null) { botAdministratorRights.validate(); } + if (switchInlineQueryChosenChat != null) { + switchInlineQueryChosenChat.validate(); + } } } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestUser.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestUser.java index e238f864..7359244b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestUser.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButtonRequestUser.java @@ -25,7 +25,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @RequiredArgsConstructor @AllArgsConstructor @Builder diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/SwitchInlineQueryChosenChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/SwitchInlineQueryChosenChat.java new file mode 100644 index 00000000..a266da18 --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/SwitchInlineQueryChosenChat.java @@ -0,0 +1,70 @@ +package org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons; + +import com.fasterxml.jackson.annotation.JsonProperty; +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.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; + +/** + * @author Ruben Bermudez + * @version 6.7 + * + * This object represents an inline button that switches the current user to inline mode in a chosen chat, + * with an optional default inline query. + */ +@EqualsAndHashCode(callSuper = false) +@Getter +@Setter +@ToString +@NoArgsConstructor(force = true) +@RequiredArgsConstructor +@AllArgsConstructor +@Builder +public class SwitchInlineQueryChosenChat implements Validable, BotApiObject { + private static final String QUERY_FIELD = "query"; + private static final String ALLOW_USER_CHATS_FIELD = "allow_user_chats"; + private static final String ALLOW_BOT_CHATS_FIELD = "allow_bot_chats"; + private static final String ALLOW_GROUP_CHATS_FIELD = "allow_group_chats"; + private static final String ALLOW_CHANNEL_CHATS_FIELD = "allow_channel_chats"; + + /** + * Optional. + * The default inline query to be inserted in the input field. + * If left empty, only the bot's username will be inserted + */ + @JsonProperty(QUERY_FIELD) + private String requestId; + /** + * Optional. + * True, if private chats with users can be chosen + */ + @JsonProperty(ALLOW_USER_CHATS_FIELD) + @NonNull + private Boolean allowUserChats; + /** + * Optional. + * True, if private chats with bots can be chosen + */ + @JsonProperty(ALLOW_BOT_CHATS_FIELD) + private Boolean allowBotChats; + /** + * Optional. + * True, if group and supergroup chats can be chosen + */ + @JsonProperty(ALLOW_GROUP_CHATS_FIELD) + private Boolean allowGroupChats; + /** + * Optional. + * True, if channel chats can be chosen + */ + @JsonProperty(ALLOW_CHANNEL_CHATS_FIELD) + private Boolean allowChannelChats; +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java index a946749d..e4ed66b3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java @@ -24,7 +24,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class MaskPosition implements Validable, BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/videochat/VideoChatScheduled.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/videochat/VideoChatScheduled.java index c88ea86e..3360f28a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/videochat/VideoChatScheduled.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/videochat/VideoChatScheduled.java @@ -13,15 +13,15 @@ import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class VideoChatScheduled implements BotApiObject { - private static final String STARTDATE_FIELD = "start_date"; + private static final String START_DATE_FIELD = "start_date"; /** * Point in time (Unix timestamp) when the voice chat is supposed to be started by a chat administrator */ - @JsonProperty(STARTDATE_FIELD) + @JsonProperty(START_DATE_FIELD) @NonNull private Integer startDate; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/SentWebAppMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/SentWebAppMessage.java index 1b051134..37493282 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/SentWebAppMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/SentWebAppMessage.java @@ -1,11 +1,14 @@ package org.telegram.telegrambots.meta.api.objects.webapp; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; -import org.telegram.telegrambots.meta.api.interfaces.Validable; -import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez @@ -16,7 +19,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class SentWebAppMessage implements BotApiObject { private static final String INLINEMESSAGEID_FIELD = "inline_message_id"; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppData.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppData.java index 9afb8871..5330f1eb 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppData.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppData.java @@ -1,10 +1,14 @@ package org.telegram.telegrambots.meta.api.objects.webapp; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import lombok.Setter; +import lombok.ToString; import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; -import org.telegram.telegrambots.meta.api.interfaces.Validable; -import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * Contains data sent from a web app to the bot. @@ -15,11 +19,11 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor public class WebAppData implements BotApiObject { private static final String DATA_FIELD = "data"; - private static final String BUTTONTEXT_FIELD = "button_text"; + private static final String BUTTON_TEXT_FIELD = "button_text"; /** * The data @@ -30,7 +34,7 @@ public class WebAppData implements BotApiObject { /** * Text of the web_app keyboard button, from which the web app was opened */ - @JsonProperty(BUTTONTEXT_FIELD) + @JsonProperty(BUTTON_TEXT_FIELD) @NonNull private String buttonText; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppInfo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppInfo.java index 2e1bbf8f..dcb260a6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppInfo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/webapp/WebAppInfo.java @@ -1,8 +1,14 @@ package org.telegram.telegrambots.meta.api.objects.webapp; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import lombok.*; +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.interfaces.BotApiObject; import org.telegram.telegrambots.meta.api.interfaces.Validable; import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @@ -16,7 +22,7 @@ import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; @Getter @Setter @ToString -@NoArgsConstructor +@NoArgsConstructor(force = true) @AllArgsConstructor @Builder public class WebAppInfo implements Validable, BotApiObject { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java index 8add108b..b56d4add 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java @@ -23,8 +23,6 @@ import org.slf4j.LoggerFactory; import org.telegram.telegrambots.meta.api.objects.ApiResponse; import org.telegram.telegrambots.meta.api.objects.ResponseParameters; -import java.io.IOException; - /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/adminrights/GetMyDefaultAdministratorRightsTest.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/adminrights/GetMyDefaultAdministratorRightsTest.java index e4e93ccd..08d4943c 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/adminrights/GetMyDefaultAdministratorRightsTest.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/adminrights/GetMyDefaultAdministratorRightsTest.java @@ -1,11 +1,12 @@ package org.telegram.telegrambots.meta.api.methods.adminrights; import org.junit.jupiter.api.Test; -import org.telegram.telegrambots.meta.api.methods.groupadministration.PromoteChatMember; import org.telegram.telegrambots.meta.api.objects.adminrights.ChatAdministratorRights; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; /** diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQueryTest.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQueryTest.java index 296967f3..05f87732 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQueryTest.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/webapp/AnswerWebAppQueryTest.java @@ -1,15 +1,17 @@ package org.telegram.telegrambots.meta.api.methods.webapp; import org.junit.jupiter.api.Test; -import org.telegram.telegrambots.meta.api.methods.groupadministration.PromoteChatMember; import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent; -import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultArticle; import org.telegram.telegrambots.meta.api.objects.webapp.SentWebAppMessage; import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java index f4e4ad23..60a7bbd9 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java @@ -18,7 +18,7 @@ class TestAnswerInlineQuery { @BeforeEach void setUp() { - answerInlineQuery = new AnswerInlineQuery(); + answerInlineQuery = new AnswerInlineQuery("", new ArrayList<>()); } @Test diff --git a/telegrambots-spring-boot-starter/README.md b/telegrambots-spring-boot-starter/README.md index 3649c830..433af7f1 100644 --- a/telegrambots-spring-boot-starter/README.md +++ b/telegrambots-spring-boot-starter/README.md @@ -18,14 +18,14 @@ Usage org.telegram telegrambots-spring-boot-starter - 6.6.0 + 6.7.0 ``` **Gradle** ```gradle - implementation 'org.telegram:telegrambots-spring-boot-starter:6.6.0' + implementation 'org.telegram:telegrambots-spring-boot-starter:6.7.0' ``` Motivation diff --git a/telegrambots-spring-boot-starter/pom.xml b/telegrambots-spring-boot-starter/pom.xml index 716829a8..230f04eb 100644 --- a/telegrambots-spring-boot-starter/pom.xml +++ b/telegrambots-spring-boot-starter/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambots-spring-boot-starter @@ -70,7 +70,7 @@ UTF-8 UTF-8 - 6.6.0 + 6.7.0 2.7.5 1.6 diff --git a/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/SpringWebhookBot.java b/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/SpringWebhookBot.java index 20d2a163..51babf15 100644 --- a/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/SpringWebhookBot.java +++ b/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/SpringWebhookBot.java @@ -47,7 +47,7 @@ public abstract class SpringWebhookBot extends TelegramWebhookBot { return setWebhook; } - public class TestSpringWebhookBot extends SpringWebhookBot { + public static class TestSpringWebhookBot extends SpringWebhookBot { public TestSpringWebhookBot(SetWebhook setWebhook) { super(setWebhook, null); diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 8e0ef7ec..7997878d 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 6.6.0 + 6.7.0 telegrambots @@ -91,7 +91,7 @@ org.telegram telegrambots-meta - 6.6.0 + 6.7.0 org.projectlombok