diff --git a/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/BetaChannelRaidType.java b/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/ChannelRaidType.java similarity index 62% rename from eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/BetaChannelRaidType.java rename to eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/ChannelRaidType.java index c5c905afb..8186a514e 100644 --- a/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/BetaChannelRaidType.java +++ b/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/ChannelRaidType.java @@ -1,6 +1,5 @@ package com.github.twitch4j.eventsub.subscriptions; -import com.github.twitch4j.common.annotation.Unofficial; import com.github.twitch4j.eventsub.condition.ChannelRaidCondition; import com.github.twitch4j.eventsub.events.ChannelRaidEvent; @@ -8,11 +7,8 @@ * A broadcaster raids another broadcaster’s channel. *

* No authorization required. - *

- * This {@link SubscriptionType} is marked as {@link Unofficial} due to Twitch indicating that it is not intended for use in production environments. */ -@Unofficial -public class BetaChannelRaidType implements SubscriptionType, ChannelRaidEvent> { +public class ChannelRaidType implements SubscriptionType, ChannelRaidEvent> { @Override public String getName() { @@ -21,7 +17,7 @@ public String getName() { @Override public String getVersion() { - return "beta"; + return "1"; } @Override diff --git a/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java b/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java index f10fa1199..2b31904e2 100644 --- a/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java +++ b/eventsub-common/src/main/java/com/github/twitch4j/eventsub/subscriptions/SubscriptionTypes.java @@ -1,6 +1,5 @@ package com.github.twitch4j.eventsub.subscriptions; -import com.github.twitch4j.common.annotation.Unofficial; import lombok.experimental.UtilityClass; import java.util.Collections; @@ -12,8 +11,6 @@ @UtilityClass public class SubscriptionTypes { private final Map> SUBSCRIPTION_TYPES; - @Unofficial - public final BetaChannelRaidType CHANNEL_RAID_BETA; public final ChannelBanType CHANNEL_BAN; public final ChannelCheerType CHANNEL_CHEER; public final ChannelFollowType CHANNEL_FOLLOW; @@ -22,6 +19,7 @@ public class SubscriptionTypes { public final ChannelPointsCustomRewardRedemptionUpdateType CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_UPDATE; public final ChannelPointsCustomRewardRemoveType CHANNEL_POINTS_CUSTOM_REWARD_REMOVE; public final ChannelPointsCustomRewardUpdateType CHANNEL_POINTS_CUSTOM_REWARD_UPDATE; + public final ChannelRaidType CHANNEL_RAID; public final ChannelSubscribeType CHANNEL_SUBSCRIBE; public final ChannelUnbanType CHANNEL_UNBAN; public final ChannelUpdateType CHANNEL_UPDATE; @@ -40,7 +38,6 @@ public class SubscriptionTypes { static { SUBSCRIPTION_TYPES = Collections.unmodifiableMap( Stream.of( - CHANNEL_RAID_BETA = new BetaChannelRaidType(), CHANNEL_BAN = new ChannelBanType(), CHANNEL_CHEER = new ChannelCheerType(), CHANNEL_FOLLOW = new ChannelFollowType(), @@ -49,6 +46,7 @@ public class SubscriptionTypes { CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_UPDATE = new ChannelPointsCustomRewardRedemptionUpdateType(), CHANNEL_POINTS_CUSTOM_REWARD_REMOVE = new ChannelPointsCustomRewardRemoveType(), CHANNEL_POINTS_CUSTOM_REWARD_UPDATE = new ChannelPointsCustomRewardUpdateType(), + CHANNEL_RAID = new ChannelRaidType(), CHANNEL_SUBSCRIBE = new ChannelSubscribeType(), CHANNEL_UNBAN = new ChannelUnbanType(), CHANNEL_UPDATE = new ChannelUpdateType(),