From 2e17522de6c156adaa608405adc8a98cd4069ad7 Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Wed, 19 Jan 2022 17:18:31 -0500
Subject: [PATCH] refactor: reorganize a few lines in Misc.cs

---
 PluralKit.Bot/Commands/Misc.cs | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/PluralKit.Bot/Commands/Misc.cs b/PluralKit.Bot/Commands/Misc.cs
index 311d3f46..4a184847 100644
--- a/PluralKit.Bot/Commands/Misc.cs
+++ b/PluralKit.Bot/Commands/Misc.cs
@@ -62,12 +62,28 @@ public class Misc
         var timeAfter = SystemClock.Instance.GetCurrentInstant();
         var apiLatency = timeAfter - timeBefore;
 
+        var embed = new EmbedBuilder();
+
         var messagesReceived = _metrics.Snapshot.GetForContext("Bot").Meters
             .FirstOrDefault(m => m.MultidimensionalName == BotMetrics.MessagesReceived.Name)?.Value;
+        if (messagesReceived != null)
+            embed.Field(new Embed.Field("Messages processed",
+                $"{messagesReceived.OneMinuteRate * 60:F1}/m ({messagesReceived.FifteenMinuteRate * 60:F1}/m over 15m)",
+                true));
+
         var messagesProxied = _metrics.Snapshot.GetForContext("Bot").Meters
             .FirstOrDefault(m => m.MultidimensionalName == BotMetrics.MessagesProxied.Name)?.Value;
+        if (messagesProxied != null)
+            embed.Field(new Embed.Field("Messages proxied",
+                $"{messagesProxied.OneMinuteRate * 60:F1}/m ({messagesProxied.FifteenMinuteRate * 60:F1}/m over 15m)",
+                true));
+
         var commandsRun = _metrics.Snapshot.GetForContext("Bot").Meters
             .FirstOrDefault(m => m.MultidimensionalName == BotMetrics.CommandsRun.Name)?.Value;
+        if (commandsRun != null)
+            embed.Field(new Embed.Field("Commands executed",
+                $"{commandsRun.OneMinuteRate * 60:F1}/m ({commandsRun.FifteenMinuteRate * 60:F1}/m over 15m)",
+                true));
 
         var counts = await _repo.GetStats();
 
@@ -82,20 +98,6 @@ public class Misc
         var now = SystemClock.Instance.GetCurrentInstant();
         var shardUptime = now - shardInfo.LastConnectionTime;
 
-        var embed = new EmbedBuilder();
-        if (messagesReceived != null)
-            embed.Field(new Embed.Field("Messages processed",
-                $"{messagesReceived.OneMinuteRate * 60:F1}/m ({messagesReceived.FifteenMinuteRate * 60:F1}/m over 15m)",
-                true));
-        if (messagesProxied != null)
-            embed.Field(new Embed.Field("Messages proxied",
-                $"{messagesProxied.OneMinuteRate * 60:F1}/m ({messagesProxied.FifteenMinuteRate * 60:F1}/m over 15m)",
-                true));
-        if (commandsRun != null)
-            embed.Field(new Embed.Field("Commands executed",
-                $"{commandsRun.OneMinuteRate * 60:F1}/m ({commandsRun.FifteenMinuteRate * 60:F1}/m over 15m)",
-                true));
-
         embed
             .Field(new Embed.Field("Current shard",
                 $"Shard #{shardId} (of {shardTotal} total, {shardUpTotal} are up)", true))