Misc adds and changes

code/controllers/subsystems/chat.dm

@@ -1,77 +1,43 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
 SUBSYSTEM_DEF(chat)
 	name = "Chat"
 	flags = SS_TICKER
-	wait = 1 // SS_TICKER means this runs every tick
+	wait = 1
 	priority = FIRE_PRIORITY_CHAT
 	init_order = INIT_ORDER_CHAT
 
-	var/list/list/msg_queue = list() //List of lists
+	var/list/payload_by_client = list()
 
-/datum/controller/subsystem/chat/Initialize(timeofday)
-	init_vchat()
-	..()
+/datum/controller/subsystem/chat/Initialize()
+	// Just used by chat system to know that initialization is nearly finished.
+	// The to_chat checks could probably check the runlevel instead, but would require testing.
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/chat/fire()
-	var/list/msg_queue = src.msg_queue // Local variable for sanic speed.
-	for(var/client/C as anything in msg_queue)
-		var/list/messages = msg_queue[C]
-		msg_queue -= C
-		if (C)
-			C << output(jsEncode(messages), "htmloutput:putmessage")
-
+	for(var/key in payload_by_client)
+		var/client/client = key
+		var/payload = payload_by_client[key]
+		payload_by_client -= key
+		if(client)
+			// Send to tgchat
+			client.tgui_panel?.window.send_message("chat/message", payload)
+			// Send to old chat
+			for(var/message in payload)
+				SEND_TEXT(client, message_to_html(message))
 		if(MC_TICK_CHECK)
 			return
 
-/datum/controller/subsystem/chat/stat_entry()
-	..("C:[msg_queue.len]")
-
-/datum/controller/subsystem/chat/proc/queue(target, time, message, handle_whitespace = TRUE)
-	if(!target || !message)
-		return
-
-	if(!istext(message))
-		stack_trace("to_chat called with invalid input type")
-		return
-
-	// Currently to_chat(world, ...) gets sent individually to each client.  Consider.
-	if(target == world)
-		target = GLOB.clients
-
-	//Some macros remain in the string even after parsing and fuck up the eventual output
-	var/original_message = message
-	message = replacetext(message, "\n", "<br>")
-	message = replacetext(message, "\improper", "")
-	message = replacetext(message, "\proper", "")
-
-	if(isnull(time))
-		time = world.time
-
-	var/list/messageStruct = list("time" = time, "message" = message);
-
+/datum/controller/subsystem/chat/proc/queue(target, message)
 	if(islist(target))
-		for(var/I in target)
-			var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
-			if(!C || !C.chatOutput)
-				continue // No client? No care.
-			else if(C.chatOutput.broken)
-				DIRECT_OUTPUT(C, original_message)
-				continue
-			else if(!C.chatOutput.loaded)
-				continue // If not loaded yet, do nothing and history-sending on load will get it.
-
-			LAZYINITLIST(msg_queue[C])
-			msg_queue[C][++msg_queue[C].len] = messageStruct
-	else
-		var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
-		if(!C || !C.chatOutput)
-			return // No client? No care.
-		else if(C.chatOutput.broken)
-			DIRECT_OUTPUT(C, original_message)
-			return
-		else if(!C.chatOutput.loaded)
-			return // If not loaded yet, do nothing and history-sending on load will get it.
-
-		LAZYINITLIST(msg_queue[C])
-		msg_queue[C][++msg_queue[C].len] = messageStruct
+		for(var/_target in target)
+			var/client/client = CLIENT_FROM_VAR(_target)
+			if(client)
+				LAZYADD(payload_by_client[client], list(message))
+		return
+	var/client/client = CLIENT_FROM_VAR(target)
+	if(client)
+		LAZYADD(payload_by_client[client], list(message))

code/controllers/subsystems/ping.dm

@@ -0,0 +1,40 @@
+/*!
+ * Copyright (c) 2022 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+SUBSYSTEM_DEF(ping)
+	name = "Ping"
+	priority = FIRE_PRIORITY_PING
+	init_stage = INITSTAGE_EARLY
+	wait = 4 SECONDS
+	flags = SS_NO_INIT
+	runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+	var/list/currentrun = list()
+
+/datum/controller/subsystem/ping/stat_entry()
+	..("P:[GLOB.clients.len]")
+
+/datum/controller/subsystem/ping/fire(resumed = FALSE)
+	// Prepare the new batch of clients
+	if (!resumed)
+		src.currentrun = GLOB.clients.Copy()
+
+	// De-reference the list for sanic speeds
+	var/list/currentrun = src.currentrun
+
+	while (currentrun.len)
+		var/client/client = currentrun[currentrun.len]
+		currentrun.len--
+
+		if (client?.tgui_panel?.is_ready())
+			// Send a soft ping
+			client.tgui_panel.window.send_message("ping/soft", list(
+				// Slightly less than the subsystem timer (somewhat arbitrary)
+				// to prevent incoming pings from resetting the afk state
+				"afk" = client.is_afk(3.5 SECONDS),
+			))
+
+		if (MC_TICK_CHECK)
+			return