diff options
| author | 2020-09-23 11:54:47 +0800 | |
|---|---|---|
| committer | 2020-09-23 11:54:47 +0800 | |
| commit | 185437573421e26b435c4294c34ecffd47aca014 (patch) | |
| tree | 7c8a31befe99a9a419fb1b2e3580233024f8ad8b | |
| parent | Add extended information to !server. (diff) | |
Move number of roles to embed description.
| -rw-r--r-- | bot/exts/info/information.py | 8 | ||||
| -rw-r--r-- | tests/bot/exts/info/test_information.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py index 82bccb84a..96c2c9629 100644 --- a/bot/exts/info/information.py +++ b/bot/exts/info/information.py @@ -62,16 +62,14 @@ class Information(Cog): @staticmethod def get_member_counts(guild: Guild) -> Dict[str, int]: - """Return the total number of members per role in `guild`, and the total number of roles.""" + """Return the total number of members for certain roles in `guild`.""" roles = ( guild.get_role(role_id) for role_id in ( constants.Roles.helpers, constants.Roles.moderators, constants.Roles.admins, constants.Roles.contributors, ) ) - member_counts = {role.name: len(role.members) for role in roles} - member_counts["roles"] = len(guild.roles) - 1 # Exclude @everyone - return member_counts + return {role.name: len(role.members) for role in roles} def get_extended_server_info(self, guild: Guild) -> str: """Return additional server info only visible in moderation channels.""" @@ -169,11 +167,13 @@ class Information(Cog): created = time_since(ctx.guild.created_at, precision="days") features = ", ".join(ctx.guild.features) region = ctx.guild.region + num_roles = len(ctx.guild.roles) - 1 # Exclude @everyone embed.description = textwrap.dedent(f""" Created: {created} Voice region: {region} Features: {features} + Roles: {num_roles} """) embed.set_thumbnail(url=ctx.guild.icon_url) diff --git a/tests/bot/exts/info/test_information.py b/tests/bot/exts/info/test_information.py index b5c71f87c..38ffb2f16 100644 --- a/tests/bot/exts/info/test_information.py +++ b/tests/bot/exts/info/test_information.py @@ -156,6 +156,7 @@ class InformationCogTests(unittest.TestCase): Created: {time_since_patch.return_value} Voice region: {self.ctx.guild.region} Features: {', '.join(self.ctx.guild.features)} + Roles: {len(self.ctx.guild.roles) - 1} """ ) ) @@ -165,12 +166,11 @@ class InformationCogTests(unittest.TestCase): self.assertEqual(member_field.name, f"Members: {self.ctx.guild.member_count}") self.assertEqual( member_field.value, - textwrap.dedent(f""" + textwrap.dedent(""" Helpers: 0 Moderators: 0 Admins: 0 Contributors: 0 - Roles: {len(self.ctx.guild.roles) - 1} """).strip(), ) |