Merge pull request #8 from Aurorastation/master

Bot Things

code/modules/admin/player_notes_sql.dm

@@ -183,6 +183,47 @@
 	dat += "</table>"
 	usr << browse(dat,"window=lookupnotes;size=900x500")
 
+/proc/show_player_info_discord(var/ckey)
+	if (!ckey)
+		return "No ckey given!"
+
+	establish_db_connection()
+
+	if (!dbcon.IsConnected())
+		return "Unable to establish database connection! Aborting!"
+
+	var/DBQuery/info_query = dbcon.NewQuery("SELECT ip, computerid FROM ss13_player WHERE ckey = :ckey")
+	info_query.Execute(list(":ckey" = ckey))
+
+	var/address = null
+	var/computer_id = null
+	if (info_query.NextRow())
+		address = info_query.item[1]
+		computer_id = info_query.item[2]
+
+	var/query_content = "SELECT a_ckey, adddate, content FROM ss13_notes WHERE visible = '1' AND ckey = :ckey"
+	var/query_details = list(":ckey" = ckey, ":address" = address, ":computerid" = computer_id)
+	if (address)
+		query_content += " OR ip = :address"
+	if (computer_id)
+		query_content += " OR computerid = :computerid"
+
+	var/DBQuery/query = dbcon.NewQuery(query_content)
+	query.Execute(query_details, 1)
+
+	var/notes
+	while (query.NextRow())
+		notes += "\"[query.item[3]]\" - by [query.item[1]] on [query.item[2]]\n\n"
+
+	if (!notes)
+		return "[ckey] has no notes that could be retreived!"
+	else
+		var/content = "Displaying [ckey]'s notes:\n\n"
+		content += "```\n"
+		content += notes
+		content += "```"
+		return content
+
 /*/proc/notes_transfer()
 	msg_scopes("Locating master list.")
 	var/savefile/note_list = new("data/player_notes.sav")

code/modules/admin/verbs/adminhelp.dm

@@ -116,8 +116,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	var/admin_number_present = admins.len - admin_number_afk
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
-		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
-	else
-		send2adminirc("Request for Help from [key_name(src)]: [html_decode(original_msg)]")
+		send_to_admin_discord("@everyone Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

code/modules/admin/verbs/adminpm.dm

@@ -108,7 +108,6 @@
 		C << 'sound/effects/adminhelp.ogg'
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
-	send2adminirc("Reply: [key_name(src)]->[key_name(C)]: [html_decode(msg)]")
 
 	//we don't use message_admins here because the sender/receiver might get it too
 	for(var/client/X in admins)
@@ -118,31 +117,25 @@
 		if(X.key != key && X.key != C.key && (X.holder.rights & (R_ADMIN|R_MOD)))
 			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>[key_name(C, X, 0)]</span>: <span class='message'>[msg]</span></span></span>"
 
-/client/proc/cmd_admin_irc_pm(sender)
+/client/proc/cmd_admin_discord_pm(sender)
 	if(prefs.muted & MUTE_ADMINHELP)
 		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
 		return
 
-	var/msg = input(src,"Message:", "Reply private message to [sender] on IRC / 400 character limit") as text|null
+	var/msg = input(src,"Message:", "Reply private message to [sender] on Discord") as text|null
 
 	if(!msg)
 		return
 
 	sanitize(msg)
 
-	// Handled on Bot32's end, unsure about other bots
-//	if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations.  Probably easier to do this on the bots ends.
-//		src << "<span class='warning'>Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting</span>"
-//		src << "\blue [msg]</span>"
-//		return
+	send_to_admin_discord("PlayerPM to [sender] from [key_name(src)]: [html_decode(msg)]")
 
-	send2adminirc("PlayerPM to [sender] from [key_name(src)]: [html_decode(msg)]")
+	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "", src) + " to <span class='name'>Discord-[sender]</span>: <span class='message'>[msg]</span></span></span>"
 
-	src << "<span class='pm'><span class='out'>" + create_text_tag("pm_out_alt", "", src) + " to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"
-
-	log_admin("PM: [key_name(src)]->IRC-[sender]: [msg]")
+	log_admin("PM: [key_name(src)]->Discord-[sender]: [msg]")
 	for(var/client/X in admins)
 		if(X == src)
 			continue
 		if(X.holder.rights & (R_ADMIN|R_MOD))
-			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>IRC-[sender]</span>: <span class='message'>[msg]</span></span></span>"
+			X << "<span class='pm'><span class='other'>" + create_text_tag("pm_other", "PM:", X) + " <span class='name'>[key_name(src, X, 0)]</span> to <span class='name'>Discord-[sender]</span>: <span class='message'>[msg]</span></span></span>"

code/modules/admin/verbs/pray.dm

@@ -38,6 +38,8 @@
 		else if (R_CCIAA & C.holder.rights)
 			C << msg_cciaa
 
+	send_to_cciaa_discord("!!! @everyone - Emergency message from the station: \"[msg]\", sent by [Sender] !!!")
+
 /proc/Syndicate_announce(var/msg, var/mob/Sender)
 	msg = "\blue <b><font color=crimson>ILLEGAL:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)