koharu update dynamic this time (my idea didnt work)
This commit is contained in:
1 parent
7f6290fbd1
commit
f9b89a7498
1 file changed
+4
-24
+4
-24
@@ -126,12 +126,8 @@ class BookModal(discord.ui.Modal, title="Book an Event"):
|
|||||||
)
|
)
|
||||||
|
|
||||||
desc = f" — {description}" if description else ""
|
desc = f" — {description}" if description else ""
|
||||||
msg = f"Booked **{date} at {time_str} ({country})**: **{title}**{desc}"
|
await interaction.response.send_message(
|
||||||
await interaction.response.send_message(msg, ephemeral=True)
|
f"Booked **{date} at {time_str} ({country})**: **{title}**{desc}", delete_after=10)
|
||||||
|
|
||||||
cog = interaction.client.get_cog("Calendar")
|
|
||||||
if cog and cog._wh:
|
|
||||||
await cog._wh.send(msg)
|
|
||||||
|
|
||||||
|
|
||||||
class BookButton(discord.ui.View):
|
class BookButton(discord.ui.View):
|
||||||
@@ -153,14 +149,6 @@ class Calendar(commands.Cog):
|
|||||||
int(uid.strip()) for uid in raw.split(",") if uid.strip()
|
int(uid.strip()) for uid in raw.split(",") if uid.strip()
|
||||||
}
|
}
|
||||||
|
|
||||||
wh_url = os.getenv("CALENDAR_WEBHOOK_AGENT", "")
|
|
||||||
self._wh: discord.Webhook | None = None
|
|
||||||
if wh_url:
|
|
||||||
try:
|
|
||||||
self._wh = discord.Webhook.from_url(wh_url)
|
|
||||||
except Exception:
|
|
||||||
log.warning("Invalid CALENDAR_WEBHOOK_AGENT, webhook disabled")
|
|
||||||
|
|
||||||
def _check(self, user_id: int) -> bool:
|
def _check(self, user_id: int) -> bool:
|
||||||
return user_id in self._allowed
|
return user_id in self._allowed
|
||||||
|
|
||||||
@@ -169,9 +157,6 @@ class Calendar(commands.Cog):
|
|||||||
"""Send a button that opens the booking form."""
|
"""Send a button that opens the booking form."""
|
||||||
if not self._check(ctx.author.id):
|
if not self._check(ctx.author.id):
|
||||||
return await ctx.reply("You are not a maomao member.", delete_after=5)
|
return await ctx.reply("You are not a maomao member.", delete_after=5)
|
||||||
if self._wh:
|
|
||||||
await self._wh.send("Click below to book an event:", view=BookButton())
|
|
||||||
else:
|
|
||||||
await ctx.reply("Click below to book an event:", view=BookButton())
|
await ctx.reply("Click below to book an event:", view=BookButton())
|
||||||
|
|
||||||
@commands.command(name="unbook")
|
@commands.command(name="unbook")
|
||||||
@@ -203,14 +188,9 @@ class Calendar(commands.Cog):
|
|||||||
deleted = True
|
deleted = True
|
||||||
|
|
||||||
if deleted:
|
if deleted:
|
||||||
msg = f"Removed **{title}** from {date}."
|
await ctx.reply(f"Removed **{title}** from {date}.")
|
||||||
else:
|
else:
|
||||||
msg = f"No event **{title}** found on {date}."
|
await ctx.reply(f"No event **{title}** found on {date}.")
|
||||||
|
|
||||||
if self._wh:
|
|
||||||
await self._wh.send(msg)
|
|
||||||
else:
|
|
||||||
await ctx.reply(msg)
|
|
||||||
|
|
||||||
|
|
||||||
async def setup(bot: commands.Bot) -> None:
|
async def setup(bot: commands.Bot) -> None:
|
||||||
|
|||||||
Reference in new issue
Block a user