From ac499fd5496b429fcb5eebd486fa36c41fe49966 Mon Sep 17 00:00:00 2001 From: swissloaf <39781787+swissloaf@users.noreply.github.com> Date: Sat, 7 Dec 2019 18:39:47 -0600 Subject: [PATCH 1/3] Adds BUG option to adminhelp admin menu --- .../code/modules/admin/verbs/adminhelp.dm | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index ea7a65c12d61..f44eeea64145 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -209,6 +209,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) . += " (IC)" . += " (RSLVE)" . += " (WIKI)" + . += " (BUG)" . += " (MHELP)" //private @@ -428,7 +429,27 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) log_admin_private(msg) AddInteraction("Marked as WIKI issue by [usr.ckey]") Resolve(silent = TRUE) + +//Resolve ticket with bug message +/datum/admin_help/proc/GithubIssue(key_name = key_name_admin(usr)) + if(state != AHELP_ACTIVE) + return + + var/msg = "- AdminHelp marked as a Github issue by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)]! -
" + msg += "You are reporting a Bug or Github Issue.
" + msg += "[CONFIG_GET(string/githuburl)]" + msg += "Please navigate to the issues section and open up an issue regarding the bug or other issue you have discovered. A maintainer will deal with it shortly.
" + + if(initiator) + to_chat(initiator, msg, confidential=TRUE) + SSblackbox.record_feedback("tally", "ahelp_stats", 1, "BUG") + msg = "Ticket [TicketHref("#[id]")] marked as BUG by [key_name]" + message_admins(msg) + log_admin_private(msg) + AddInteraction("Marked as BUG issue by [usr.ckey]") + Resolve(silent = TRUE) + //Show the ticket panel /datum/admin_help/proc/TicketPanel() var/reply_link = " Reply" @@ -563,6 +584,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) Administer() if("wiki") WikiIssue() + if("bug") + GithubIssue() if("popup") PopUps() From cd81bf99c8612392d28a59af64c0ce904f2eec82 Mon Sep 17 00:00:00 2001 From: swissloaf <39781787+swissloaf@users.noreply.github.com> Date: Mon, 9 Dec 2019 18:37:53 -0600 Subject: [PATCH 2/3] Test jobama --- yogstation/code/modules/admin/verbs/adminhelp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index f44eeea64145..5111c4dfdf18 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -437,7 +437,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/msg = "- AdminHelp marked as a Github issue by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)]! -
" msg += "You are reporting a Bug or Github Issue.
" - msg += "[CONFIG_GET(string/githuburl)]" + msg += "[CONFIG_GET(string/githuburl)]/issues/new?template=bug_report.md" msg += "Please navigate to the issues section and open up an issue regarding the bug or other issue you have discovered. A maintainer will deal with it shortly.
" if(initiator) From e7f037011d3cc2d96d2caac452a2b77ccf6ea644 Mon Sep 17 00:00:00 2001 From: swissloaf <39781787+swissloaf@users.noreply.github.com> Date: Mon, 9 Dec 2019 18:46:38 -0600 Subject: [PATCH 3/3] wording fix HONK fuck! --- yogstation/code/modules/admin/verbs/adminhelp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index 5111c4dfdf18..525fcadfd386 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -438,7 +438,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/msg = "- AdminHelp marked as a Github issue by [usr.client.holder?.fakekey ? "an Administrator" : key_name(usr, 0, 0)]! -
" msg += "You are reporting a Bug or Github Issue.
" msg += "[CONFIG_GET(string/githuburl)]/issues/new?template=bug_report.md" - msg += "Please navigate to the issues section and open up an issue regarding the bug or other issue you have discovered. A maintainer will deal with it shortly.
" + msg += "Please fill out the issues form with detailed information about the bug or other issue you have discovered.
" if(initiator) to_chat(initiator, msg, confidential=TRUE)