liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix switch move time parse error not showing correctly

Browse Source
This commit is contained in:
Ske 2018-12-19 02:09:47 +01:00
parent c648251380
commit 47a81d42ce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pluralkit/bot/commands/switch_commands.py
View File

@ -99,6 +99,10 @@ async def switch_move(ctx: CommandContext):
# If no time zone was given *explicitly in the string* it'll return as naive # If no time zone was given *explicitly in the string* it'll return as naive
"TIMEZONE": system.ui_tz "TIMEZONE": system.ui_tz
}) })
if not new_time:
raise CommandError("'{}' can't be parsed as a valid time.".format(ctx.remaining()))
tz = pytz.timezone(system.ui_tz) tz = pytz.timezone(system.ui_tz)
# So we default to putting the system's time zone in the tzinfo # So we default to putting the system's time zone in the tzinfo
if not new_time.tzinfo: if not new_time.tzinfo:
@ -106,8 +110,6 @@ async def switch_move(ctx: CommandContext):
# Now that we have a system-time datetime, convert this to UTC and make it naive since that's what we deal with # Now that we have a system-time datetime, convert this to UTC and make it naive since that's what we deal with
new_time = pytz.utc.normalize(new_time).replace(tzinfo=None) new_time = pytz.utc.normalize(new_time).replace(tzinfo=None)
if not new_time:
raise CommandError("'{}' can't be parsed as a valid time.".format(ctx.remaining()))
# Make sure the time isn't in the future # Make sure the time isn't in the future
if new_time > datetime.utcnow(): if new_time > datetime.utcnow():