Change the occourences of discordapp.com to discord.com #555

Joshix-1 · 2020-05-04T20:43:42Z

see #554!
I changed everything I could find. I don't know if it is complete.

CharlesLgn

I think you forgot some.
When I write discordapp in my IDE, I found 53 occuration

Maybe a good solution will be to store the main url (discord.com) in a properties. load it on the begin of an app anreplace all real occuration (not javadoc) by this value

Joshix-1 · 2020-05-05T06:04:56Z

I read somewhere, that the cdn.discordapp.com won't change.

Bastian · 2020-05-05T12:06:51Z

You missed one in the mockserver.properties file.

Bastian · 2020-05-05T12:07:49Z

I read somewhere, that the cdn.discordapp.com won't change.

Indeed. Here's the reason:

Bastian · 2020-05-05T12:15:39Z

Maybe a good solution will be to store the main url (discord.com) in a properties. load it on the begin of an app anreplace all real occuration (not javadoc) by this value

Agreed. Even though I think that it should be enough to have it as a public static final String constant somewhere:

public static final String DISCORD_DOMAIN = "discord.com";
public static final String DISCORD_CDN_DOMAIN = "cnd.discordapp.com";

Maybe even in the API package in the DiscordApi interface?

Vampire · 2020-05-05T12:16:48Z

You missed one in the mockserver.properties file.

Just have both in there.
It is for the generated SSL certificate for MockServer based tests.
Doesn't hurt to simply have both in there.

javacord-api/src/main/java/org/javacord/api/Javacord.java

CharlesLgn · 2020-05-05T19:14:32Z

javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java

@@ -12,7 +12,7 @@
     * 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://discord.com/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";


"https://"+ DISCORD_URL +"/oauth2/authorize?client_id=%s&scope=bot&permissions=%s"
or using String.formatMessage

CharlesLgn · 2020-05-05T19:15:41Z

javacord-api/src/main/java/org/javacord/api/entity/message/Message.java

@@ -698,7 +698,7 @@ default String getReadableContent() {
     */
    default URL getLink() throws AssertionError {
        try {
-            return new URL("https://discordapp.com/channels/"
+            return new URL("https://discord.com/channels/"


"https://"+ DISCORD_URL +"/channels/"
or using String.formatMessage

CharlesLgn · 2020-05-05T19:17:44Z

javacord-api/src/main/java/org/javacord/api/util/DiscordRegexPattern.java

+            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"


why adding (?:app)?\\ the url will only be discord.com/channels/ no ?

Currently both is possible. And I would remove the (?:app)? only when only discord.com/channels is possible.

I'd also keep it, someone could post an old link. But add + after ?, there is no need to backtrack.

And now the alignment again. :-)

javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java

Bastian · 2020-05-08T16:26:50Z

@Joshix-1 Do you plan to add the constants in this PR?

I would be ok if you don't. In this case I would create an issue for it and someone else (maybe @CharlesLgn 😉 ) can create a separate PR for it.

DoNotSpamPls · 2020-05-09T17:30:58Z

javacord-api/src/main/java/org/javacord/api/DiscordApi.java

@@ -49,6 +49,8 @@
 * This class is the most important class for your bot, containing all important methods, like registering listener.
 */
 public interface DiscordApi extends GloballyAttachableListenerManager {
+    public static final String DISCORD_DOMAIN = "discord.com";
+    public static final String DISCORD_CDN_DOMAIN = "cnd.discordapp.com";


Bastian

Like @CharlesLgn said, the constants should also be used.

javacord-api/src/main/java/org/javacord/api/DiscordApi.java

Bastian · 2020-05-09T17:28:01Z

javacord-api/src/main/java/org/javacord/api/DiscordApi.java

@@ -49,6 +49,8 @@
 * This class is the most important class for your bot, containing all important methods, like registering listener.
 */
 public interface DiscordApi extends GloballyAttachableListenerManager {
+    public static final String DISCORD_DOMAIN = "discord.com";
+    public static final String DISCORD_CDN_DOMAIN = "cnd.discordapp.com";


Suggested change

public static final String DISCORD_CDN_DOMAIN = "cnd.discordapp.com";

/*

* The domain of Discord's CDN.

*/

public static final String DISCORD_CDN_DOMAIN = "cnd.discordapp.com";

Bastian · 2020-05-09T17:29:53Z

javacord-api/src/main/java/org/javacord/api/BotInviteBuilder.java

@@ -12,7 +12,7 @@
     * 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://discord.com/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";


When we have the constants, we should also use them.

Suggested change

"https://discord.com/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";

"https://" + DiscordApi.DISCORD_DOMAIN + "/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";

Bastian · 2020-05-09T17:30:48Z

javacord-api/src/main/java/org/javacord/api/entity/message/Message.java

@@ -698,7 +698,7 @@ default String getReadableContent() {
     */
    default URL getLink() throws AssertionError {
        try {
-            return new URL("https://discordapp.com/channels/"
+            return new URL("https://discord.com/channels/"


Suggested change

return new URL("https://discord.com/channels/"

return new URL("https://" + DiscordApi.DISCORD_DOMAIN + "/channels/"

Bastian · 2020-05-09T17:31:49Z

javacord-core/src/main/java/org/javacord/core/util/rest/RestEndpoint.java

@@ -153,7 +153,7 @@ public void setGlobal(boolean global) {
     * @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://discord.com/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl());


Suggested change

StringBuilder url = new StringBuilder("https://discord.com/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl());

StringBuilder url = new StringBuilder("https://" + DiscordApi.DISCORD_DOMAIN + "/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl());

This commit updates from the old discordapp.com domain to the new discord.com domain. It also introduces constants for the Discord domain and Discord's CDN domain.

CharlesLgn reviewed May 5, 2020

View reviewed changes

Bastian added the high priority An issue or pull request with a high priority label May 5, 2020

Bastian linked an issue May 5, 2020 that may be closed by this pull request

Change endpoints from discordapp.com to discord.com #554

Closed

CharlesLgn reviewed May 5, 2020

View reviewed changes

Bastian approved these changes May 8, 2020

View reviewed changes

Bastian mentioned this pull request May 9, 2020

Adding missing server fields to Server and ServerUpdater #545

Merged

DoNotSpamPls suggested changes May 9, 2020

View reviewed changes

Bastian requested changes May 9, 2020

View reviewed changes

Bastian force-pushed the patch-1 branch from 2535246 to bc6b275 Compare May 9, 2020 17:57

Bastian approved these changes May 9, 2020

View reviewed changes

Bastian force-pushed the patch-1 branch 3 times, most recently from 71c1d4b to 8b3d540 Compare May 9, 2020 18:12

Bastian added this to the Next Version milestone May 9, 2020

Update to new Discord domain

121ac5c

This commit updates from the old discordapp.com domain to the new discord.com domain. It also introduces constants for the Discord domain and Discord's CDN domain.

Bastian force-pushed the patch-1 branch from 8b3d540 to 121ac5c Compare May 9, 2020 18:19

Bastian merged commit 52fc1e7 into Javacord:development May 9, 2020

Shunshun94 mentioned this pull request Aug 1, 2020

api のドメイン変更に追随する Shunshun94/discord-bcdicebot#53

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change the occourences of discordapp.com to discord.com #555

Change the occourences of discordapp.com to discord.com #555

Joshix-1 commented May 4, 2020

CharlesLgn left a comment

Joshix-1 commented May 5, 2020

Bastian commented May 5, 2020

Bastian commented May 5, 2020 •

edited

Bastian commented May 5, 2020 •

edited

Vampire commented May 5, 2020

CharlesLgn May 5, 2020

CharlesLgn May 5, 2020

CharlesLgn May 5, 2020

Joshix-1 May 5, 2020 •

edited

Vampire May 5, 2020

Vampire May 5, 2020

Bastian commented May 8, 2020 •

edited

DoNotSpamPls May 9, 2020

Bastian left a comment

Bastian May 9, 2020

Bastian May 9, 2020

Bastian May 9, 2020

Bastian May 9, 2020

	"https://discord.com/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";
	"https://" + DiscordApi.DISCORD_DOMAIN + "/oauth2/authorize?client_id=%s&scope=bot&permissions=%s";

	return new URL("https://discord.com/channels/"
	return new URL("https://" + DiscordApi.DISCORD_DOMAIN + "/channels/"

	StringBuilder url = new StringBuilder("https://discord.com/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl());
	StringBuilder url = new StringBuilder("https://" + DiscordApi.DISCORD_DOMAIN + "/api/v" + Javacord.DISCORD_API_VERSION + getEndpointUrl());

Change the occourences of discordapp.com to discord.com #555

Change the occourences of discordapp.com to discord.com #555

Conversation

Joshix-1 commented May 4, 2020

CharlesLgn left a comment

Choose a reason for hiding this comment

Joshix-1 commented May 5, 2020

Bastian commented May 5, 2020

Bastian commented May 5, 2020 • edited

Bastian commented May 5, 2020 • edited

Vampire commented May 5, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Joshix-1 May 5, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Bastian commented May 8, 2020 • edited

Choose a reason for hiding this comment

Bastian left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Bastian commented May 5, 2020 •

edited

Bastian commented May 5, 2020 •

edited

Joshix-1 May 5, 2020 •

edited

Bastian commented May 8, 2020 •

edited