From 9f65159cb28b20fdbb82c35801722852e23f17d9 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Tue, 22 Nov 2022 09:14:22 -0500
Subject: [PATCH] [Commands] Cleanup #serverinfo Command. (#2568)

- Cleanup messages.
- Use new dialogue window methods.
---
 zone/gm_commands/serverinfo.cpp | 126 +++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 49 deletions(-)

diff --git a/zone/gm_commands/serverinfo.cpp b/zone/gm_commands/serverinfo.cpp
index ff78c677e..3832aa7d3 100755
--- a/zone/gm_commands/serverinfo.cpp
+++ b/zone/gm_commands/serverinfo.cpp
@@ -1,4 +1,5 @@
 #include "../client.h"
+#include "../dialogue_window.h"
 #include "../../common/serverinfo.h"
 
 void command_serverinfo(Client *c, const Seperator *sep)
@@ -9,86 +10,113 @@ void command_serverinfo(Client *c, const Seperator *sep)
 	auto rss = EQ::GetRSS() / 1048576.0;
 	auto uptime = static_cast<uint32>(EQ::GetUptime());
 
-	std::string popup_text;
+	std::string popup_table;
+	auto popup_text = DialogueWindow::CenterMessage(
+		DialogueWindow::ColorMessage("green", "Operating System Information")
+	);
 
-	popup_text.append("<c \"#00FF00\">Operating System Information</c>");
-
-	popup_text.append("<table>");
-
-	popup_text.append(
-		fmt::format(
-			"<tr><td>System</td><td>{}</td></tr>",
-			os.sysname
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("Machine") +
+			DialogueWindow::TableCell(os.machine)
 		).c_str()
 	);
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>Release</td><td>{}</td></tr>",
-			os.release
-		)
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("System") +
+			DialogueWindow::TableCell(os.sysname)
+		).c_str()
 	);
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>Version</td><td>{}</td></tr>",
-			os.version
-		)
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("Release") +
+			DialogueWindow::TableCell(os.release)
+		).c_str()
 	);
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>Machine</td><td>{}</td></tr>",
-			os.machine
-		)
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("Uptime") +
+			DialogueWindow::TableCell(Strings::SecondsToTime(uptime))
+		).c_str()
 	);
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>Uptime</td><td>{}</td></tr>",
-			Strings::SecondsToTime(uptime)
-		)
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("Version") +
+			DialogueWindow::TableCell(os.version)
+		).c_str()
 	);
 
-	popup_text.append("</table>");
+	popup_text.append(DialogueWindow::Table(popup_table));
 
-	popup_text.append("<c \"#00FF00\">CPU Information</c>");
+	popup_table = std::string();
 
-	popup_text.append("<table>");
+	popup_text.append(DialogueWindow::Break());
+
+	popup_text.append(
+		DialogueWindow::CenterMessage(
+			DialogueWindow::ColorMessage("green", "CPU Information")
+		)
+	);
 
 	for (size_t cpu = 0; cpu < cpus.size(); ++cpu) {
 		auto &current_cpu = cpus[cpu];
-		popup_text.append(
-			fmt::format(
-				"<tr><td>CPU {}</td><td>{} ({:.2f}GHz)</td></tr>",
-				cpu,
-				current_cpu.model,
-				current_cpu.speed
+		popup_table.append(
+			DialogueWindow::TableRow(
+				DialogueWindow::TableCell(
+					fmt::format(
+						"CPU {}",
+						cpu
+					)
+				) +
+				DialogueWindow::TableCell(
+					fmt::format(
+						"{} ({:.2f}GHz)",
+						current_cpu.model,
+						current_cpu.speed
+					)
+				)
 			)
 		);
 	}
 
-	popup_text.append("</table>");
+	popup_text.append(DialogueWindow::Table(popup_table));
 
-	popup_text.append("<c \"#00FF00\">Process Information</c>");
+	popup_table = std::string();
+
+	popup_text.append(DialogueWindow::Break());
+
+	popup_text.append(
+		DialogueWindow::CenterMessage(
+			DialogueWindow::ColorMessage("green", "CPU Information")
+		)
+	);
 
 	popup_text.append("<table>");
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>Process ID</td><td>{}</td></tr>",
-			process_id
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("Process ID") +
+			DialogueWindow::TableCell(std::to_string(process_id))
 		)
 	);
 
-	popup_text.append(
-		fmt::format(
-			"<tr><td>RSS</td><td>{:.2f} MB</td></tr>",
-			rss
+	popup_table.append(
+		DialogueWindow::TableRow(
+			DialogueWindow::TableCell("RSS") +
+			DialogueWindow::TableCell(
+				fmt::format(
+					"{:.2f} MB",
+					rss
+				)
+			)
 		)
 	);
 
-	popup_text.append("</table>");
+	popup_text.append(DialogueWindow::Table(popup_table));
 
 	c->SendPopupToClient(
 		"Server Information",