rubenlagus · rubenlagus · Nov 19, 2024 · Oct 10, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/...src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java b/...src/main/java/org/telegram/telegrambots/longpolling/util/TelegramOkHttpClientFactory.java
@@ -75,14 +75,4 @@ public OkHttpClient get() {
             return okHttpClientBuilder.build();
         }
     }
-
-    /**
-     * @deprecated Use {@link HttpProxyOkHttpClientCreator} instead
-     */
-    @Deprecated
-    public static class ProxyOkHttpClientCreator extends HttpProxyOkHttpClientCreator {
-        public ProxyOkHttpClientCreator(Supplier<Proxy> proxySupplier, Supplier<Authenticator> authenticatorSupplier) {
-            super(proxySupplier, authenticatorSupplier);
-        }
-    }
 }
diff --git a/...nnotations/BotApiMethodJsonAnnotated.java → ...meta/annotations/BotApiJsonAnnotated.java b/...nnotations/BotApiMethodJsonAnnotated.java → ...meta/annotations/BotApiJsonAnnotated.java
@@ -18,5 +18,5 @@
 @JacksonAnnotationsInside
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public @interface BotApiMethodJsonAnnotated {
+public @interface BotApiJsonAnnotated {
 }
diff --git a/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java b/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java
@@ -1,7 +1,6 @@
 package org.telegram.telegrambots.meta.api.interfaces;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
 
 import java.io.Serializable;
 
@@ -10,7 +9,6 @@
  * @version 1.0
  * An object from the Bots API received from Telegram Servers
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@BotApiJsonAnnotated
 public interface BotApiObject extends Serializable {
 }
diff --git a/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java b/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -32,7 +31,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class AnswerCallbackQuery extends BotApiMethodBoolean {
     public static final String PATH = "answercallbackquery";
 

diff --git a/...bots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java b/...bots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -32,7 +31,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class AnswerInlineQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerInlineQuery";
 

diff --git a/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java b/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -32,7 +31,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class AnswerPreCheckoutQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerPreCheckoutQuery";
 

diff --git a/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java b/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -35,7 +34,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class AnswerShippingQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerShippingQuery";
 

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
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -41,7 +40,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class CopyMessage extends BotApiMethod<MessageId> {
     public static final String PATH = "copyMessage";
 

diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessages.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessages.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -43,7 +42,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class CopyMessages extends BotApiMethod<ArrayList<MessageId>> {
     public static final String PATH = "copyMessages";
 

diff --git a/...rambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java b/...rambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -19,7 +18,6 @@
  * @author Ruben Bermudez
  * @version 1.0
  * Use this method to forward messages of any kind.
- *
  * Service messages and messages with protected content can't be forwarded.
  *
  * On success, the Message sent is returned.
@@ -32,7 +30,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ForwardMessage extends BotApiMethodMessage {
     public static final String PATH = "forwardmessage";
 

diff --git a/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessages.java b/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessages.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ForwardMessages extends BotApiMethod<ArrayList<MessageId>> {
     public static final String PATH = "forwardMessages";
 

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
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -32,7 +31,6 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class GetFile extends BotApiMethod<File> {
     public static final String PATH = "getFile";
 

diff --git a/...s-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java b/...s-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -28,7 +27,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
     public static final String PATH = "getuserprofilephotos";
 

diff --git a/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java b/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -31,7 +30,6 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class SetPassportDataErrors extends BotApiMethodBoolean {
     public static final String PATH = "setPassportDataErrors";
 

diff --git a/...ots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetUserEmojiStatus.java b/...ots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetUserEmojiStatus.java
@@ -0,0 +1,72 @@
+package org.telegram.telegrambots.meta.api.methods;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
+import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodBoolean;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 8.0
+ * Changes the emoji status for a given user that previously allowed the bot to manage their emoji status via the
+ * Mini App method requestEmojiStatusAccess.
+ *
+ * Returns True on success.
+ */
+@SuppressWarnings("unused")
+@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Jacksonized
+public class SetUserEmojiStatus extends BotApiMethodBoolean {
+    public static final String PATH = "setUserEmojiStatus";
+
+    private static final String USER_ID_FIELD = "user_id";
+    private static final String EMOJI_STATUS_CUSTOM_EMOJI_ID_FIELD = "emoji_status_custom_emoji_id";
+    private static final String EMOJI_STATUS_EXPIRATION_DATE_FIELD = "emoji_status_expiration_date";
+
+
+    /**
+     * Unique identifier of the target user
+     */
+    @JsonProperty(USER_ID_FIELD)
+    @NonNull
+    private Integer userId;
+    /**
+     * Optional
+     * Custom emoji identifier of the emoji status to set.
+     * Pass an empty string to remove the status.
+     */
+    @JsonProperty(EMOJI_STATUS_CUSTOM_EMOJI_ID_FIELD)
+    private String emojiStatusCustomEmojiId;
+    /**
+     * Optional
+     * Expiration date of the emoji status, if any
+     */
+    @JsonProperty(EMOJI_STATUS_EXPIRATION_DATE_FIELD)
+    private Integer emojiStatusExpirationDate;
+
+    @Override
+    public String getMethod() {
+        return PATH;
+    }
+
+    @Override
+    public void validate() throws TelegramApiValidationException {
+        if (userId == 0) {
+            throw new TelegramApiValidationException("UserId parameter can't be empty", this);
+        }
+    }
+}
diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodBoolean.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodBoolean.java
@@ -1,7 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -13,8 +11,6 @@
  *
  * A method of Telegram Bots Api that is fully supported in json format
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
 public abstract class BotApiMethodBoolean extends BotApiMethod<Boolean> {

diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodMessage.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodMessage.java
@@ -1,7 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -14,8 +12,6 @@
  *
  * A method of Telegram Bots Api that is fully supported in json format
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
 public abstract class BotApiMethodMessage extends BotApiMethod<Message> {

diff --git a/...va/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodSerializable.java b/...va/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodSerializable.java
@@ -1,7 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -19,8 +17,6 @@
  *
  * A method of Telegram Bots Api that is fully supported in json format
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
 public abstract class BotApiMethodSerializable extends BotApiMethod<Serializable> {

diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/PartialBotApiMethod.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/PartialBotApiMethod.java
@@ -8,7 +8,7 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.telegram.telegrambots.meta.annotations.BotApiMethodJsonAnnotated;
+import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
 import org.telegram.telegrambots.meta.api.interfaces.Validable;
 import org.telegram.telegrambots.meta.api.objects.ApiResponse;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
@@ -24,7 +24,7 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
-@BotApiMethodJsonAnnotated
+@BotApiJsonAnnotated
 public abstract class PartialBotApiMethod<T extends Serializable> implements Validable {
     @JsonIgnore
     protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -72,6 +72,7 @@ private T deserializeResponseInternal(String answer, JavaType type) throws Teleg
     @JsonProperty(BotApiMethod.METHOD_FIELD)
     public abstract String getMethod();
 
+    @BotApiJsonAnnotated
     public static abstract class PartialBotApiMethodBuilder<T extends Serializable, C extends PartialBotApiMethod<T>, B extends PartialBotApiMethodBuilder<T, C, B>> {
 
     }

diff --git a/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java b/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods.commands;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -34,7 +33,6 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class SetMyCommands extends BotApiMethodBoolean {
     public static final String PATH = "setMyCommands";
 

diff --git a/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java b/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java
@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.meta.api.methods.forum;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -30,7 +29,6 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class CloseForumTopic extends BotApiMethodBoolean {
     public static final String PATH = "closeForumTopic";