From b87135fcc83e7d123c0ec094537ff82f306027a9 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat, 23 Oct 2021 10:53:08 +0100 Subject: [PATCH] Adds server ID to discord webhook messages (#16987) * adds server ID to webhooks * Apply suggestions from code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/controllers/subsystem/discord.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm index f3d42a94b51..e6dd4438ffe 100644 --- a/code/controllers/subsystem/discord.dm +++ b/code/controllers/subsystem/discord.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(discord) webhook_urls = GLOB.configuration.discord.mentor_webhook_urls var/datum/discord_webhook_payload/dwp = new() - dwp.webhook_content = content + dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [content]" for(var/url in webhook_urls) SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json")) @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(discord) var/message = "[content] [alerttext] [add_ping ? handle_administrator_ping() : ""]" var/datum/discord_webhook_payload/dwp = new() - dwp.webhook_content = message + dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [message]" for(var/url in GLOB.configuration.discord.admin_webhook_urls) SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json")) @@ -94,7 +94,7 @@ SUBSYSTEM_DEF(discord) var/message = "[content] [alerttext][add_ping ? handle_mentor_ping() : ""]" var/datum/discord_webhook_payload/dwp = new() - dwp.webhook_content = message + dwp.webhook_content = "**\[[GLOB.configuration.system.instance_id]]** [message]" for(var/url in GLOB.configuration.discord.mentor_webhook_urls) SShttp.create_async_request(RUSTG_HTTP_METHOD_POST, url, dwp.serialize2json(), list("content-type" = "application/json"))