From 7eab0263bac6861d248916c37a59414496284174 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Thu, 16 Jul 2020 20:51:25 +0800 Subject: [PATCH] https://github.com/tgstation/tgstation/pull/51213 --- code/modules/admin/verbs/adminpm.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index bbd6b55e4f..68b9a8e341 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -55,7 +55,7 @@ if(AH) message_admins("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.") - var/msg = input(src,"Message:", "Private message to [key_name(C, 0, 0)]") as message|null + var/msg = stripped_multiline_input(src,"Message:", "Private message to [key_name(C, 0, 0)]") if (!msg) message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.") return @@ -87,10 +87,10 @@ if(irc) - if(!ircreplyamount) //to prevent people from spamming irc + if(!ircreplyamount) //to prevent people from spamming irc/discord return if(!msg) - msg = input(src,"Message:", "Private message to Administrator") as text|null + msg = stripped_multiline_input(src,"Message:", "Private message to Administrator") if(!msg) return @@ -112,7 +112,7 @@ //get message text, limit it's length.and clean/escape html if(!msg) - msg = input(src,"Message:", "Private message to [key_name(recipient, 0, 0)]") as message|null + msg = stripped_multiline_input(src,"Message:", "Private message to [key_name(recipient, 0, 0)]") msg = trim(msg) if(!msg) return @@ -191,7 +191,7 @@ spawn() //so we don't hold the caller proc up var/sender = src var/sendername = key - var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as text|null //show message and await a reply + var/reply = stripped_multiline_input(recipient, msg,"Admin PM from-[sendername]", "") //show message and await a reply if(recipient && reply) if(sender) recipient.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them