cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Faxes and ahelps admin channel changes

Browse Source
This commit is contained in:
Cadyn
2021-02-24 13:36:31 -08:00
parent 129bf7f2b9
commit 51ce2042af
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_helpers/logging.dm
View File

@@ -34,7 +34,6 @@
admin_log.Add(text) admin_log.Add(text)
if (config.log_admin) if (config.log_admin)
WRITE_LOG(diary, "ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]") WRITE_LOG(diary, "ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]")
world.TgsTargetedChatBroadcast("ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]", TRUE) //CHOMPEdit, bot shows all adminpms now
/proc/log_debug(text) /proc/log_debug(text)
if (config.log_debug) if (config.log_debug)

8
code/modules/admin/verbs/adminhelp.dm
View File

@@ -190,9 +190,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/list/activemins = adm["present"] var/list/activemins = adm["present"]
var activeMins = activemins.len var activeMins = activemins.len
if(is_bwoink) if(is_bwoink)
world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE) world.TgsChatBroadcast("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", list("814243638800416799")) //CHOMPEdit
else else
world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE) world.TgsChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", list("814243638800416799")) //CHOMPEdit
//YW EDIT END //YW EDIT END
GLOB.ahelp_tickets.active_tickets += src GLOB.ahelp_tickets.active_tickets += src
@@ -203,7 +203,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return ..() return ..()
/datum/admin_help/proc/AddInteraction(formatted_message) /datum/admin_help/proc/AddInteraction(formatted_message)
_interactions += "[gameTimestamp()]: [formatted_message]" var/curinteraction = "[gameTimestamp()]: [formatted_message]"
world.TgsChatBroadcast("ADMINHELP: TICKETID:[id] [strip_html_properly(curinteraction)]", list("814243638800416799")) //CHOMPEdit
_interactions += curinteraction
//private //private
/datum/admin_help/proc/FullMonty(ref_src) /datum/admin_help/proc/FullMonty(ref_src)

43
code/modules/paperwork/faxmachine_vr.dm
View File

@@ -6,12 +6,12 @@
* If the fax is a paper_bundle, do so recursively for each page. * If the fax is a paper_bundle, do so recursively for each page.
* returns a random unique faxid. * returns a random unique faxid.
*/ */
/obj/machinery/photocopier/faxmachine/proc/export_fax(fax) /obj/machinery/photocopier/faxmachine/proc/export_fax(fax) //CHOMPEdit Begin
var faxid = "[num2text(world.realtime,12)]_[rand(10000)]" var faxid = "[num2text(world.realtime,12)]_[rand(9999)+1]"
if (istype(fax, /obj/item/weapon/paper)) if (istype(fax, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = fax var/obj/item/weapon/paper/P = fax
var/text = "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>"; var/text = "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>";
file("[config.fax_export_dir]/fax_[faxid].html") << text; rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html")
else if (istype(fax, /obj/item/weapon/photo)) else if (istype(fax, /obj/item/weapon/photo))
var/obj/item/weapon/photo/H = fax var/obj/item/weapon/photo/H = fax
fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png") fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png")
@@ -20,18 +20,36 @@
+ "<img src='photo_[faxid].png'>" \ + "<img src='photo_[faxid].png'>" \
+ "[H.scribble ? "<br>Written on the back:<br><i>[H.scribble]</i>" : ""]"\ + "[H.scribble ? "<br>Written on the back:<br><i>[H.scribble]</i>" : ""]"\
+ "</body></html>" + "</body></html>"
file("[config.fax_export_dir]/fax_[faxid].html") << text rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html")
else if (istype(fax, /obj/item/weapon/paper_bundle)) else if (istype(fax, /obj/item/weapon/paper_bundle))
var/def_faxid = faxid
faxid += "_0"
var/obj/item/weapon/paper_bundle/B = fax var/obj/item/weapon/paper_bundle/B = fax
var/data = "" var/data = ""
for (var/page = 1, page <= B.pages.len, page++) for (var/page = 1, page <= B.pages.len, page++)
var/obj/pageobj = B.pages[page] var/obj/pageobj = B.pages[page]
var/page_faxid = export_fax(pageobj) var/page_faxid = export_fax_id(pageobj,def_faxid + "_[page]")
data += "<a href='fax_[page_faxid].html'>Page [page] - [pageobj.name]</a><br>" data += "<a href='fax_[page_faxid].html'>Page [page] - [pageobj.name]</a><br>"
var/text = "<html><head><title>[B.name]</title></head><body>[data]</body></html>" var/text = "<html><head><title>[B.name]</title></head><body>[data]</body></html>"
file("[config.fax_export_dir]/fax_[faxid].html") << text rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html")
return faxid return faxid
/obj/machinery/photocopier/faxmachine/proc/export_fax_id(fax,faxid)
if (istype(fax, /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = fax
var/text = "<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY>[P.info][P.stamps]</BODY></HTML>";
rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html")
else if (istype(fax, /obj/item/weapon/photo))
var/obj/item/weapon/photo/H = fax
fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png")
var/text = "<html><head><title>[H.name]</title></head>" \
+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
+ "<img src='photo_[faxid].png'>" \
+ "[H.scribble ? "<br>Written on the back:<br><i>[H.scribble]</i>" : ""]"\
+ "</body></html>"
rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html")
return faxid
//CHOMPEdit End
/** /**
* Call the chat webhook to transmit a notification of an admin fax to the admin chat. * Call the chat webhook to transmit a notification of an admin fax to the admin chat.
*/ */
@@ -47,8 +65,17 @@
query_string += "&sentname=[url_encode(sent.name)]" query_string += "&sentname=[url_encode(sent.name)]"
world.Export("[config.chat_webhook_url]?[query_string]") world.Export("[config.chat_webhook_url]?[query_string]")
//YW EDIT //CHOMPEdit also //YW EDIT //CHOMPEdit also
var/faxmsg = return_file_text("[config.fax_export_dir]/fax_[faxid].html") var/idlen = length(faxid) + 1
world.TgsTargetedChatBroadcast("FAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - FAXID: **[sanitize(faxid)]** \n FAX: ```[strip_html_properly(faxmsg)]```", TRUE) if (istype(sent, /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/B = sent
faxid = copytext(faxid,1,idlen-2)
var/faxids = "FAXMULTIID: [faxid]_0"
for(var/page = 1, page <= B.pages.len, page++)
faxids+= "|[faxid]_[page]"
world.TgsTargetedChatBroadcast("MULTIFAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - [faxids]", TRUE)
world.TgsTargetedChatBroadcast("FAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - FAXID: **[sanitize(faxid)]**", TRUE)
//YW EDIT END //YW EDIT END
// //