diff options
| author |  Xithrius <[email protected]> | 2020-12-10 16:47:13 -0800 |
|---|---|---|
| committer | Xithrius <[email protected]> | 2020-12-10 16:47:13 -0800 |
| commit | 7e94b26c745fc7161c54401c83b3765c91529c3c (patch) | |
| tree | bbab2ff435fa38dd642881353dc2e312f1dab00d | |
| parent | Compressed if into or statements. (diff) | |
| parent | Slightly reformatted activity block building. (diff) | |
Merge branch 'moderation/user-from-metricity' of https://github.com/python-discord/bot into moderation/user-from-metricity
| -rw-r--r-- | bot/exts/info/information.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py index 5d94d73e9..26cf5fee3 100644 --- a/bot/exts/info/information.py +++ b/bot/exts/info/information.py @@ -230,17 +230,11 @@ class Information(Cog): if on_server: joined = time_since(user.joined_at, max_units=3) roles = ", ".join(role.mention for role in user.roles[1:]) - if is_mod_channel(ctx.channel): - membership = textwrap.dedent(f""" - Joined: {joined} - Verified: {verified_at} - Roles: {roles or None} - """).strip() - else: - membership = textwrap.dedent(f""" - Joined: {joined} - Roles: {roles or None} - """).strip() + membership = {"Joined": joined, "Verified": verified_at, "Roles": roles or None} + if not is_mod_channel(ctx.channel): + membership.pop("Verified") + + membership = textwrap.dedent("\n".join([f"{key}: {value}" for key, value in membership.items()])) else: roles = None membership = "The user is not a member of the server" @@ -386,7 +380,8 @@ class Information(Cog): activity_output.append(user_activity["activity_blocks"] or "No activity") activity_output = "\n".join( - f"{name}: {metric}" for name, metric in zip(["Messages", "Activity blocks"], activity_output)) + f"{name}: {metric}" for name, metric in zip(["Messages", "Activity blocks"], activity_output) + ) return verified_at, ("Activity", activity_output) |