fix(layout)

app.py

@@ -37,50 +37,22 @@ async def on_ready():
 MIN_DATE = datetime(2025, 7, 9)
 
 
-class MonthSelect(discord.ui.Select):
-    def __init__(self):
-        options = [
-            discord.SelectOption(label=calendar.month_name[i], value=str(i))
-            for i in range(1, 13)
-        ]
-        super().__init__(placeholder="Month", options=options, row=0)
-
-    async def callback(self, interaction: discord.Interaction):
-        self.view.month = int(self.values[0])
-        await self.view.refresh(interaction)
-
-
-class YearSelect(discord.ui.Select):
-    def __init__(self):
-        options = [
-            discord.SelectOption(label=str(y), value=str(y))
-            for y in range(2025, 2027)
-        ]
-        super().__init__(placeholder="Year", options=options, row=1)
-
-    async def callback(self, interaction: discord.Interaction):
-        self.view.year = int(self.values[0])
-        await self.view.refresh(interaction)
-
-
 class DayButton(discord.ui.Button):
-    def __init__(self, day: int, row: int):
-        super().__init__(label=str(day), style=discord.ButtonStyle.secondary, row=row)
+    def __init__(self, day: int, row: int, disabled: bool = False):
+        super().__init__(
+            label=str(day),
+            style=discord.ButtonStyle.secondary,
+            row=row,
+            disabled=disabled,
+        )
         self.day = day
 
     async def callback(self, interaction: discord.Interaction):
         view: DatePickerView = self.view
         purchase_date = datetime(view.year, view.month, self.day)
 
-        today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
-        if purchase_date < MIN_DATE or purchase_date > today:
-            await interaction.response.send_message(
-                f"Date must be between **July 09, 2025** and **{today.strftime('%B %d, %Y')}** (today).",
-                ephemeral=True,
-            )
-            return
-
         arrival_date = purchase_date + timedelta(days=90)
+        today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
         days_until = (arrival_date - today).days
 
         if days_until < -14:
@@ -102,6 +74,38 @@ class DayButton(discord.ui.Button):
         )
 
 
+def valid_months(year: int) -> list[int]:
+    today = datetime.now()
+    months = []
+    for m in range(1, 13):
+        if (year, m) < (MIN_DATE.year, MIN_DATE.month):
+            continue
+        if (year, m) > (today.year, today.month):
+            continue
+        months.append(m)
+    return months
+
+
+def valid_years() -> list[int]:
+    today = datetime.now()
+    return [y for y in range(MIN_DATE.year, today.year + 1)]
+
+
+def clamp_month(year: int, month: int) -> int:
+    months = valid_months(year)
+    if month in months:
+        return month
+    if month < months[0]:
+        return months[0]
+    return months[-1]
+
+
+def is_day_disabled(year: int, month: int, day: int) -> bool:
+    today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+    dt = datetime(year, month, day)
+    return dt < MIN_DATE or dt > today
+
+
 class DatePickerView(discord.ui.View):
     FIRST_PAGE = 14
     MID_PAGE = 13
@@ -112,17 +116,57 @@ class DatePickerView(discord.ui.View):
         self.year = today.year
         self.month = today.month
         self.page = 0
-        self.month_select = MonthSelect()
-        self.year_select = YearSelect()
-        self.add_item(self.month_select)
-        self.add_item(self.year_select)
-        self.build_day_buttons()
+        self.rebuild()
 
-    def build_day_buttons(self):
-        for item in list(self.children):
-            if not isinstance(item, discord.ui.Select):
-                self.remove_item(item)
+    def rebuild(self):
+        self.clear_items()
+        self._build_selects()
+        self._build_day_buttons()
 
+    def _build_selects(self):
+        today = datetime.now()
+
+        year_options = [
+            discord.SelectOption(
+                label=str(y), value=str(y), default=(y == self.year)
+            )
+            for y in valid_years()
+        ]
+        year_select = discord.ui.Select(placeholder="Year", options=year_options, row=1)
+        year_select.callback = self._on_year
+        self.add_item(year_select)
+
+        months = valid_months(self.year)
+        month_options = [
+            discord.SelectOption(
+                label=calendar.month_name[m], value=str(m), default=(m == self.month)
+            )
+            for m in months
+        ]
+        month_select = discord.ui.Select(placeholder="Month", options=month_options, row=0)
+        month_select.callback = self._on_month
+        self.add_item(month_select)
+
+    async def _on_year(self, interaction: discord.Interaction):
+        self.year = int(interaction.data["values"][0])
+        self.month = clamp_month(self.year, self.month)
+        self.page = 0
+        self.rebuild()
+        await interaction.response.edit_message(
+            content=f"Pick a day in **{calendar.month_name[self.month]} {self.year}**:",
+            view=self,
+        )
+
+    async def _on_month(self, interaction: discord.Interaction):
+        self.month = int(interaction.data["values"][0])
+        self.page = 0
+        self.rebuild()
+        await interaction.response.edit_message(
+            content=f"Pick a day in **{calendar.month_name[self.month]} {self.year}**:",
+            view=self,
+        )
+
+    def _build_day_buttons(self):
         num_days = calendar.monthrange(self.year, self.month)[1]
 
         if self.page == 0:
@@ -135,7 +179,8 @@ class DatePickerView(discord.ui.View):
         has_next = end < num_days
 
         for i, d in enumerate(range(start, end + 1)):
-            self.add_item(DayButton(d, row=2 + i // 5))
+            disabled = is_day_disabled(self.year, self.month, d)
+            self.add_item(DayButton(d, row=2 + i // 5, disabled=disabled))
 
         day_count = end - start + 1
         last_row = 2 + (day_count - 1) // 5
@@ -155,22 +200,14 @@ class DatePickerView(discord.ui.View):
                 btn.callback = self._next_page
                 self.add_item(btn)
 
-    async def refresh(self, interaction: discord.Interaction):
-        self.page = 0
-        self.build_day_buttons()
-        await interaction.response.edit_message(
-            content=f"Pick a day in **{calendar.month_name[self.month]} {self.year}**:",
-            view=self,
-        )
-
     async def _next_page(self, interaction: discord.Interaction):
         self.page += 1
-        self.build_day_buttons()
+        self.rebuild()
         await interaction.response.edit_message(view=self)
 
     async def _prev_page(self, interaction: discord.Interaction):
         self.page -= 1
-        self.build_day_buttons()
+        self.rebuild()
         await interaction.response.edit_message(view=self)