Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change domain to discord.com #1288

Merged
merged 4 commits into from
May 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/net/dv8tion/jda/api/JDA.java
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ default RestAction<User> retrieveUserById(@Nonnull String id, boolean update)
* will only contain the {@link net.dv8tion.jda.api.entities.Guild Guilds} that the shard is actually connected to.
* Discord determines which guilds a shard is connect to using the following format:
* <br>Guild connected if shardId == (guildId {@literal >>} 22) % totalShards;
* <br>Source for formula: <a href="https://discordapp.com/developers/docs/topics/gateway#sharding">Discord Documentation</a>
* <br>Source for formula: <a href="https://discord.com/developers/docs/topics/gateway#sharding">Discord Documentation</a>
*
* <p>This copies the backing store into a list. This means every call
* creates a new list with O(n) complexity. It is recommended to store this into
Expand Down Expand Up @@ -1911,7 +1911,7 @@ default List<Emote> getEmotesByName(@Nonnull String name, boolean ignoreCase)
/**
* Creates an authorization invite url for the currently logged in Bot-Account.
* <br>Example Format:
* {@code https://discordapp.com/oauth2/authorize?scope=bot&client_id=288202953599221761&permissions=8}
* {@code https://discord.com/oauth2/authorize?scope=bot&client_id=288202953599221761&permissions=8}
*
* <p><b>Hint:</b> To enable a pre-selected Guild of choice append the parameter {@code &guild_id=YOUR_GUILD_ID}
*
Expand All @@ -1930,7 +1930,7 @@ default List<Emote> getEmotesByName(@Nonnull String name, boolean ignoreCase)
/**
* Creates an authorization invite url for the currently logged in Bot-Account.
* <br>Example Format:
* {@code https://discordapp.com/oauth2/authorize?scope=bot&client_id=288202953599221761&permissions=8}
* {@code https://discord.com/oauth2/authorize?scope=bot&client_id=288202953599221761&permissions=8}
*
* <p><b>Hint:</b> To enable a pre-selected Guild of choice append the parameter {@code &guild_id=YOUR_GUILD_ID}
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/dv8tion/jda/api/JDABuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ public JDABuilder setContextEnabled(boolean enable)
*
* @return The JDABuilder instance. Useful for chaining
*
* @see <a href="https://discordapp.com/developers/docs/topics/gateway#transport-compression" target="_blank">Official Discord Documentation - Transport Compression</a>
* @see <a href="https://discord.com/developers/docs/topics/gateway#transport-compression" target="_blank">Official Discord Documentation - Transport Compression</a>
*/
@Nonnull
public JDABuilder setCompression(@Nonnull Compression compression)
Expand Down Expand Up @@ -793,7 +793,7 @@ public JDABuilder setRequestTimeoutRetry(boolean retryOnTimeout)
*
* <h2>For {@link net.dv8tion.jda.api.AccountType#BOT}</h2>
* <ol>
* <li>Go to your <a href="https://discordapp.com/developers/applications/me">Discord Applications</a></li>
* <li>Go to your <a href="https://discord.com/developers/applications/me">Discord Applications</a></li>
* <li>Create or select an already existing application</li>
* <li>Verify that it has already been turned into a Bot. If you see the "Create a Bot User" button, click it.</li>
* <li>Click the <i>click to reveal</i> link beside the <b>Token</b> label to show your Bot's {@code token}</li>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/api/OnlineStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public enum OnlineStatus
*
* @return String representation of the valid API key for this OnlineStatus
*
* @see <a href="https://discordapp.com/developers/docs/topics/gateway#presence-update">PRESENCE_UPDATE</a>
* @see <a href="https://discord.com/developers/docs/topics/gateway#presence-update">PRESENCE_UPDATE</a>
*/
public String getKey()
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/api/entities/Activity.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface Activity
Pattern STREAMING_URL = Pattern.compile("https?://(www\\.)?(twitch\\.tv/|youtube\\.com/watch\\?v=).+", Pattern.CASE_INSENSITIVE);

/**
* Whether this is a <a href="https://discordapp.com/developers/docs/rich-presence/best-practices" target="_blank">Rich Presence</a>
* Whether this is a <a href="https://discord.com/developers/docs/rich-presence/best-practices" target="_blank">Rich Presence</a>
* <br>If {@code false} the result of {@link #asRichPresence()} is {@code null}
*
* @return {@code true} if this is a {@link net.dv8tion.jda.api.entities.RichPresence RichPresence}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/dv8tion/jda/api/entities/ApplicationInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public interface ApplicationInfo extends ISnowflake
*
* <p>This means that additional OAuth2 steps are required to authorize the application to make a bot join a guild
* like {@code &response_type=code} together with a valid {@code &redirect_uri}.
* <br>For more information look at the <a href="https://discordapp.com/developers/docs/topics/oauth2">Discord OAuth2 documentation</a>.
* <br>For more information look at the <a href="https://discord.com/developers/docs/topics/oauth2">Discord OAuth2 documentation</a>.
*
* @return Whether the bot requires code grant
*/
Expand Down Expand Up @@ -83,7 +83,7 @@ public interface ApplicationInfo extends ISnowflake
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS}
* <br>Unnecessary query parameters are stripped.
*
* @param permissions
Expand All @@ -102,7 +102,7 @@ default String getInviteUrl(@Nullable Collection<Permission> permissions)
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS}
* <br>Unnecessary query parameters are stripped.
*
* @param permissions
Expand All @@ -120,7 +120,7 @@ default String getInviteUrl(@Nullable Permission... permissions)
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>Unnecessary query parameters are stripped.
*
* @param guildId
Expand All @@ -141,7 +141,7 @@ default String getInviteUrl(@Nullable Permission... permissions)
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>Unnecessary query parameters are stripped.
*
* @param guildId
Expand All @@ -162,7 +162,7 @@ default String getInviteUrl(long guildId, @Nullable Collection<Permission> permi
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>Unnecessary query parameters are stripped.
*
* @param guildId
Expand All @@ -186,7 +186,7 @@ default String getInviteUrl(@Nullable String guildId, @Nullable Permission... pe
* Creates a OAuth invite-link used to invite the bot.
*
* <p>The link is provided in the following format:
* <br>{@code https://discordapp.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>{@code https://discord.com/oauth2/authorize?client_id=APPLICATION_ID&scope=bot&permissions=PERMISSIONS&guild_id=GUILD_ID}
* <br>Unnecessary query parameters are stripped.
*
* @param guildId
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/dv8tion/jda/api/entities/Emote.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public interface Emote extends IMentionable, IFakeable

/**
* Roles this emote is active for.
* <br><a href="https://discordapp.com/developers/docs/resources/emoji#emoji-object" target="_blank">Learn More</a>
* <br><a href="https://discord.com/developers/docs/resources/emoji#emoji-object" target="_blank">Learn More</a>
*
* @throws IllegalStateException
* If this Emote does not have attached roles according to {@link #canProvideRoles()}
Expand Down Expand Up @@ -126,7 +126,7 @@ default boolean hasRoles()
/**
* Whether this emote is managed. A managed Emote is controlled by Discord, not the Guild administrator, typical
* via a service like BTTV in conjunction with Twitch.
* <br><a href="https://discordapp.com/developers/docs/resources/emoji#emoji-object" target="_blank">Learn More</a>
* <br><a href="https://discord.com/developers/docs/resources/emoji#emoji-object" target="_blank">Learn More</a>
*
* @return True, if this emote is managed
*/
Expand Down Expand Up @@ -211,7 +211,7 @@ default String getImageUrl()
*
* @return A usable String representation for this Emote
*
* @see <a href="https://discordapp.com/developers/docs/resources/channel#message-formatting">Message Formatting</a>
* @see <a href="https://discord.com/developers/docs/resources/channel#message-formatting">Message Formatting</a>
*/
@Nonnull
@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/dv8tion/jda/api/entities/Guild.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ default RestAction<EnumSet<Region>> retrieveRegions()
*
* @return {@link MemberAction MemberAction}
*
* @see <a href="https://discordapp.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
* @see <a href="https://discord.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
*
* @since 3.7.0
*/
Expand All @@ -137,7 +137,7 @@ default RestAction<EnumSet<Region>> retrieveRegions()
*
* @return {@link MemberAction MemberAction}
*
* @see <a href="https://discordapp.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
* @see <a href="https://discord.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
*
* @since 3.7.0
*/
Expand Down Expand Up @@ -166,7 +166,7 @@ default MemberAction addMember(@Nonnull String accessToken, @Nonnull User user)
*
* @return {@link MemberAction MemberAction}
*
* @see <a href="https://discordapp.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
* @see <a href="https://discord.com/developers/docs/topics/oauth2" target="_blank">Discord OAuth2 Documentation</a>
*
* @since 3.7.0
*/
Expand Down Expand Up @@ -4581,7 +4581,7 @@ public static BoostTier fromKey(int key)
* Represents a Ban object.
*
* @see #retrieveBanList()
* @see <a href="https://discordapp.com/developers/docs/resources/guild#ban-object" target="_blank">Discord Docs: Ban Object</a>
* @see <a href="https://discord.com/developers/docs/resources/guild#ban-object" target="_blank">Discord Docs: Ban Object</a>
*/
class Ban
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/api/entities/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public interface Message extends ISnowflake, Formattable
* The raw textual content of this message. Does not resolve {@link net.dv8tion.jda.api.entities.IMentionable IMentionable}
* entities like {@link #getContentDisplay()} does. This means that this is the completely raw textual content of the message
* received from Discord and can contain mentions specified by
* <a href="https://discordapp.com/developers/docs/resources/channel#message-formatting" target="_blank">Discord's Message Formatting</a>.
* <a href="https://discord.com/developers/docs/resources/channel#message-formatting" target="_blank">Discord's Message Formatting</a>.
*
* @return The raw textual content of the message, containing unresolved Discord message formatting.
*/
Expand Down
29 changes: 13 additions & 16 deletions src/main/java/net/dv8tion/jda/api/entities/MessageActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public MessageActivity(ActivityType type, String partyId, Application applicatio
/**
* The current {@link net.dv8tion.jda.api.entities.MessageActivity.ActivityType ActivityType}
*
* @return the type of the activity.
* @return the type of the activity, or {@link ActivityType#UNKNOWN UNKNOWN}
*/
@Nonnull
public ActivityType getType()
Expand All @@ -50,7 +50,7 @@ public ActivityType getType()
/**
* The party id discord uses internally, it may be {@code null}.
*
* @return Possibly-null party id.
* @return Possibly-null party id
*/
@Nullable
public String getPartyId()
Expand All @@ -61,7 +61,7 @@ public String getPartyId()
/**
* The {@link net.dv8tion.jda.api.entities.MessageActivity.Application Application} this {@link net.dv8tion.jda.api.entities.MessageActivity MessageActivity} may have.
*
* @return A possibly-null {@link net.dv8tion.jda.api.entities.MessageActivity.Application}.
* @return A possibly-null {@link net.dv8tion.jda.api.entities.MessageActivity.Application}
*/
@Nullable
public MessageActivity.Application getApplication()
Expand All @@ -70,10 +70,7 @@ public MessageActivity.Application getApplication()
}

/**
* Represents the {@link net.dv8tion.jda.api.entities.MessageActivity.Application Application} of a
* {@link net.dv8tion.jda.api.entities.MessageActivity MessageActivity} if it's set.
*
* @see <a href="https://discordapp.com/api/v7/games" target="_blank">https://discordapp.com/api/v7/games</a>
* Represents the {@link net.dv8tion.jda.api.entities.MessageActivity.Application Application} of a MessageActivity, if it has been set.
*/
public static class Application implements ISnowflake
{
Expand All @@ -93,9 +90,9 @@ public Application(String name, String description, String iconId, String coverI
}

/**
* The name of this {@link net.dv8tion.jda.api.entities.MessageActivity.Application}.
* The name of this Application.
*
* @return the applications name.
* @return the applications name
*/
@Nonnull
public String getName()
Expand All @@ -104,9 +101,9 @@ public String getName()
}

/**
* A short description of this {@link net.dv8tion.jda.api.entities.MessageActivity.Application}.
* A short description of this Application.
*
* @return the applications description.
* @return the applications description
*/
@Nonnull
public String getDescription()
Expand All @@ -115,9 +112,9 @@ public String getDescription()
}

/**
* The icon id of this {@link net.dv8tion.jda.api.entities.MessageActivity.Application}.
* The icon id of this Application.
*
* @return the applications icon id.
* @return the applications icon id
*/
@Nullable
public String getIconId()
Expand All @@ -137,9 +134,9 @@ public String getIconUrl()
}

/**
* The cover aka splash id of this {@link net.dv8tion.jda.api.entities.MessageActivity.Application}.
* The cover aka splash id of this Application.
*
* @return the applications cover image/id.
* @return the applications cover image/id
*/
@Nullable
public String getCoverId()
Expand Down Expand Up @@ -201,7 +198,7 @@ public enum ActivityType
/**
* The id of this {@link net.dv8tion.jda.api.entities.MessageActivity.ActivityType ActivityType}.
*
* @return the id of the type.
* @return the id of the type
*/
public int getId()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* Used to hold additional information about a users {@link Activity Activity}
* relevant to <a href="https://discordapp.com/developers/docs/rich-presence/best-practices" target="_blank">Rich Presence</a>.
* relevant to <a href="https://discord.com/developers/docs/rich-presence/best-practices" target="_blank">Rich Presence</a>.
*
* @since 3.4.0
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/dv8tion/jda/api/entities/Webhook.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public interface Webhook extends ISnowflake, IFakeable
* @return A fake {@link net.dv8tion.jda.api.entities.User User} instance
* representing the default webhook user.
*
* @see <a href="https://discordapp.com/developers/docs/resources/webhook#execute-webhook">Execute Webhook Docs</a>
* @see <a href="https://discord.com/developers/docs/resources/webhook#execute-webhook">Execute Webhook Docs</a>
*/
@Nonnull
User getDefaultUser();
Expand Down Expand Up @@ -135,7 +135,7 @@ public interface Webhook extends ISnowflake, IFakeable
*
* <p>Webhook executions are limited with 5 requests per second.
* The response contains rate limit headers that should be handled
* by execution frameworks. (<a href="https://discordapp.com/developers/docs/topics/rate-limits">Learn More</a>)
* by execution frameworks. (<a href="https://discord.com/developers/docs/topics/rate-limits">Learn More</a>)
*
* @return The execution route for this Webhook.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*
* @see net.dv8tion.jda.api.JDABuilder#setRawEventsEnabled(boolean) JDABuilder.setRawEventsEnabled(boolean)
* @see net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder#setRawEventsEnabled(boolean) DefaultShardManagerBuilder.setRawEventsEnabled(boolean)
* @see <a href="https://discordapp.com/developers/docs/topics/gateway" target="_blank">Gateway Documentation</a>
* @see <a href="https://discord.com/developers/docs/topics/gateway" target="_blank">Gateway Documentation</a>
*/
public class RawGatewayEvent extends Event
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public String getMeaning()
*
* @return The discord error code.
*
* @see <a href="https://discordapp.com/developers/docs/topics/response-codes#json-error-response" target="_blank">Discord Error Codes</a>
* @see <a href="https://discord.com/developers/docs/topics/response-codes#json-error-response" target="_blank">Discord Error Codes</a>
*/
public int getErrorCode()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ default JDA.ShardInfo getShardInfo()
}

/**
* Wrapper for a <a href="https://discordapp.com/developers/docs/topics/gateway#voice-server-update" target="_blank">Voice Server Update</a>
* Wrapper for a <a href="https://discord.com/developers/docs/topics/gateway#voice-server-update" target="_blank">Voice Server Update</a>
*/
class VoiceServerUpdate implements VoiceUpdate
{
Expand Down Expand Up @@ -205,7 +205,7 @@ public String getSessionId()
}

/**
* Wrapper for a <a href="https://discordapp.com/developers/docs/topics/gateway#voice-state-update" target="_blank">Voice State Update</a>
* Wrapper for a <a href="https://discord.com/developers/docs/topics/gateway#voice-state-update" target="_blank">Voice State Update</a>
*/
class VoiceStateUpdate implements VoiceUpdate
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ default ChannelManager putPermissionOverride(@Nonnull IPermissionHolder permHold
*
* @return ChannelManager for chaining convenience
*
* @see <a href="https://discordapp.com/developers/docs/topics/permissions#permission-syncing" target="_blank">Discord Documentation - Permission Syncing</a>
* @see <a href="https://discord.com/developers/docs/topics/permissions#permission-syncing" target="_blank">Discord Documentation - Permission Syncing</a>
*/
@Nonnull
@CheckReturnValue
Expand Down Expand Up @@ -296,7 +296,7 @@ default ChannelManager sync()
*
* @return ChannelManager for chaining convenience
*
* @see <a href="https://discordapp.com/developers/docs/topics/permissions#permission-syncing" target="_blank">Discord Documentation - Permission Syncing</a>
* @see <a href="https://discord.com/developers/docs/topics/permissions#permission-syncing" target="_blank">Discord Documentation - Permission Syncing</a>
*/
@Nonnull
@CheckReturnValue
Expand Down
Loading