mirror of https://github.com/stijndcl/didier
Clean up imports
parent
8c6d3682b4
commit
a198a83153
|
@ -1,12 +1,10 @@
|
|||
from data import constants, schedule
|
||||
from data import schedule
|
||||
from decorators import help
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
from enums.courses import years
|
||||
from enums.help_categories import Category
|
||||
from functions import checks, config, eten, les
|
||||
from functions import config, eten, les
|
||||
from functions.timeFormatters import intToWeekday
|
||||
import json
|
||||
|
||||
|
||||
class School(commands.Cog):
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
from datetime import datetime, timedelta
|
||||
from functions.timeFormatters import dateTimeNow, weekdayToInt, forward_to_weekday, skip_weekends
|
||||
from typing import Optional
|
||||
|
||||
|
||||
def find_target_date(arg: Optional[str]) -> datetime:
|
||||
"""
|
||||
Find the requested date out of the user's arguments
|
||||
"""
|
||||
# Start at current date
|
||||
day: datetime = dateTimeNow()
|
||||
|
||||
# If no offset was provided, check the time
|
||||
# otherwise the argument overrides it
|
||||
if arg is None:
|
||||
# When the command is used after 6 pm, show schedule
|
||||
# for the next day instead
|
||||
if day.hour > 18:
|
||||
day += timedelta(days=1)
|
||||
elif 0 <= (weekday := weekdayToInt(arg)) <= 4: # Weekday provided
|
||||
day = forward_to_weekday(day, weekday)
|
||||
elif arg.lower() == "morgen": # Tomorrow's schedule
|
||||
day += timedelta(days=1)
|
||||
elif arg.lower() == "overmorgen": # Day after tomorrow's schedule
|
||||
day += timedelta(days=2)
|
||||
|
||||
# TODO show a different embed when "(over)morgen" is requested & it lands on a weekend
|
||||
# Don't land on a weekend
|
||||
day = skip_weekends(day)
|
||||
|
||||
return day
|
Loading…
Reference in New Issue