From daee56e486e06c1f5a04fa60ed16d615ecee1398 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Sun, 19 Jul 2020 13:10:36 -0400
Subject: [PATCH] Update Discord URL to the new one (#52299)

Replace `discordapp.com` with `discord.com`.
---
 code/controllers/subsystem/discord.dm | 2 +-
 config/config.txt                     | 2 +-
 tools/WebhookProcessor/secret.php     | 8 ++++----
 tools/discordRoleScript/Script.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm
index 61739f5acb2..47de98ded37 100644
--- a/code/controllers/subsystem/discord.dm
+++ b/code/controllers/subsystem/discord.dm
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(discord)
 	if(!CONFIG_GET(flag/enable_discord_autorole))
 		return
 
-	var/url = "https://discordapp.com/api/guilds/[CONFIG_GET(string/discord_guildid)]/members/[id]/roles/[CONFIG_GET(string/discord_roleid)]"
+	var/url = "https://discord.com/api/guilds/[CONFIG_GET(string/discord_guildid)]/members/[id]/roles/[CONFIG_GET(string/discord_roleid)]"
 
 	// Make the request
 	var/datum/http_request/req = new()
diff --git a/config/config.txt b/config/config.txt
index 0dba4ce4ae4..93ae9d9ba36 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -496,7 +496,7 @@ DEFAULT_VIEW_SQUARE 15x15
 
 #### DISCORD STUFFS ####
 ## MAKE SURE ALL SECTIONS OF THIS ARE FILLED OUT BEFORE ENABLING
-## Discord IDs can be obtained by following this guide: https://support.discordapp.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-
+## Discord IDs can be obtained by following this guide: https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-
 
 ## Uncomment to enable discord auto-roling when users link their BYOND and Discord accounts
 #ENABLE_DISCORD_AUTOROLE
diff --git a/tools/WebhookProcessor/secret.php b/tools/WebhookProcessor/secret.php
index 39aa413659b..02dad3d6271 100644
--- a/tools/WebhookProcessor/secret.php
+++ b/tools/WebhookProcessor/secret.php
@@ -1,6 +1,6 @@
 <?php
 //This file contains things that should not be touched by the automatic live tracker
- 
+
 //Github lets you have it sign the message with a secret that you can validate. This prevents people from faking events.
 //This var should match the secret you configured for this webhook on github.
 //This is required as otherwise somebody could trick the script into leaking the api key.
@@ -67,7 +67,7 @@ announce_secret - Announce secret/security prs that have a [s] in front of the t
 $servers[$configitem]['announce_secret'] = false;
 $servers[$configitem]['announce_secret'] = 'only';
 
-announce_unvalidated - Announce prs by unvalidated users (see the validation setting above)? Defaults to no. 
+announce_unvalidated - Announce prs by unvalidated users (see the validation setting above)? Defaults to no.
 	Can also be set to 'only' to only announce prs by unvalidated users.
 $servers[$configitem]['announce_unvalidated'] = false;
 
@@ -104,7 +104,7 @@ $configitem = -1;//ignore me
 $discordWebHooks[++$configitem] = array();
 
 // Webhook Url (you can get this from discord via the webhook setting menu of the server or a channel.)
-$discordWebHooks[$configitem]['url'] = 'https://discordapp.com/api/webhooks/538933489920245771/xaoYtVuype-P1rb_uthQLkh_C4iVL3sjtIvFEp7rsfhbBs8tDsSJgE0a9MNWJaoSPBPK';
+$discordWebHooks[$configitem]['url'] = 'https://discord.com/api/webhooks/538933489920245771/xaoYtVuype-P1rb_uthQLkh_C4iVL3sjtIvFEp7rsfhbBs8tDsSJgE0a9MNWJaoSPBPK';
 
 // show an embed with more info?
 $discordWebHooks[$configitem]['embed'] = true;
@@ -118,7 +118,7 @@ $discordWebHooks[$configitem]['no_text'] = false;
 $discordWebHooks[++$configitem] = array();
 
 // Webhook Url (you can get this from discord via the webhook setting menu of the server or a channel.)
-$discordWebHooks[$configitem]['url'] = 'https://discordapp.com/api/webhooks/538933686956064769/q0uDel7S6eutvRIyEwsuZo_ppzAoxqUNeU2PRChYVsYoJmmn2f2YYSDoMjy9FhhXKqpI';
+$discordWebHooks[$configitem]['url'] = 'https://discord.com/api/webhooks/538933686956064769/q0uDel7S6eutvRIyEwsuZo_ppzAoxqUNeU2PRChYVsYoJmmn2f2YYSDoMjy9FhhXKqpI';
 
 // show an embed with more info?
 $discordWebHooks[$configitem]['embed'] = true;
diff --git a/tools/discordRoleScript/Script.py b/tools/discordRoleScript/Script.py
index 0b5501588b2..d710aca26ee 100644
--- a/tools/discordRoleScript/Script.py
+++ b/tools/discordRoleScript/Script.py
@@ -48,7 +48,7 @@ for user in usersToProcess:
     count += 1  # Why the fuck does python not have ++
     # user[0] = ckey, user[1] = discord ID
     print("Processing "+str(user[0])+" (Discord ID: " + str(user[1]) + ") | User "+str(count)+"/"+str(total))
-    url = "https://discordapp.com/api/guilds/"+str(guildID)+"/members/"+str(user[1])+"/roles/"+str(roleID)
+    url = "https://discord.com/api/guilds/"+str(guildID)+"/members/"+str(user[1])+"/roles/"+str(roleID)
     response = requests.put(url, headers={"Authorization": "Bot "+str(botToken)})
     # Adding a role returns a code 204, not a code 200. Dont ask
     if response.status_code != 204: