Reworked discord interface to replace the IRC one completely

code/_onclick/ai.dm

@@ -52,7 +52,7 @@
 		message_admins("[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))")
 		var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))"
 		log_admin(message)
-		send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+		send2discord_adminless_only(config.discord_channel_admin, "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
 
 
 	var/turf_visible
@@ -65,7 +65,7 @@
 				if(pixel_turf.obscured)
 					log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])")
 					message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))")
-					send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+					send2discord_adminless_only(config.discord_channel_admin, "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
 				return
 
 	var/list/modifiers = params2list(params)

code/controllers/configuration.dm

@@ -148,7 +148,9 @@
 
 	var/use_discord_bot = 0
 	var/discord_host = ""
-	var/discord_port = ""
+	var/discord_channel_main = ""
+	var/discord_channel_admin = ""
+	var/discord_channel_cidrandomizer = ""
 
 	var/default_laws = 0 //Controls what laws the AI spawns with.
 
@@ -464,9 +466,6 @@
 				if("use_irc_bot")
 					use_irc_bot = 1
 
-				if("use_discord_bot")
-					use_discord_bot = 1
-
 				if("ticklag")
 					Ticklag = text2num(value)
 
@@ -525,11 +524,20 @@
 				if("cidrandomizer_irc")
 					config.cidrandomizer_irc = value
 
+				if("use_discord_bot")
+					use_discord_bot = 1
+
 				if("discord_host")
 					config.discord_host = value
 
-				if("discord_port")
-					config.discord_port = value
+				if("discord_channel_main")
+					config.discord_channel_main = value
+
+				if("discord_channel_admin")
+					config.discord_channel_admin = value
+
+				if("discord_channel_cidrandomizer")
+					config.discord_channel_cidrandomizer = value
 
 				if("python_path")
 					if(value)

code/game/gamemodes/game_mode.dm

@@ -244,7 +244,7 @@
 	if(escaped_on_pod_5 > 0)
 		feedback_set("escaped_on_pod_5",escaped_on_pod_5)
 
-	send2mainirc("A round of [src.name] has ended - [surviving_total] survivors, [ghosts] ghosts.")
+	send2maindiscord("A round of [src.name] has ended - [surviving_total] survivors, [ghosts] ghosts.")
 	return 0
 
 

code/game/gamemodes/gameticker.dm

@@ -219,7 +219,7 @@ var/round_start_time = 0
 
 	var/list/admins_number = staff_countup(R_BAN)
 	if(admins_number[1] == 0 && admins_number[3] == 0)
-		send2irc(config.admin_notify_irc, "Round has started with no admins online.")
+		send2discord("message", config.discord_channel_admin, "Round has started with no admins online.")
 	auto_toggle_ooc(0) // Turn it off
 	round_start_time = world.time
 

code/modules/admin/DB ban/functions.dm

@@ -137,7 +137,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 	message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1)
 
 	if(announceinirc)
-		send2irc("BAN ALERT","[a_ckey] applied a [bantype_str] on [ckey]")
+		send2discord("message", config.discord_channel_admin,"BAN ALERT","[a_ckey] applied a [bantype_str] on [ckey]")
 
 	if(kickbannedckey)
 		if(banned_mob && banned_mob.client && banned_mob.client.ckey == banckey)

code/modules/admin/verbs/adminhelp.dm

@@ -136,15 +136,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
 		if(!admin_number_afk)
-			send2adminirc("[selected_type] from [key_name(src)]: [original_msg] - !!No admins online!!")
+			send2admindiscord("[selected_type] from [key_name(src)]: [original_msg] - !!No admins online!!")
 		else
-			send2adminirc("[selected_type] from [key_name(src)]: [original_msg] - !!All admins AFK ([admin_number_afk])!!")
+			send2admindiscord("[selected_type] from [key_name(src)]: [original_msg] - !!All admins AFK ([admin_number_afk])!!")
 	else
-		send2adminirc("[selected_type] from [key_name(src)]: [original_msg]")
+		send2admindiscord("[selected_type] from [key_name(src)]: [original_msg]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
 
-/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN)
+/proc/send2discord_adminless_only(source, msg, requiredflags = R_BAN)
 	var/admin_number_total = 0		//Total number of admins
 	var/admin_number_afk = 0		//Holds the number of admins who are afk
 	var/admin_number_ignored = 0	//Holds the number of admins without +BAN (so admins who are not really admins)
@@ -166,7 +166,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/admin_number_present = admin_number_total - admin_number_decrease	//Number of admins who are neither afk nor invalid
 	if(admin_number_present <= 0)
 		if(!admin_number_afk && !admin_number_ignored)
-			send2irc(source, "[msg] - No admins online")
+			send2discord("message", source, "[msg] - No admins online")
 		else
-			send2irc(source, "[msg] - All admins AFK ([admin_number_afk]/[admin_number_total]) or skipped ([admin_number_ignored]/[admin_number_total])")
+			send2discord("message", source, "[msg] - All admins AFK ([admin_number_afk]/[admin_number_total]) or skipped ([admin_number_ignored]/[admin_number_total])")
 	return admin_number_present

code/modules/admin/verbs/adminpm.dm

@@ -218,7 +218,7 @@
 		to_chat(src, "<span class='notice'>[msg]</span>")
 		return
 
-	send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]")
+	send2admindiscord("PlayerPM from [key_name(src)]: [html_decode(msg)]")
 
 	to_chat(src, "<font color='blue'>IRC PM to-<b>IRC-Admins</b>: [msg]</font>")
 

code/modules/client/client procs.dm

@@ -471,7 +471,7 @@
 	var/watchreason = check_watchlist(ckey)
 	if(watchreason)
 		message_admins("<font color='red'><B>Notice: </B></font><font color='blue'>[key_name_admin(src)] is on the watchlist and has just connected - Reason: [watchreason]</font>")
-		send2irc(config.admin_notify_irc, "Watchlist - [key_name(src)] is on the watchlist and has just connected - Reason: [watchreason]")
+		send2discord("message", config.discord_channel_admin, "Watchlist - [key_name(src)] is on the watchlist and has just connected - Reason: [watchreason]")
 
 
 	//Just the standard check to see if it's actually a number
@@ -570,7 +570,7 @@
 
 			if(!cidcheck_failedckeys[ckey])
 				message_admins("<span class='adminnotice'>[key_name(src)] has been detected as using a CID randomizer. Connection rejected.</span>")
-				send2irc(config.cidrandomizer_irc, "[key_name(src)] has been detected as using a CID randomizer. Connection rejected.")
+				send2discord("message", config.discord_channel_cidrandomizer, "[key_name(src)] has been detected as using a CID randomizer. Connection rejected.")
 				cidcheck_failedckeys[ckey] = TRUE
 				note_randomizer_user()
 
@@ -583,7 +583,7 @@
 			if(cidcheck_failedckeys[ckey])
 				// Atonement
 				message_admins("<span class='adminnotice'>[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer</span>")
-				send2irc(config.cidrandomizer_irc, "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
+				send2discord("message", config.discord_channel_cidrandomizer, "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
 				cidcheck_failedckeys -= ckey
 			if (cidcheck_spoofckeys[ckey])
 				message_admins("<span class='adminnotice'>[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it <i>appears</i> they aren't spoofing one this time</span>")

code/modules/ext_scripts/discord.dm

@@ -1,9 +1,18 @@
-/hook/startup/proc/discordNotify()
-    if (config.use_discord_bot && config.discord_host && config.discord_port)
-        world.Export("http://[config.discord_host]:[config.discord_port]/?command=startup&name=[station_name()]&connect=[config.server?"[config.server]":"[world.address]:[world.port]"]")
-    return 1
+/proc/send2discord(var/command, var/channel, var/message)
+    if (config.use_discord_bot && config.discord_host)
+        world.Export("http://[config.discord_host]/?command=[command]&channel=[channel]&message=[paranoid_sanitize(message)]")
 
-/hook/roundend/proc/discordNotify()
-    if (config.use_discord_bot && config.discord_host && config.discord_port)
-        world.Export("http://[config.discord_host]:[config.discord_port]/?command=roundend")
+/proc/send2maindiscord(var/message)
+	if(config.discord_channel_main)
+		send2discord("message", config.discord_channel_main, message)
+	return
+
+/proc/send2admindiscord(var/message)
+	if(config.discord_channel_admin)
+		send2discord("message", config.discord_channel_admin, message)
+	return
+
+/hook/startup/proc/discordNotify()
+    if(config.discord_channel_main)
+        send2discord("startup", config.discord_channel_main, "Server starting up on [station_name()]. Connect to: [config.server? "[config.server]" : "[world.address]:[world.port]"]")
     return 1

code/modules/ext_scripts/irc.dm

@@ -1,21 +0,0 @@
-/proc/send2irc(var/channel, var/msg)
-	if(config.use_irc_bot && config.irc_bot_host.len)
-		for(var/IP in config.irc_bot_host)
-			spawn(0)
-				// I have no means of trusting you, cmd
-				ext_python("ircbot_message.py", "[config.comms_password] [IP] [channel] [paranoid_sanitize(msg)]")
-	return
-
-/proc/send2mainirc(var/msg)
-	if(config.main_irc)
-		send2irc(config.main_irc, msg)
-	return
-
-/proc/send2adminirc(var/msg)
-	if(config.admin_irc)
-		send2irc(config.admin_irc, msg)
-	return
-
-/hook/startup/proc/ircNotify()
-	send2mainirc("Server starting up on [station_name()]. Connect to: [config.server? "[config.server]" : "[world.address]:[world.port]"]")
-	return 1

code/modules/mob/logout.dm

@@ -13,7 +13,7 @@
 			message_admins("Admin logout: [key_name_admin(src)]")
 			var/list/admincounter = staff_countup(R_BAN)
 			if(admincounter[1] == 0) // No active admins
-				send2irc(config.admin_notify_irc, "[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
+				send2admindiscord("[key_name(src)] logged out - No active admins, [admincounter[2]] non-admin staff, [admincounter[3]] inactive staff.")
 
 	..()
 

code/modules/power/supermatter/supermatter.dm

@@ -126,7 +126,7 @@
 		if(!current_state)
 			log_and_message_admins(message)
 			if(send_to_irc)
-				send2adminirc(message)
+				send2admindiscord(message)
 		return TRUE
 	else
 		return FALSE

code/modules/shuttle/emergency.dm

@@ -233,7 +233,7 @@
 					return
 				mode = SHUTTLE_DOCKED
 				timer = world.time
-				send2irc("Server", "The Emergency Shuttle has docked with the station.")
+				send2maindiscord("The Emergency Shuttle has docked with the station.")
 				emergency_shuttle_docked.Announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.")
 
 /*

config/example/config.txt

@@ -277,10 +277,16 @@ GHOST_INTERACTION
 #USE_DISCORD_BOT
 
 ## Host where the Discord bot is hosted.
-#DISCORD_HOST 127.0.0.1
+#DISCORD_HOST 127.0.0.1:5001
 
-## Port where the Discord bot is listening.
-#DISCORD_PORT 5001
+## Channel ID where the Bot should post its main notifications
+#DISCORD_CHANNEL_MAIN 0123456789
+
+## Channel ID where the Bot should post its admin notifications
+#DISCORD_CHANNEL_ADMIN 0123456789
+
+## Channel ID where the bot should post its cidrandomizer notifications
+#DISCORD_CHANNEL_CIDRANDOMIZER 0123456789
 
 ## Path to the python2 executable on the system.  Leave blank for default.
 ## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.

paradise.dme

@@ -1426,7 +1426,6 @@
 #include "code\modules\examine\descriptions\turfs.dm"
 #include "code\modules\examine\descriptions\weapons.dm"
 #include "code\modules\ext_scripts\discord.dm"
-#include "code\modules\ext_scripts\irc.dm"
 #include "code\modules\ext_scripts\python.dm"
 #include "code\modules\fancytitle\fancytitle.dm"
 #include "code\modules\fish\fish_eggs.dm"