diff --git a/javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java b/javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java index 68bf5b6e63..d4bfc6fc4c 100644 --- a/javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java +++ b/javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java @@ -12,7 +12,7 @@ public class BotInviteBuilder { * The base link of a bot invite. */ public static final String BASE_LINK = - "https://discordapp.com/oauth2/authorize?client_id=%s&scope=bot&permissions=%s"; + "https://" + Javacord.DISCORD_DOMAIN + "/oauth2/authorize?client_id=%s&scope=bot&permissions=%s"; /** * The client id of the bot's application. diff --git a/javacord-api/src/main/java/org/javacord/api/DiscordApiBuilder.java b/javacord-api/src/main/java/org/javacord/api/DiscordApiBuilder.java index aaf41b2020..6758a17e21 100644 --- a/javacord-api/src/main/java/org/javacord/api/DiscordApiBuilder.java +++ b/javacord-api/src/main/java/org/javacord/api/DiscordApiBuilder.java @@ -229,7 +229,7 @@ public AccountType getAccountType() { * * @param totalShards The total amount of shards. Sharding will be disabled if set to 1. * @return The current instance in order to chain call methods. - * @see API docs + * @see API docs */ public DiscordApiBuilder setTotalShards(int totalShards) { delegate.setTotalShards(totalShards); @@ -254,7 +254,7 @@ public int getTotalShards() { * * @param currentShard The shard of this connection starting with 0! * @return The current instance in order to chain call methods. - * @see API docs + * @see API docs */ public DiscordApiBuilder setCurrentShard(int currentShard) { delegate.setCurrentShard(currentShard); @@ -303,7 +303,7 @@ public boolean isWaitingForServersOnStartup() { * A shard only handles a subset of a bot's servers. * * @return A future with the current api builder. - * @see API docs + * @see API docs */ public CompletableFuture setRecommendedTotalShards() { return delegate.setRecommendedTotalShards().thenCompose(nothing -> CompletableFuture.completedFuture(this)); diff --git a/javacord-api/src/main/java/org/javacord/api/Javacord.java b/javacord-api/src/main/java/org/javacord/api/Javacord.java index 3ec8835f50..3f9698fd6f 100644 --- a/javacord-api/src/main/java/org/javacord/api/Javacord.java +++ b/javacord-api/src/main/java/org/javacord/api/Javacord.java @@ -31,6 +31,16 @@ public class Javacord { */ public static final Instant BUILD_TIMESTAMP; + /** + * The domain of Discord. + */ + public static final String DISCORD_DOMAIN = "discord.com"; + + /** + * The domain of Discord's CDN. + */ + public static final String DISCORD_CDN_DOMAIN = "cdn.discordapp.com"; + /** * The display version of the current Javacord version. * If the current Javacord version is a release version, it is equal to {@link #VERSION}. @@ -98,14 +108,14 @@ public class Javacord { /** * The gateway version from Discord which we are using. * A list with all gateway versions can be found - * here. + * here. */ public static final String DISCORD_GATEWAY_VERSION = "6"; /** * The API version from Discord which we are using. * A list with all API versions can be found - * here. + * here. */ public static final String DISCORD_API_VERSION = "6"; diff --git a/javacord-api/src/main/java/org/javacord/api/entity/DiscordEntity.java b/javacord-api/src/main/java/org/javacord/api/entity/DiscordEntity.java index 82afef79d6..1d28126de4 100644 --- a/javacord-api/src/main/java/org/javacord/api/entity/DiscordEntity.java +++ b/javacord-api/src/main/java/org/javacord/api/entity/DiscordEntity.java @@ -14,7 +14,7 @@ public interface DiscordEntity { * * @param entityId The entity it to calculate from. * @return The creation date of the Discord entity. - * @see Discord docs + * @see Discord docs */ static Instant getCreationTimestamp(long entityId) { // The first 42 bits (of the total 64) are the timestamp @@ -26,7 +26,7 @@ static Instant getCreationTimestamp(long entityId) { * Gets the creation date of the Discord entity, calculated from the id. * * @return The creation date of the Discord entity. - * @see Discord docs + * @see Discord docs */ default Instant getCreationTimestamp() { return getCreationTimestamp(getId()); @@ -43,7 +43,7 @@ default Instant getCreationTimestamp() { * Gets the id of Discord entity. * * @return The id of Discord entity. - * @see Discord docs + * @see Discord docs */ long getId(); diff --git a/javacord-api/src/main/java/org/javacord/api/entity/activity/ActivityType.java b/javacord-api/src/main/java/org/javacord/api/entity/activity/ActivityType.java index 1c3a209390..cadbccbf7b 100644 --- a/javacord-api/src/main/java/org/javacord/api/entity/activity/ActivityType.java +++ b/javacord-api/src/main/java/org/javacord/api/entity/activity/ActivityType.java @@ -3,7 +3,7 @@ /** * Represents a activity type. * - * @see Discord docs + * @see Discord docs */ public enum ActivityType { diff --git a/javacord-api/src/main/java/org/javacord/api/entity/message/Message.java b/javacord-api/src/main/java/org/javacord/api/entity/message/Message.java index 721fab0454..aaade7968c 100644 --- a/javacord-api/src/main/java/org/javacord/api/entity/message/Message.java +++ b/javacord-api/src/main/java/org/javacord/api/entity/message/Message.java @@ -1,6 +1,7 @@ package org.javacord.api.entity.message; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.UpdatableFromCache; import org.javacord.api.entity.channel.ChannelType; @@ -698,7 +699,7 @@ default String getReadableContent() { */ default URL getLink() throws AssertionError { try { - return new URL("https://discordapp.com/channels/" + return new URL("https://" + Javacord.DISCORD_DOMAIN + "/channels/" + getServer().map(DiscordEntity::getIdAsString).orElse("@me") + "/" + getChannel().getIdAsString() diff --git a/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesAvailableEvent.java b/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesAvailableEvent.java index 678055f427..abb31de654 100644 --- a/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesAvailableEvent.java +++ b/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesAvailableEvent.java @@ -4,7 +4,7 @@ * A server becomes available event. * Unavailability means, that a Discord server is down due to a temporary outage. * - * @see Discord docs + * @see Discord docs */ public interface ServerBecomesAvailableEvent extends ServerEvent { } diff --git a/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesUnavailableEvent.java b/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesUnavailableEvent.java index b1aafdbdfd..9377bb98ae 100644 --- a/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesUnavailableEvent.java +++ b/javacord-api/src/main/java/org/javacord/api/event/server/ServerBecomesUnavailableEvent.java @@ -4,7 +4,7 @@ * A server becomes unavailable event. * Unavailability means, that a Discord server is down due to a temporary outage. * - * @see Discord docs + * @see Discord docs */ public interface ServerBecomesUnavailableEvent extends ServerEvent { } diff --git a/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesAvailableListener.java b/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesAvailableListener.java index 9c037d2f32..de29bac728 100644 --- a/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesAvailableListener.java +++ b/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesAvailableListener.java @@ -7,7 +7,7 @@ * This listener listens to servers becoming available. * Unavailability means, that a Discord server is down due to a temporary outage. * - * @see Discord docs + * @see Discord docs */ @FunctionalInterface public interface ServerBecomesAvailableListener extends GloballyAttachableListener { diff --git a/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesUnavailableListener.java b/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesUnavailableListener.java index 64def8fe75..5224d13ef0 100644 --- a/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesUnavailableListener.java +++ b/javacord-api/src/main/java/org/javacord/api/listener/server/ServerBecomesUnavailableListener.java @@ -8,7 +8,7 @@ * This listener listens to servers becoming unavailable. * Unavailability means, that a Discord server is down due to a temporary outage. * - * @see Discord docs + * @see Discord docs */ @FunctionalInterface public interface ServerBecomesUnavailableListener extends ServerAttachableListener, GloballyAttachableListener, diff --git a/javacord-api/src/main/java/org/javacord/api/util/DiscordRegexPattern.java b/javacord-api/src/main/java/org/javacord/api/util/DiscordRegexPattern.java index 53e579cf63..829036f499 100644 --- a/javacord-api/src/main/java/org/javacord/api/util/DiscordRegexPattern.java +++ b/javacord-api/src/main/java/org/javacord/api/util/DiscordRegexPattern.java @@ -78,18 +78,18 @@ public class DiscordRegexPattern { + "> # '>' \n"); /** - * A pattern which checks for message links (e.g. {@code https://discordapp.com/channels/@me/1234/5678} + * A pattern which checks for message links (e.g. {@code https://discord.com/channels/@me/1234/5678} */ public static final Pattern MESSAGE_LINK = - Pattern.compile("(?x) # enable comment mode \n" - + "(?i) # ignore case \n" - + "(?:https?+://)?+ # 'https://' or 'http://' or '' \n" - + "\\Qdiscordapp.com/channels/\\E # 'discordapp.com/channels/' \n" - + "(?:(?[0-9]++)|@me) # '@me' or the server id as named group \n" - + "/ # '/' \n" - + "(?[0-9]++) # the textchannel id as named group \n" - + "/ # '/' \n" - + "(?[0-9]++) # the message id as named group \n"); + Pattern.compile("(?x) # enable comment mode \n" + + "(?i) # ignore case \n" + + "(?:https?+://)?+ # 'https://' or 'http://' or '' \n" + + "discord(?:app)?+\\.com/channels/ # 'discord(app).com/channels/' \n" + + "(?:(?[0-9]++)|@me) # '@me' or the server id as named group \n" + + "/ # '/' \n" + + "(?[0-9]++) # the textchannel id as named group \n" + + "/ # '/' \n" + + "(?[0-9]++) # the message id as named group \n"); /** * You are not meant to create instances of this class. diff --git a/javacord-core/src/main/java/org/javacord/core/entity/activity/ActivityAssetsImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/activity/ActivityAssetsImpl.java index aabe2fbce0..15f0325579 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/activity/ActivityAssetsImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/activity/ActivityAssetsImpl.java @@ -1,6 +1,7 @@ package org.javacord.core.entity.activity; import com.fasterxml.jackson.databind.JsonNode; +import org.javacord.api.Javacord; import org.javacord.api.entity.Icon; import org.javacord.api.entity.activity.ActivityAssets; import org.javacord.core.entity.IconImpl; @@ -41,9 +42,8 @@ public ActivityAssetsImpl(ActivityImpl activity, JsonNode data) { @Override public Optional getLargeImage() { return Optional.ofNullable(largeImage) - .flatMap(imageId -> activity.getApplicationId() - .map(applicationId -> String - .format("https://cdn.discordapp.com/app-assets/%s/%s.png", applicationId, imageId))) + .flatMap(imageId -> activity.getApplicationId().map(applicationId -> String.format( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/app-assets/%s/%s.png", applicationId, imageId))) .map(url -> { try { return new URL(url); @@ -62,9 +62,8 @@ public Optional getLargeText() { @Override public Optional getSmallImage() { return Optional.ofNullable(smallImage) - .flatMap(imageId -> activity.getApplicationId() - .map(applicationId -> String - .format("https://cdn.discordapp.com/app-assets/%s/%s.png", applicationId, imageId))) + .flatMap(imageId -> activity.getApplicationId().map(applicationId -> String.format( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/app-assets/%s/%s.png", applicationId, imageId))) .map(url -> { try { return new URL(url); diff --git a/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java index 68781eb6f0..e1b367dfba 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; import org.javacord.api.entity.Region; @@ -140,10 +141,12 @@ public AuditLogEntryImpl(AuditLog auditLog, JsonNode data) { break; // Misc case ICON: - change = iconChange("https://cdn.discordapp.com/icons/", type, oldValue, newValue); + change = iconChange( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/icons/", type, oldValue, newValue); break; case SPLASH: - change = iconChange("https://cdn.discordapp.com/splashes/", type, oldValue, newValue); + change = iconChange( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/splashes/", type, oldValue, newValue); break; case REGION: Region oldRegion = Region.getRegionByKey(oldValue != null ? oldValue.asText() : ""); @@ -203,7 +206,7 @@ public AuditLogEntryImpl(AuditLog auditLog, JsonNode data) { change = new AuditLogChangeImpl<>(type, oldPermissions, newPermissions); break; case AVATAR: - baseUrl = "https://cdn.discordapp.com/avatars/" + baseUrl = "https://" + Javacord.DISCORD_CDN_DOMAIN + "/avatars/" + getTarget().map(DiscordEntity::getIdAsString).orElse("0") + "/"; String oldUrl = oldValue != null ? (baseUrl + oldValue.asText() + (oldValue.asText().startsWith("a_") ? ".gif" : ".png")) : null; diff --git a/javacord-core/src/main/java/org/javacord/core/entity/channel/GroupChannelImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/channel/GroupChannelImpl.java index a2f6310bdd..5397d9ab49 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/channel/GroupChannelImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/channel/GroupChannelImpl.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; import org.javacord.api.entity.channel.GroupChannel; @@ -131,7 +132,8 @@ public Optional getIcon() { try { return Optional.of(new IconImpl( getApi(), - new URL("https://cdn.discordapp.com/channel-icons/" + getIdAsString() + "/" + iconId + ".png"))); + new URL("https://" + Javacord.DISCORD_CDN_DOMAIN + + "/channel-icons/" + getIdAsString() + "/" + iconId + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); return Optional.empty(); diff --git a/javacord-core/src/main/java/org/javacord/core/entity/emoji/CustomEmojiImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/emoji/CustomEmojiImpl.java index b9390095c4..471a29a148 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/emoji/CustomEmojiImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/emoji/CustomEmojiImpl.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; import org.javacord.api.entity.emoji.CustomEmoji; @@ -92,7 +93,8 @@ public String getName() { @Override public Icon getImage() { - String urlString = "https://cdn.discordapp.com/emojis/" + getIdAsString() + (isAnimated() ? ".gif" : ".png"); + String urlString = "https://" + Javacord.DISCORD_CDN_DOMAIN + + "/emojis/" + getIdAsString() + (isAnimated() ? ".gif" : ".png"); try { return new IconImpl(getApi(), new URL(urlString)); } catch (MalformedURLException e) { diff --git a/javacord-core/src/main/java/org/javacord/core/entity/server/ServerImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/server/ServerImpl.java index b39319e03c..773e9833f7 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/server/ServerImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/server/ServerImpl.java @@ -6,6 +6,7 @@ import org.apache.logging.log4j.Logger; import org.javacord.api.AccountType; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordClient; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; @@ -906,7 +907,8 @@ public Optional getIcon() { try { return Optional.of(new IconImpl( getApi(), - new URL("https://cdn.discordapp.com/icons/" + getIdAsString() + "/" + iconHash + ".png"))); + new URL("https://" + Javacord.DISCORD_CDN_DOMAIN + + "/icons/" + getIdAsString() + "/" + iconHash + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); return Optional.empty(); @@ -921,7 +923,8 @@ public Optional getSplash() { try { return Optional.of(new IconImpl( getApi(), - new URL("https://cdn.discordapp.com/splashes/" + getIdAsString() + "/" + splash + ".png"))); + new URL("https://" + Javacord.DISCORD_CDN_DOMAIN + + "/splashes/" + getIdAsString() + "/" + splash + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); return Optional.empty(); diff --git a/javacord-core/src/main/java/org/javacord/core/entity/server/invite/InviteImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/server/invite/InviteImpl.java index 5234365f54..c2b65eb43f 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/server/invite/InviteImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/server/invite/InviteImpl.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.Icon; import org.javacord.api.entity.channel.ChannelType; import org.javacord.api.entity.channel.ServerChannel; @@ -203,7 +204,7 @@ public Optional getServerIcon() { } try { return Optional.of(new IconImpl( - api, new URL("https://cdn.discordapp.com/icons/" + api, new URL("https://" + Javacord.DISCORD_CDN_DOMAIN + "/icons/" + Long.toUnsignedString(getServerId()) + "/" + serverIcon + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); @@ -218,7 +219,7 @@ public Optional getServerSplash() { } try { return Optional.of(new IconImpl( - api, new URL("https://cdn.discordapp.com/splashes/" + api, new URL("https://" + Javacord.DISCORD_CDN_DOMAIN + "/splashes/" + Long.toUnsignedString(getServerId()) + "/" + serverSplash + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); diff --git a/javacord-core/src/main/java/org/javacord/core/entity/user/UserImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/user/UserImpl.java index a8dc44b14e..8b93d5f0bf 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/user/UserImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/user/UserImpl.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordClient; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; @@ -243,7 +244,7 @@ public UserStatus getStatusOnClient(DiscordClient client) { * @return The avatar for the given details. */ public static Icon getAvatar(DiscordApi api, String avatarHash, String discriminator, long userId) { - StringBuilder url = new StringBuilder("https://cdn.discordapp.com/"); + StringBuilder url = new StringBuilder("https://" + Javacord.DISCORD_CDN_DOMAIN + "/"); if (avatarHash == null) { url.append("embed/avatars/") .append(Integer.parseInt(discriminator) % 5) diff --git a/javacord-core/src/main/java/org/javacord/core/entity/webhook/WebhookImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/webhook/WebhookImpl.java index 792e07a706..8e44432c19 100644 --- a/javacord-core/src/main/java/org/javacord/core/entity/webhook/WebhookImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/entity/webhook/WebhookImpl.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Logger; import org.javacord.api.DiscordApi; +import org.javacord.api.Javacord; import org.javacord.api.entity.DiscordEntity; import org.javacord.api.entity.Icon; import org.javacord.api.entity.channel.TextChannel; @@ -104,7 +105,7 @@ public Optional getName() { @Override public Optional getAvatar() { if (avatarId != null) { - String url = "https://cdn.discordapp.com/avatars/" + getIdAsString() + "/" + avatarId + String url = "https://" + Javacord.DISCORD_CDN_DOMAIN + "/avatars/" + getIdAsString() + "/" + avatarId + (avatarId.startsWith("a_") ? ".gif" : ".png"); try { return Optional.of(new IconImpl(getApi(), new URL(url))); diff --git a/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeIconEventImpl.java b/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeIconEventImpl.java index 6a6ef50a9f..810eb078b4 100644 --- a/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeIconEventImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeIconEventImpl.java @@ -1,6 +1,7 @@ package org.javacord.core.event.server; import org.apache.logging.log4j.Logger; +import org.javacord.api.Javacord; import org.javacord.api.entity.Icon; import org.javacord.api.entity.server.Server; import org.javacord.api.event.server.ServerChangeIconEvent; @@ -65,9 +66,9 @@ private Optional getIcon(String iconHash) { return Optional.empty(); } try { - return Optional.of(new IconImpl(getApi(), - new URL("https://cdn.discordapp.com/icons/" + getServer().getIdAsString() - + "/" + iconHash + ".png"))); + return Optional.of(new IconImpl(getApi(), new URL( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/icons/" + getServer().getIdAsString() + + "/" + iconHash + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the icon is malformed! Please contact the developer!", e); return Optional.empty(); diff --git a/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeSplashEventImpl.java b/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeSplashEventImpl.java index 8eeb10f9f9..776b53af7d 100644 --- a/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeSplashEventImpl.java +++ b/javacord-core/src/main/java/org/javacord/core/event/server/ServerChangeSplashEventImpl.java @@ -1,6 +1,7 @@ package org.javacord.core.event.server; import org.apache.logging.log4j.Logger; +import org.javacord.api.Javacord; import org.javacord.api.entity.Icon; import org.javacord.api.entity.server.Server; import org.javacord.api.event.server.ServerChangeSplashEvent; @@ -65,9 +66,9 @@ private Optional getSplash(String splashHash) { return Optional.empty(); } try { - return Optional.of(new IconImpl(getApi(), - new URL("https://cdn.discordapp.com/splashs/" + getServer().getIdAsString() - + "/" + splashHash + ".png"))); + return Optional.of(new IconImpl(getApi(), new URL( + "https://" + Javacord.DISCORD_CDN_DOMAIN + "/splashs/" + getServer().getIdAsString() + + "/" + splashHash + ".png"))); } catch (MalformedURLException e) { logger.warn("Seems like the url of the splash is malformed! Please contact the developer!", e); return Optional.empty(); diff --git a/javacord-core/src/main/java/org/javacord/core/util/gateway/GatewayOpcode.java b/javacord-core/src/main/java/org/javacord/core/util/gateway/GatewayOpcode.java index 747ab7ea30..b7d75bbd49 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/gateway/GatewayOpcode.java +++ b/javacord-core/src/main/java/org/javacord/core/util/gateway/GatewayOpcode.java @@ -9,7 +9,7 @@ /** * An enum with all gateway opcode as defined by - * Discord. + * Discord. */ public enum GatewayOpcode { diff --git a/javacord-core/src/main/java/org/javacord/core/util/gateway/VoiceGatewayOpcode.java b/javacord-core/src/main/java/org/javacord/core/util/gateway/VoiceGatewayOpcode.java index 2d0cbbb424..1a783d919b 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/gateway/VoiceGatewayOpcode.java +++ b/javacord-core/src/main/java/org/javacord/core/util/gateway/VoiceGatewayOpcode.java @@ -9,7 +9,7 @@ /** * An enum with all voice gateway opcode as defined by - * Discord. + * Discord. */ public enum VoiceGatewayOpcode { diff --git a/javacord-core/src/main/java/org/javacord/core/util/gateway/WebSocketCloseCode.java b/javacord-core/src/main/java/org/javacord/core/util/gateway/WebSocketCloseCode.java index 84a14bfe87..a50be9b18c 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/gateway/WebSocketCloseCode.java +++ b/javacord-core/src/main/java/org/javacord/core/util/gateway/WebSocketCloseCode.java @@ -11,7 +11,7 @@ * An enum with all web socket close reasons as * defined by RFC 6455 (1000-2999), * assigned by IANA (3000-3999), - * assigned by Discord (4000-4998) or + * assigned by Discord (4000-4998) or * self-assigned (4999). */ public enum WebSocketCloseCode { @@ -143,25 +143,25 @@ public enum WebSocketCloseCode { /** * You sent an invalid - * Gateway opcode + * Gateway opcode * or an invalid payload for an opcode. Don't do that! */ UNKNOWN_OPCODE(4001, Usage.BOTH), /** - * You sent an invalid payload + * You sent an invalid payload * to us. Don't do that! */ DECODE_ERROR(4002, Usage.NORMAL), /** - * You sent us a payload prior to + * You sent us a payload prior to * identifying. */ NOT_AUTHENTICATED(4003, Usage.BOTH), /** - * The account token sent with your + * The account token sent with your * identify payload is incorrect. */ AUTHENTICATION_FAILED(4004, Usage.BOTH), @@ -177,7 +177,7 @@ public enum WebSocketCloseCode { SESSION_NO_LONGER_VALID(4006, Usage.VOICE), /** - * The sequence sent when resuming + * The sequence sent when resuming * the session was invalid. Reconnect and start a new session. */ INVALID_SEQ(4007, Usage.NORMAL), @@ -193,49 +193,49 @@ public enum WebSocketCloseCode { SESSION_TIMEOUT(4009, Usage.BOTH), /** - * You sent us an invalid shard when + * You sent us an invalid shard when * identifying. */ INVALID_SHARD(4010, Usage.NORMAL), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ SHARDING_REQUIRED(4011, Usage.NORMAL), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ SERVER_NOT_FOUND(4011, Usage.VOICE), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ UNKNOWN_PROTOCOL(4012, Usage.VOICE), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ DISCONNECTED(4014, Usage.VOICE), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ VOICE_SERVER_CRASHED(4015, Usage.VOICE), /** * The session would have handled too many guilds - you are required to - * shard + * shard * your connection in order to connect. */ UNKNOWN_ENCRYPTION_MODE(4016, Usage.VOICE), diff --git a/javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java b/javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java index 18fb3951b2..66602dd228 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java +++ b/javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java @@ -46,7 +46,7 @@ public enum RestEndpoint { CUSTOM_EMOJI("/guilds/%s/emojis", 0); /** - * The endpoint url (only including the base, not the https://discordapp.com/api/vXYZ/ "prefix". + * The endpoint url (only including the base, not the https://discord.com/api/vXYZ/ "prefix". */ private final String endpointUrl; @@ -107,7 +107,7 @@ public Optional getMajorParameterPosition() { } /** - * Gets the endpoint url (only including the base, not the https://discordapp.com/api/vXYZ/ "prefix". + * Gets the endpoint url (only including the base, not the https://discord.com/api/vXYZ/ "prefix". * * @return The gateway url. */ @@ -153,7 +153,8 @@ public Optional getHardcodedRatelimit() { * @return The full url of the endpoint. */ public String getFullUrl(String... parameters) { - StringBuilder url = new StringBuilder("https://discordapp.com/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl()); + StringBuilder url = new StringBuilder( + "https://" + Javacord.DISCORD_DOMAIN + "/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl()); url = new StringBuilder(String.format(url.toString(), (Object[]) parameters)); int parameterAmount = getEndpointUrl().split("%s").length - (getEndpointUrl().endsWith("%s") ? 0 : 1); if (parameters.length > parameterAmount) { diff --git a/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestHttpResponseCode.java b/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestHttpResponseCode.java index df25c404c6..48b683f1bb 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestHttpResponseCode.java +++ b/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestHttpResponseCode.java @@ -17,7 +17,7 @@ /** * An enum with all rest request result codes as defined by - * Discord. + * Discord. */ public enum RestRequestHttpResponseCode { @@ -72,7 +72,7 @@ public enum RestRequestHttpResponseCode { /** * You've made too many requests. * - * @see Rate Limits + * @see Rate Limits */ TOO_MANY_REQUESTS(429, "You've made too many requests"), diff --git a/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestResultErrorCode.java b/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestResultErrorCode.java index 41da40fc47..ab5d6a1a67 100644 --- a/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestResultErrorCode.java +++ b/javacord-core/src/main/java/org/javacord/core/util/rest/RestRequestResultErrorCode.java @@ -18,7 +18,7 @@ /** * An enum with all rest request result codes as defined by - * Discord. + * Discord. */ public enum RestRequestResultErrorCode { diff --git a/javacord-core/src/test/resources/mockserver.properties b/javacord-core/src/test/resources/mockserver.properties index 7f4196598f..b0bbf5323a 100644 --- a/javacord-core/src/test/resources/mockserver.properties +++ b/javacord-core/src/test/resources/mockserver.properties @@ -1 +1 @@ -mockserver.sslSubjectAlternativeNameDomains = discordapp.com, gateway-url +mockserver.sslSubjectAlternativeNameDomains = discord.com, discordapp.com, gateway-url