Move member count to embed field.

2 files changed, 20 insertions, 15 deletions

diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py
index 4b1e0910d..bb8ded4e4 100644
--- a/bot/exts/info/information.py
+++ b/bot/exts/info/information.py
@@ -136,11 +136,15 @@ class Information(Cog):
         features = ", ".join(ctx.guild.features)
         region = ctx.guild.region
 
-        roles = len(ctx.guild.roles)
+        # Members
         member_count = ctx.guild.member_count
-
-        # How many staff members and staff channels do we have?
         staff_member_count = len(ctx.guild.get_role(constants.Roles.helpers).members)
+        roles = len(ctx.guild.roles)
+        member_info = textwrap.dedent(f"""
+            Staff members: {staff_member_count}
+            Roles: {roles}
+        """)
+        embed.add_field(name=f"Members: {member_count}", value=member_info)
 
         # Channels
         total_channels = len(ctx.guild.channels)
@@ -161,12 +165,7 @@ class Information(Cog):
             Created: {created}
             Voice region: {region}
             Features: {features}
-
-            **Member counts**
-            Members: {member_count:,}
-            Staff members: {staff_member_count}
-            Roles: {roles}
-            """)
+        """)
         embed.set_thumbnail(url=ctx.guild.icon_url)
 
         await ctx.send(embed=embed)
diff --git a/tests/bot/exts/info/test_information.py b/tests/bot/exts/info/test_information.py
index 1fd3ef066..261533847 100644
--- a/tests/bot/exts/info/test_information.py
+++ b/tests/bot/exts/info/test_information.py
@@ -147,17 +147,23 @@ class InformationCogTests(unittest.TestCase):
                 Created: {time_since_patch.return_value}
                 Voice region: {self.ctx.guild.region}
                 Features: {', '.join(self.ctx.guild.features)}
+                """
+            )
+        )
 
-                **Member counts**
-                Members: {self.ctx.guild.member_count:,}
+        # Members
+        member_field = embed.fields[0]
+        self.assertEqual(member_field.name, f"Members: {self.ctx.guild.member_count}")
+        self.assertEqual(
+            member_field.value,
+            textwrap.dedent(f"""
                 Staff members: 0
                 Roles: {len(self.ctx.guild.roles)}
-                """
-            )
+            """),
         )
 
         # Channels
-        channel_field = embed.fields[0]
+        channel_field = embed.fields[1]
         self.assertEqual(channel_field.name, "Channels: 3")
         self.assertEqual(
             channel_field.value,
@@ -169,7 +175,7 @@ class InformationCogTests(unittest.TestCase):
         )
 
         # Member status
-        status_field = embed.fields[1]
+        status_field = embed.fields[2]
         self.assertEqual(status_field.name, "Member Status:")
         self.assertEqual(
             status_field.value,