chore: promote chat eventsub topics out of beta (#890)

twitch4j · Nov 24, 2023 · 4ddbb82 · 4ddbb82
1 parent 3efe80b
commit 4ddbb82
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 29 deletions.
diff --git a/eventsub-common/src/main/java/com/github/twitch4j/eventsub/domain/chat/Subscription.java b/eventsub-common/src/main/java/com/github/twitch4j/eventsub/domain/chat/Subscription.java
@@ -11,11 +11,6 @@
 @Setter(AccessLevel.PRIVATE)
 public class Subscription {
 
-    /**
-     * The total number of months the user has subscribed.
-     */
-    private Integer cumulativeMonths;
-
     /**
      * The number of months the subscription is for.
      */

diff --git a/...bscriptions/BetaChannelChatClearType.java → ...b/subscriptions/ChannelChatClearType.java b/...bscriptions/BetaChannelChatClearType.java → ...b/subscriptions/ChannelChatClearType.java
@@ -2,7 +2,6 @@
 
 import com.github.twitch4j.eventsub.condition.ChannelChatCondition;
 import com.github.twitch4j.eventsub.events.ChannelChatClearEvent;
-import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Sends a notification when a moderator or bot clears all messages from the chat room.
@@ -15,16 +14,15 @@
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_USER_BOT
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_CHANNEL_BOT
  */
-@ApiStatus.Experimental // in open beta
-public class BetaChannelChatClearType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatClearEvent> {
+public class ChannelChatClearType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatClearEvent> {
     @Override
     public String getName() {
         return "channel.chat.clear";
     }
 
     @Override
     public String getVersion() {
-        return "beta";
+        return "1";
     }
 
     @Override

diff --git a/...ions/BetaChannelChatNotificationType.java → ...riptions/ChannelChatNotificationType.java b/...ions/BetaChannelChatNotificationType.java → ...riptions/ChannelChatNotificationType.java
@@ -2,7 +2,6 @@
 
 import com.github.twitch4j.eventsub.condition.ChannelChatCondition;
 import com.github.twitch4j.eventsub.events.ChannelChatNotificationEvent;
-import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Sends a notification when a USERNOTICE event that appears in chat occurs,
@@ -16,16 +15,15 @@
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_USER_BOT
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_CHANNEL_BOT
  */
-@ApiStatus.Experimental // in open beta
-public class BetaChannelChatNotificationType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatNotificationEvent> {
+public class ChannelChatNotificationType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatNotificationEvent> {
     @Override
     public String getName() {
         return "channel.chat.notification";
     }
 
     @Override
     public String getVersion() {
-        return "beta";
+        return "1";
     }
 
     @Override

diff --git a/...ons/BetaChannelClearUserMessagesType.java → ...iptions/ChannelClearUserMessagesType.java b/...ons/BetaChannelClearUserMessagesType.java → ...iptions/ChannelClearUserMessagesType.java
@@ -2,7 +2,6 @@
 
 import com.github.twitch4j.eventsub.condition.ChannelChatCondition;
 import com.github.twitch4j.eventsub.events.ChannelChatClearUserMessagesEvent;
-import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Sends a notification when a moderator or bot clears all messages for a specific user,
@@ -16,16 +15,15 @@
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_USER_BOT
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_CHANNEL_BOT
  */
-@ApiStatus.Experimental // in open beta
-public class BetaChannelClearUserMessagesType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatClearUserMessagesEvent> {
+public class ChannelClearUserMessagesType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatClearUserMessagesEvent> {
     @Override
     public String getName() {
         return "channel.chat.clear_user_messages";
     }
 
     @Override
     public String getVersion() {
-        return "beta";
+        return "1";
     }
 
     @Override

diff --git a/...iptions/BetaChannelMessageDeleteType.java → ...bscriptions/ChannelMessageDeleteType.java b/...iptions/BetaChannelMessageDeleteType.java → ...bscriptions/ChannelMessageDeleteType.java
@@ -2,7 +2,6 @@
 
 import com.github.twitch4j.eventsub.condition.ChannelChatCondition;
 import com.github.twitch4j.eventsub.events.ChannelChatMessageDeleteEvent;
-import org.jetbrains.annotations.ApiStatus;
 
 /**
  * Sends a notification when a moderator removes a specific message.
@@ -15,16 +14,15 @@
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_USER_BOT
  * @see com.github.twitch4j.auth.domain.TwitchScopes#CHAT_CHANNEL_BOT
  */
-@ApiStatus.Experimental // in open beta
-public class BetaChannelMessageDeleteType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatMessageDeleteEvent> {
+public class ChannelMessageDeleteType implements SubscriptionType<ChannelChatCondition, ChannelChatCondition.ChannelChatConditionBuilder<?, ?>, ChannelChatMessageDeleteEvent> {
     @Override
     public String getName() {
         return "channel.chat.message_delete";
     }
 
     @Override
     public String getVersion() {
-        return "beta";
+        return "1";
     }
 
     @Override

diff --git a/...ub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java b/...ub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java
@@ -16,10 +16,10 @@ public class SubscriptionTypes {
 
     public final @ApiStatus.Experimental BetaChannelAdBreakBeginType BETA_CHANNEL_AD_BREAK_BEGIN;
     public final ChannelBanType CHANNEL_BAN;
-    public final @ApiStatus.Experimental BetaChannelChatClearType BETA_CHANNEL_CHAT_CLEAR;
-    public final @ApiStatus.Experimental BetaChannelClearUserMessagesType BETA_CHANNEL_CLEAR_USER_MESSAGES;
-    public final @ApiStatus.Experimental BetaChannelMessageDeleteType BETA_CHANNEL_CHAT_MESSAGE_DELETE;
-    public final @ApiStatus.Experimental BetaChannelChatNotificationType BETA_CHANNEL_CHAT_NOTIFICATION;
+    public final ChannelChatClearType CHANNEL_CHAT_CLEAR;
+    public final ChannelClearUserMessagesType CHANNEL_CLEAR_USER_MESSAGES;
+    public final ChannelMessageDeleteType CHANNEL_CHAT_MESSAGE_DELETE;
+    public final ChannelChatNotificationType CHANNEL_CHAT_NOTIFICATION;
     public final ChannelCharityDonateType CHANNEL_CHARITY_DONATE;
     public final CharityCampaignStartType CHANNEL_CHARITY_START;
     public final CharityCampaignProgressType CHANNEL_CHARITY_PROGRESS;
@@ -76,10 +76,10 @@ public class SubscriptionTypes {
             Stream.of(
                 BETA_CHANNEL_AD_BREAK_BEGIN = new BetaChannelAdBreakBeginType(),
                 CHANNEL_BAN = new ChannelBanType(),
-                BETA_CHANNEL_CHAT_CLEAR = new BetaChannelChatClearType(),
-                BETA_CHANNEL_CLEAR_USER_MESSAGES = new BetaChannelClearUserMessagesType(),
-                BETA_CHANNEL_CHAT_MESSAGE_DELETE = new BetaChannelMessageDeleteType(),
-                BETA_CHANNEL_CHAT_NOTIFICATION = new BetaChannelChatNotificationType(),
+                CHANNEL_CHAT_CLEAR = new ChannelChatClearType(),
+                CHANNEL_CLEAR_USER_MESSAGES = new ChannelClearUserMessagesType(),
+                CHANNEL_CHAT_MESSAGE_DELETE = new ChannelMessageDeleteType(),
+                CHANNEL_CHAT_NOTIFICATION = new ChannelChatNotificationType(),
                 CHANNEL_CHARITY_DONATE = new ChannelCharityDonateType(),
                 CHANNEL_CHARITY_START = new CharityCampaignStartType(),
                 CHANNEL_CHARITY_PROGRESS = new CharityCampaignProgressType(),