mirror of
https://github.com/nexy7574/LCC-bot.git
synced 2024-09-19 18:16:34 +01:00
Fix database reader
This commit is contained in:
parent
8c2f671e42
commit
d1a5939d23
1 changed files with 8 additions and 8 deletions
|
@ -34,7 +34,7 @@ class McDataBase:
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
async def get_break(self, user_id: int) -> typing.Optional[float]:
|
async def get_break(self, user_id: int) -> typing.Optional[tuple[float]]:
|
||||||
async with self._conn.execute(
|
async with self._conn.execute(
|
||||||
"""
|
"""
|
||||||
SELECT since FROM breaks WHERE user_id = ?;
|
SELECT since FROM breaks WHERE user_id = ?;
|
||||||
|
@ -43,7 +43,7 @@ class McDataBase:
|
||||||
) as cursor:
|
) as cursor:
|
||||||
return await cursor.fetchone()
|
return await cursor.fetchone()
|
||||||
|
|
||||||
async def set_break(self, user_id: int, since: float):
|
async def set_break(self, user_id: int, since: float) -> None:
|
||||||
await self._conn.execute(
|
await self._conn.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO breaks (user_id, since) VALUES (?, ?)
|
INSERT INTO breaks (user_id, since) VALUES (?, ?)
|
||||||
|
@ -52,7 +52,7 @@ class McDataBase:
|
||||||
(user_id, since)
|
(user_id, since)
|
||||||
)
|
)
|
||||||
|
|
||||||
async def remove_break(self, user_id: int):
|
async def remove_break(self, user_id: int) -> None:
|
||||||
now = discord.utils.utcnow().timestamp()
|
now = discord.utils.utcnow().timestamp()
|
||||||
await self._conn.execute(
|
await self._conn.execute(
|
||||||
"""
|
"""
|
||||||
|
@ -62,7 +62,7 @@ class McDataBase:
|
||||||
)
|
)
|
||||||
await self.set_cooldown(user_id, now)
|
await self.set_cooldown(user_id, now)
|
||||||
|
|
||||||
async def get_cooldown(self, user_id: int) -> typing.Optional[float]:
|
async def get_cooldown(self, user_id: int) -> typing.Optional[tuple[float]]:
|
||||||
async with self._conn.execute(
|
async with self._conn.execute(
|
||||||
"""
|
"""
|
||||||
SELECT expires FROM cooldowns WHERE user_id = ?;
|
SELECT expires FROM cooldowns WHERE user_id = ?;
|
||||||
|
@ -71,7 +71,7 @@ class McDataBase:
|
||||||
) as cursor:
|
) as cursor:
|
||||||
return await cursor.fetchone()
|
return await cursor.fetchone()
|
||||||
|
|
||||||
async def set_cooldown(self, user_id: int, expires: float):
|
async def set_cooldown(self, user_id: int, expires: float) -> None:
|
||||||
await self._conn.execute(
|
await self._conn.execute(
|
||||||
"""
|
"""
|
||||||
INSERT INTO cooldowns (user_id, expires) VALUES (?, ?)
|
INSERT INTO cooldowns (user_id, expires) VALUES (?, ?)
|
||||||
|
@ -80,7 +80,7 @@ class McDataBase:
|
||||||
(user_id, expires)
|
(user_id, expires)
|
||||||
)
|
)
|
||||||
|
|
||||||
async def remove_cooldown(self, user_id: int):
|
async def remove_cooldown(self, user_id: int) -> None:
|
||||||
await self._conn.execute(
|
await self._conn.execute(
|
||||||
"""
|
"""
|
||||||
DELETE FROM cooldowns WHERE user_id = ?;
|
DELETE FROM cooldowns WHERE user_id = ?;
|
||||||
|
@ -123,7 +123,7 @@ class McDonaldsCog(commands.Cog):
|
||||||
if (last_info := await db.get_break(author.id)) is not None:
|
if (last_info := await db.get_break(author.id)) is not None:
|
||||||
if message.content.upper() != "MCDONALDS!":
|
if message.content.upper() != "MCDONALDS!":
|
||||||
await message.delete()
|
await message.delete()
|
||||||
if (message.created_at.timestamp() - last_info) > 10:
|
if (message.created_at.timestamp() - last_info[0]) > 10:
|
||||||
await message.channel.send(
|
await message.channel.send(
|
||||||
f"{message.author.mention} Please say `MCDONALDS!` to end commercial.",
|
f"{message.author.mention} Please say `MCDONALDS!` to end commercial.",
|
||||||
delete_after=30
|
delete_after=30
|
||||||
|
@ -151,7 +151,7 @@ class McDonaldsCog(commands.Cog):
|
||||||
await ctx.respond(f"{member.mention} is already in a commercial break.")
|
await ctx.respond(f"{member.mention} is already in a commercial break.")
|
||||||
return
|
return
|
||||||
elif (cooldown := await db.get_cooldown(member.id)) is not None:
|
elif (cooldown := await db.get_cooldown(member.id)) is not None:
|
||||||
expires = cooldown + 300
|
expires = cooldown[0] + 300
|
||||||
if expires > discord.utils.utcnow().timestamp():
|
if expires > discord.utils.utcnow().timestamp():
|
||||||
await ctx.respond(
|
await ctx.respond(
|
||||||
f"{member.mention} is not due another ad break yet. Their next commercial break will start "
|
f"{member.mention} is not due another ad break yet. Their next commercial break will start "
|
||||||
|
|
Loading…
Reference in a new issue