From 7bbbdb23ab18205e38384d05966c22dc2425cc03 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 21 Dec 2021 20:18:13 +0100 Subject: [PATCH 1/3] fix some voice regions --- src/main/java/net/dv8tion/jda/api/Region.java | 39 +++++++------------ .../managers/channel/ChannelManagerImpl.java | 1 - 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/dv8tion/jda/api/Region.java b/src/main/java/net/dv8tion/jda/api/Region.java index 5ac3af62d4..c56b9d330c 100644 --- a/src/main/java/net/dv8tion/jda/api/Region.java +++ b/src/main/java/net/dv8tion/jda/api/Region.java @@ -17,9 +17,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Set; /** * Represents the Regions used for Audio connections. @@ -28,38 +25,34 @@ */ public enum Region { - AMSTERDAM("amsterdam", "Amsterdam", "\uD83C\uDDF3\uD83C\uDDF1", false), BRAZIL("brazil", "Brazil", "\uD83C\uDDE7\uD83C\uDDF7", false), - EUROPE("europe", "Europe", "\uD83C\uDDEA\uD83C\uDDFA", false), - EU_CENTRAL("eu-central", "EU Central", "\uD83C\uDDEA\uD83C\uDDFA", false), - EU_WEST("eu-west", "EU West", "\uD83C\uDDEA\uD83C\uDDFA", false), - FRANKFURT("frankfurt", "Frankfurt", "\uD83C\uDDE9\uD83C\uDDEA", false), HONG_KONG("hongkong", "Hong Kong", "\uD83C\uDDED\uD83C\uDDF0", false), + INDIA("india", "India", "\uD83C\uDDEE\uD83C\uDDF3", false), JAPAN("japan", "Japan", "\uD83C\uDDEF\uD83C\uDDF5", false), - SOUTH_KOREA("south-korea", "South Korea", "\uD83C\uDDF0\uD83C\uDDF7", false), - LONDON("london", "London", "\uD83C\uDDEC\uD83C\uDDE7", false), + MILAN("milan", "Milan", "\uD83C\uDDEE\uD83C\uDDF9", false), + ROTTERDAM("rotterdam", "Rotterdam", "\uD83C\uDDF3\uD83C\uDDF1", false), RUSSIA("russia", "Russia", "\uD83C\uDDF7\uD83C\uDDFA", false), - INDIA("india", "India", "\uD83C\uDDEE\uD83C\uDDF3", false), SINGAPORE("singapore", "Singapore", "\uD83C\uDDF8\uD83C\uDDEC", false), SOUTH_AFRICA("southafrica", "South Africa", "\uD83C\uDDFF\uD83C\uDDE6", false), + SOUTH_KOREA("south-korea", "South Korea", "\uD83C\uDDF0\uD83C\uDDF7", false), SYDNEY("sydney", "Sydney", "\uD83C\uDDE6\uD83C\uDDFA", false), US_CENTRAL("us-central", "US Central", "\uD83C\uDDFA\uD83C\uDDF8", false), US_EAST("us-east", "US East", "\uD83C\uDDFA\uD83C\uDDF8", false), US_SOUTH("us-south", "US South", "\uD83C\uDDFA\uD83C\uDDF8", false), US_WEST("us-west", "US West", "\uD83C\uDDFA\uD83C\uDDF8", false), - VIP_AMSTERDAM("vip-amsterdam", "Amsterdam (VIP)", "\uD83C\uDDF3\uD83C\uDDF1", true), VIP_BRAZIL("vip-brazil", "Brazil (VIP)", "\uD83C\uDDE7\uD83C\uDDF7", true), - VIP_EU_CENTRAL("vip-eu-central", "EU Central (VIP)", "\uD83C\uDDEA\uD83C\uDDFA", true), - VIP_EU_WEST("vip-eu-west", "EU West (VIP)", "\uD83C\uDDEA\uD83C\uDDFA", true), - VIP_FRANKFURT("vip-frankfurt", "Frankfurt (VIP)", "\uD83C\uDDE9\uD83C\uDDEA", true), + VIP_HONG_KONG("vip-hongkong", "Hong Kong (VIP)", "\uD83C\uDDED\uD83C\uDDF0", true), + VIP_INDIA("vip-india", "India (VIP)", "\uD83C\uDDEE\uD83C\uDDF3", true), VIP_JAPAN("vip-japan", "Japan (VIP)", "\uD83C\uDDEF\uD83C\uDDF5", true), - VIP_SOUTH_KOREA("vip-south-korea", "South Korea (VIP)", "\uD83C\uDDF0\uD83C\uDDF7", true), - VIP_LONDON("vip-london", "London (VIP)", "\uD83C\uDDEC\uD83C\uDDE7", true), + VIP_MILAN("vip-milan", "Milan (VIP)", "\uD83C\uDDEE\uD83C\uDDF9", true), + VIP_ROTTERDAM("vip-rotterdam", "Rotterdam (VIP)", "\uD83C\uDDF3\uD83C\uDDF1", true), + VIP_RUSSIA("vip-russia", "Russia (VIP)", "\uD83C\uDDF7\uD83C\uDDFA", true), VIP_SINGAPORE("vip-singapore", "Singapore (VIP)", "\uD83C\uDDF8\uD83C\uDDEC", true), VIP_SOUTH_AFRICA("vip-southafrica", "South Africa (VIP)", "\uD83C\uDDFF\uD83C\uDDE6", true), + VIP_SOUTH_KOREA("vip-south-korea", "South Korea (VIP)", "\uD83C\uDDF0\uD83C\uDDF7", true), VIP_SYDNEY("vip-sydney", "Sydney (VIP)", "\uD83C\uDDE6\uD83C\uDDFA", true), - VIP_US_CENTRAL("vip-us-central", "US Central (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), + VIP_US_CENTRAL("uvip-s-central", "US Central (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_EAST("vip-us-east", "US East (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_SOUTH("vip-us-south", "US South (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_WEST("vip-us-west", "US West (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), @@ -68,12 +61,6 @@ public enum Region AUTOMATIC("automatic", "Automatic", null, false); - /** - * This {@link java.util.Set Set} represents all regions that can be used for VoiceChannel region overrides. - */ - public static final Set VOICE_CHANNEL_REGIONS = - Collections.unmodifiableSet(EnumSet.of(AUTOMATIC, US_WEST, US_EAST, US_CENTRAL, US_SOUTH, SINGAPORE, SOUTH_AFRICA, SYDNEY, EUROPE, INDIA, SOUTH_KOREA, BRAZIL, JAPAN, RUSSIA)); - private final String key; private final String name; private final String emoji; @@ -108,10 +95,10 @@ public String getKey() { return key; } - + /** * The unicode flag representative of this Region. - * + * * @return Possibly-null unicode for the region's flag */ @Nullable diff --git a/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java b/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java index dd98c4d88f..a72f4d01af 100644 --- a/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java @@ -373,7 +373,6 @@ public M setRegion(@Nonnull Region region) Checks.notNull(region, "Region"); if (!type.isAudio()) throw new IllegalStateException("Can only change region on voice channels!"); - Checks.check(Region.VOICE_CHANNEL_REGIONS.contains(region), "Region is not usable for VoiceChannel region overrides!"); this.region = region == Region.AUTOMATIC ? null : region.getKey(); set |= REGION; return (M) this; From 01c43c832fa129331f033f004a1131f36e225507 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 21 Dec 2021 20:26:03 +0100 Subject: [PATCH 2/3] fix broken copypasta --- src/main/java/net/dv8tion/jda/api/Region.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/dv8tion/jda/api/Region.java b/src/main/java/net/dv8tion/jda/api/Region.java index c56b9d330c..4e16d4ff0e 100644 --- a/src/main/java/net/dv8tion/jda/api/Region.java +++ b/src/main/java/net/dv8tion/jda/api/Region.java @@ -52,7 +52,7 @@ public enum Region VIP_SOUTH_AFRICA("vip-southafrica", "South Africa (VIP)", "\uD83C\uDDFF\uD83C\uDDE6", true), VIP_SOUTH_KOREA("vip-south-korea", "South Korea (VIP)", "\uD83C\uDDF0\uD83C\uDDF7", true), VIP_SYDNEY("vip-sydney", "Sydney (VIP)", "\uD83C\uDDE6\uD83C\uDDFA", true), - VIP_US_CENTRAL("uvip-s-central", "US Central (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), + VIP_US_CENTRAL("vip-us-central", "US Central (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_EAST("vip-us-east", "US East (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_SOUTH("vip-us-south", "US South (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), VIP_US_WEST("vip-us-west", "US West (VIP)", "\uD83C\uDDFA\uD83C\uDDF8", true), From 1ec732827729618b4c5536cc515679a1f1cdc177 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 21 Dec 2021 20:28:22 +0100 Subject: [PATCH 3/3] update error message --- .../jda/internal/managers/channel/ChannelManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java b/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java index a72f4d01af..bb4d92e93f 100644 --- a/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/managers/channel/ChannelManagerImpl.java @@ -372,7 +372,7 @@ public M setRegion(@Nonnull Region region) { Checks.notNull(region, "Region"); if (!type.isAudio()) - throw new IllegalStateException("Can only change region on voice channels!"); + throw new IllegalStateException("Can only change region on audio channels!"); this.region = region == Region.AUTOMATIC ? null : region.getKey(); set |= REGION; return (M) this;