Fix for the AbilityBot: Could not retrieve originating user from update (ChatBoostUpdated and ChatBoostRemoved)

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

@@ -9,7 +9,7 @@
 import static java.util.Objects.nonNull;
 
 /**
- * Flags are an conditions that are applied on an {@link Update}.
+ * Flags are conditions that are applied on an {@link Update}.
  * <p>
  * They can be used on {@link AbilityBuilder#flag(Predicate[])} and on the post conditions in {@link AbilityBuilder#reply(BiConsumer, Predicate[])}.
  *
@@ -37,6 +37,8 @@ public enum Flag implements Predicate<Update> {
   HAS_EDITED_BUSINESS_MESSAGE(Update::hasEditedBusinessMessage),
   HAS_DELETED_BUSINESS_MESSAGE(Update::hasDeletedBusinessMessage),
   HAS_PAID_MEDIA_PURCHASED(Update::hasPaidMediaPurchased),
+  HAS_CHAT_BOOST(Update::hasChatBoost),
+  HAS_REMOVED_CHAT_BOOST(Update::hasRemovedChatBoost),
 
 
   // Message Flags

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

@@ -101,6 +101,10 @@ private static User getUserElseThrow(Update update) {
       return update.getPaidMediaPurchased().getUser();
     } else if (Flag.POLL.test(update)) {
       return EMPTY_USER;
+    } else if (Flag.HAS_CHAT_BOOST.test(update)) {
+      return update.getChatBoost().getBoost().getSource().getUser();
+    } else if (Flag.HAS_REMOVED_CHAT_BOOST.test(update)) {
+      return update.getRemovedChatBoost().getSource().getUser();
     } else {
       throw new IllegalStateException("Could not retrieve originating user from update");
     }
@@ -203,7 +207,7 @@ public static Long getChatId(Update update) {
 
   /**
    * @param update a Telegram {@link Update}
-   * @return <tt>true</tt> if the update contains contains a private user message
+   * @return <tt>true</tt> if the update contains a private user message
    */
   public static boolean isUserMessage(Update update) {
     if (Flag.MESSAGE.test(update)) {

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

@@ -285,4 +285,12 @@ public boolean hasDeletedBusinessMessage() {
     public boolean hasPaidMediaPurchased() {
         return paidMediaPurchased != null;
     }
+
+    public boolean hasChatBoost() {
+        return chatBoost != null;
+    }
+
+    public boolean hasRemovedChatBoost() {
+        return removedChatBoost != null;
+    }
 }

telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/boost/ChatBoostSource.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.telegram.telegrambots.meta.api.interfaces.BotApiObject;
+import org.telegram.telegrambots.meta.api.objects.User;
 
 /**
  * @author Ruben Bermudez
@@ -24,4 +25,6 @@ public interface ChatBoostSource extends BotApiObject {
     String PREMIUM_TYPE = "premium";
     String GIFT_CODE_TYPE = "gift_code";
     String GIVEAWAY_TYPE = "giveaway";
+
+    User getUser();
 }