Skip to content

Commit e5b1af5

Browse files
authored
Merge pull request #2860 from python-discord/dependabot/pip/ruff-0.1.9
Bump ruff from 0.1.7 to 0.1.9
2 parents 36a9ac9 + bbb1b5d commit e5b1af5

File tree

3 files changed

+60
-63
lines changed

3 files changed

+60
-63
lines changed

bot/exts/info/information.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ async def user_nomination_counts(self, user: MemberOrUser) -> tuple[str, str]:
420420

421421
return "Nominations", "\n".join(output)
422422

423-
async def user_messages(self, user: MemberOrUser) -> tuple[bool | str, tuple[str, str]]:
423+
async def user_messages(self, user: MemberOrUser) -> tuple[str, str]:
424424
"""
425425
Gets the amount of messages for `member`.
426426
@@ -435,15 +435,21 @@ async def user_messages(self, user: MemberOrUser) -> tuple[bool | str, tuple[str
435435
if e.status == 404:
436436
activity_output = "No activity"
437437
else:
438-
activity_output.append(f"{user_activity['total_messages']:,}" or "No messages")
439-
activity_output.append(f"{user_activity['activity_blocks']:,}" or "No activity")
438+
total_message_text = (
439+
f"{user_activity['total_messages']:,}" if user_activity["total_messages"] else "No messages"
440+
)
441+
activity_blocks_text = (
442+
f"{user_activity['activity_blocks']:,}" if user_activity["activity_blocks"] else "No activity"
443+
)
444+
activity_output.append(total_message_text)
445+
activity_output.append(activity_blocks_text)
440446

441447
activity_output = "\n".join(
442448
f"{name}: {metric}"
443449
for name, metric in zip(["Messages", "Activity blocks"], activity_output, strict=True)
444450
)
445451

446-
return ("Activity", activity_output)
452+
return "Activity", activity_output
447453

448454
def format_fields(self, mapping: Mapping[str, Any], field_width: int | None = None) -> str:
449455
"""Format a mapping to be readable to a human."""

0 commit comments

Comments
 (0)