juni/aikaterna-cogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Timezone] Output "same" when time zones match. (#250)

Browse Source 
* [timezone] Output "same" when time zones match.

* Semantic changes

* Make time_diff_text not rely on rstrip as `0.0` was returning an empty string  
* Don't compare `time_diff` (a float) to ints in `plural` and `position_text`, use time_diff_text's string content and compare to strings

* Version number

Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>
This commit is contained in:
Ben Armstrong
2021-10-10 18:56:00 -03:00
committed by GitHub
parent 84ed247331
commit 89411f2ef8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
timezone/timezone.py
View File

@@ -8,7 +8,7 @@ from redbot.core.utils.chat_formatting import pagify
from redbot.core.utils.menus import close_menu, menu, DEFAULT_CONTROLS from redbot.core.utils.menus import close_menu, menu, DEFAULT_CONTROLS
__version__ = "2.1.0" __version__ = "2.1.1"
class Timezone(commands.Cog): class Timezone(commands.Cog):
@@ -199,13 +199,14 @@ class Timezone(commands.Cog):
user_diff = user_now.utcoffset().total_seconds() / 60 / 60 user_diff = user_now.utcoffset().total_seconds() / 60 / 60
other_now = datetime.now(other_tz) other_now = datetime.now(other_tz)
other_diff = other_now.utcoffset().total_seconds() / 60 / 60 other_diff = other_now.utcoffset().total_seconds() / 60 / 60
time_diff = str(abs(user_diff - other_diff)).rstrip(".0") time_diff = abs(user_diff - other_diff)
time_diff_text = f"{time_diff:g}"
fmt = "**%H:%M %Z (UTC %z)**" fmt = "**%H:%M %Z (UTC %z)**"
other_time = other_now.strftime(fmt) other_time = other_now.strftime(fmt)
plural = "" if time_diff == 1 else "s" plural = "" if time_diff_text == "1" else "s"
time_amt = "the same time zone as you" if time_diff == 0 else f"{time_diff} hour{plural}" time_amt = "the same time zone as you" if time_diff_text == "0" else f"{time_diff_text} hour{plural}"
position = "ahead of" if user_diff < other_diff else "behind" position = "ahead of" if user_diff < other_diff else "behind"
position_text = "" if time_diff == 0 else f" {position} you" position_text = "" if time_diff_text == "0" else f" {position} you"
await ctx.send(f"{user.display_name}'s time is {other_time} which is {time_amt}{position_text}.") await ctx.send(f"{user.display_name}'s time is {other_time} which is {time_amt}{position_text}.")