From 11bbb83d5465a3bca8fe72663ac49e74b1cd1705 Mon Sep 17 00:00:00 2001
From: Marcel Korzonek <68189302+Xirado@users.noreply.github.com>
Date: Fri, 24 Dec 2021 07:41:34 +0100
Subject: [PATCH] Hardcode gateway url (#1957)

---
 .../dv8tion/jda/api/utils/SessionController.java    | 13 +++++++------
 .../jda/api/utils/SessionControllerAdapter.java     |  9 ---------
 src/main/java/net/dv8tion/jda/internal/JDAImpl.java |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/utils/SessionController.java b/src/main/java/net/dv8tion/jda/api/utils/SessionController.java
index 425161e70e..2be92f76ec 100644
--- a/src/main/java/net/dv8tion/jda/api/utils/SessionController.java
+++ b/src/main/java/net/dv8tion/jda/api/utils/SessionController.java
@@ -138,16 +138,17 @@ default void setConcurrency(int level) {}
     void setGlobalRatelimit(long ratelimit);
 
     /**
-     * Called by a JDA session when a new gateway session starts (Connecting, Reconnecting).
-     * <br>Should provide the gateway endpoint (wss) to connect to.
+     * Discord's gateway URL, which is used to receive events.
      *
-     * @param  api
-     *         The current JDA instance (used for RestActions and ShardInfo)
+     * Called by JDA when starting a new gateway session (Connecting, Reconnecting).
      *
      * @return The gateway endpoint
      */
     @Nonnull
-    String getGateway(@Nonnull JDA api);
+    default String getGateway()
+    {
+        return "wss://gateway.discord.gg/";
+    }
 
     /**
      * Called by {@link net.dv8tion.jda.api.sharding.DefaultShardManager DefaultShardManager}
@@ -159,7 +160,7 @@ default void setConcurrency(int level) {}
      *
      * @return The ShardedGateway instance consisting of the gateway endpoint to connect to and the shardTotal
      *
-     * @see    #getGateway(net.dv8tion.jda.api.JDA)
+     * @see    #getGateway()
      */
     @Nonnull
     ShardedGateway getShardedGateway(@Nonnull JDA api);
diff --git a/src/main/java/net/dv8tion/jda/api/utils/SessionControllerAdapter.java b/src/main/java/net/dv8tion/jda/api/utils/SessionControllerAdapter.java
index 3aa3e08d90..7ab6d3f711 100644
--- a/src/main/java/net/dv8tion/jda/api/utils/SessionControllerAdapter.java
+++ b/src/main/java/net/dv8tion/jda/api/utils/SessionControllerAdapter.java
@@ -76,15 +76,6 @@ public void setGlobalRatelimit(long ratelimit)
         globalRatelimit.set(ratelimit);
     }
 
-    @Nonnull
-    @Override
-    public String getGateway(@Nonnull JDA api)
-    {
-        Route.CompiledRoute route = Route.Misc.GATEWAY.compile();
-        return new RestActionImpl<String>(api, route,
-                (response, request) -> response.getObject().getString("url")).priority().complete();
-    }
-
     @Nonnull
     @Override
     public ShardedGateway getShardedGateway(@Nonnull JDA api)
diff --git a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
index 5f094c59f6..fde4ea7612 100644
--- a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
@@ -318,7 +318,7 @@ public int login(String gatewayUrl, ShardInfo shardInfo, Compression compression
 
     public String getGateway()
     {
-        return getSessionController().getGateway(this);
+        return getSessionController().getGateway();
     }