Skip to content

Commit fb58ac4

Browse files
committed
fix: parsing time
1 parent 872adfb commit fb58ac4

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/cogs/forum/forum_showcase.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,9 @@ async def config(self, interaction: Interaction):
379379
)
380380
await target_channel_select.wait()
381381

382-
self.forum_showcase = target_channel_select.forum_showcase
382+
self.forum_showcase.target_channel = (
383+
target_channel_select.forum_showcase.target_channel
384+
)
383385

384386
weekday_select = ConfigureWeekday(
385387
self.forum_showcase, self.forum_showcase_db, self.logger
@@ -390,7 +392,7 @@ async def config(self, interaction: Interaction):
390392
)
391393
await weekday_select.wait()
392394

393-
self.forum_showcase = weekday_select.forum_showcase
395+
self.forum_showcase.weekday = weekday_select.forum_showcase.weekday
394396

395397
time_select = ConfigureTime(
396398
self.forum_showcase, self.forum_showcase_db, self.logger
@@ -400,7 +402,7 @@ async def config(self, interaction: Interaction):
400402
)
401403
await time_select.wait()
402404

403-
self.forum_showcase = time_select.forum_showcase
405+
self.forum_showcase.schedule = time_select.forum_showcase.schedule
404406

405407
await self.schedule_next_run()
406408

@@ -417,11 +419,13 @@ def _parse_schedule(self, schedule: str) -> datetime:
417419
elif split[1] == "AM" and hr_schedule == 12:
418420
hr_schedule = 0
419421

420-
# need to convert from UTC+08:00 to UTC+00:00 to match the timezone where the bot is running
421-
utc_8 = datetime.now().replace(
422-
hour=hr_schedule, minute=0, second=0, tzinfo=timezone(timedelta(hours=8))
422+
now = datetime.now(timezone.utc)
423+
parsed_schedule = now.replace(
424+
hour=hr_schedule,
425+
minute=0,
426+
second=0,
427+
microsecond=0,
423428
)
424-
parsed_schedule = (utc_8 - timedelta(hours=8)).replace(tzinfo=timezone.utc)
425429

426430
return parsed_schedule
427431

src/ui/views/forum_showcase.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ async def submit_button(self, interaction: Interaction, button: Button):
155155
async def weekday_select(self, interaction: Interaction, selection: Select):
156156
selected_weekday = selection.values[0] or None
157157
self.selected_weekday = selected_weekday
158-
# await interaction.response.send_message(
159-
# f"Selected {selected_weekday}", ephemeral=True
160-
# )
161158
await interaction.response.defer()
162159

163160

@@ -223,10 +220,6 @@ async def submit_button(self, interaction: Interaction, button: Button):
223220
async def time_select(self, interaction: Interaction, selection: Select):
224221
selected_time = selection.values[0]
225222
self.selected_time = selected_time
226-
227-
# await interaction.response.send_message(
228-
# f"Selected {self.selected_time}", ephemeral=True
229-
# )
230223
await interaction.response.defer()
231224

232225

@@ -241,9 +234,12 @@ def parse_schedule(schedule: str) -> datetime:
241234

242235
# need to convert from UTC+08:00 to UTC+00:00 to match the timezone
243236
# where the bot is running
244-
utc_8 = datetime.now().replace(
245-
hour=hr_schedule, minute=0, second=0, tzinfo=timezone(timedelta(hours=8))
237+
now = datetime.now(timezone.utc)
238+
parsed_schedule = now.replace(
239+
hour=hr_schedule,
240+
minute=0,
241+
second=0,
242+
microsecond=0,
246243
)
247-
parsed_schedule = (utc_8 - timedelta(hours=8)).replace(tzinfo=timezone.utc)
248244

249245
return parsed_schedule

0 commit comments

Comments
 (0)