Skip to content

Commit a5d5b01

Browse files
committed
Helper rewrites
1 parent 05e7806 commit a5d5b01

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

lib/bot/__init__.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ async def on_interaction(self, ctx: Interaction):
6969
if isinstance(ctx.command, Command):
7070
name_list, options = self.get_name(ctx.data, [])
7171
name = " ".join(name_list)
72-
self.db.run(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, ctx.guild_id,
73-
ctx.user.id, json.dumps(options), datetime.now().timestamp())
72+
self.db.insert.commands(command_name=name, guild_id=ctx.guild_id, user_id=ctx.user.id, params=json.dumps(options), ts=datetime.now().timestamp())
73+
# self.db.run(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, ctx.guild_id,
74+
# ctx.user.id, json.dumps(options), datetime.now().timestamp())
7475

7576
@staticmethod
7677
async def send(ctx: Interaction, *args, **kwargs):
@@ -96,22 +97,22 @@ async def send(ctx: Interaction, *args, **kwargs):
9697
def register_guilds(self):
9798
progress = Progress('Registering guilds', len(self.guilds))
9899
for guild in self.guilds:
99-
self.db.run("""INSERT OR IGNORE INTO guilds VALUES (?,?,?)""", guild.id, None, None)
100+
self.db.insert.guilds(id=guild.id)
100101
progress.next()
101102

102103
for guild in self.db.get.guilds():
103104
if not self.get_guild(guild.id):
104-
self.db.run("""DELETE FROM guilds WHERE id=?""", guild.id)
105+
self.db.delete.guilds(id=guild.id)
105106
self.db.commit()
106107
self.ready = True
107108
print('End')
108109
self.tasks.start()
109110

110111
async def on_guild_join(self, guild: Guild):
111-
self.db.run("""INSERT OR IGNORE INTO guilds VALUES (?,?,?)""", guild.id, None, None)
112+
self.db.insert.guilds(id=guild.id)
112113

113114
async def on_guild_remove(self, guild: Guild):
114-
self.db.run("""DELETE FROM guilds WHERE id=?""", guild.id)
115+
self.db.delete.guilds(id=guild.id)
115116

116117
def get_name(self, data: Any, groups: list[str]):
117118
if isinstance(data, dict):

lib/cogs/Announcment.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ async def announce_enable(self, ctx: Interaction, channel: Optional[discord.Text
3333
if not channel.permissions_for(await ctx.guild.fetch_member(self.bot.user.id)).send_messages:
3434
return await ctx.response.send_message(
3535
Embed(title=f">>> I can't send messages in channel: {channel.name} ({channel.id})", colour=0xff0000))
36-
self.bot.db.run("""UPDATE guilds SET a_id=? WHERE id=?""", channel.id, ctx.guild.id)
37-
print('here at send')
36+
self.bot.db.update.guilds(where=f'id={ctx.guild_id}', set_data={'a_id': channel.id})
3837
await self.bot.send(ctx, embed=Embed(
3938
title=f">>> Successfully Enabled Announcements in {channel.mention} ({channel.id})"))
4039

4140
@announce.command(name='disable', description='Disable bot announcements')
4241
@has_guild_permissions(manage_guild=True)
4342
async def announce_disable(self, ctx: Interaction):
44-
self.bot.db.run("""UPDATE guilds SET a_id=?""")
43+
self.bot.db.update.guilds(where=f'id={ctx.guild_id}', set_data={'a_id': None})
4544
await self.bot.send(ctx,
4645
embed=Embed(title=f">>> Successfully Disabled Announcements"))
4746

lib/cogs/Mod.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ async def ban_add(self, ctx: Interaction, member: discord.Member, delete_message
8585
elif isinstance(member, User):
8686
await ctx.guild.ban(user=member, delete_message_days=self.days[delete_messages] if delete_messages else 0,
8787
reason=f"{reason} | {ctx.user.display_name}#{ctx.user.discriminator}")
88-
self.bot.db.run("""INSERT INTO bans VALUES (?,?,?,?,?)""", ctx.guild_id, member.id, ctx.user.id, reason,
89-
datetime.now().timestamp())
88+
self.bot.db.insert.bans(guild_id=ctx.guild_id, user_id=member.id, mod_id=ctx.user.id, reason=reason, ts=datetime.now().timestamp())
9089
embed = Embed(title=f"✅ | {member.display_name}#{member.discriminator} ({member.id}) has been banned")
9190
await ctx.response.send_message(embed=embed)
9291

@@ -107,7 +106,7 @@ async def ban_remove(self, ctx: Interaction, member: discord.Member, reason: Opt
107106
# Member is not part of the guild
108107
elif isinstance(member, User):
109108
await ctx.guild.unban(user=member, reason=reason)
110-
self.bot.db.run("""DELETE FROM bans WHERE guild_id=? AND user_id=? """, ctx.guild_id, member.id)
109+
self.bot.db.delete.bans(guild_id=ctx.guild_id, user_id=member.id)
111110
await ctx.response.send_message(
112111
embed=Embed(title=f"✅ | {member.display_name}#{member.discriminator} ({member.id}) has been unbanned"))
113112

@@ -141,8 +140,8 @@ async def massban_add(self, ctx: Interaction, str_members: str, delete_messages:
141140
continue
142141
await member.ban(delete_message_days=self.days[delete_messages],
143142
reason=f"{reason} | {ctx.user.display_name}#{ctx.user.discriminator}")
144-
self.bot.db.run("""INSERT INTO bans VALUES (?,?,?,?,?)""", ctx.guild_id, member.id, ctx.user.id, reason,
145-
datetime.now().timestamp())
143+
self.bot.db.insert.bans(guild_id=ctx.guild_id, user_id=member.id, mod_id=ctx.user.id, reason=reason,
144+
ts=datetime.now().timestamp())
146145
success.append(f"{member.display_name}#{member.discriminator} ({id})")
147146
embed = Embed()
148147
s_users = "\n".join(success)
@@ -177,7 +176,7 @@ async def massban_remove(self, ctx: Interaction, str_members: str, reason: Optio
177176
continue
178177

179178
await member.unban(reason=f"{reason} | {ctx.user.display_name}#{ctx.user.discriminator}")
180-
self.bot.db.run("""DELETE FROM bans WHERE guild_id=? AND user_id=? """, ctx.guild_id, member.id)
179+
self.bot.db.delete.bans(guild_id=ctx.guild_id, user_id=member.id)
181180
success.append(f"{member.display_name}#{member.discriminator} ({id})")
182181
embed = Embed()
183182
s_users = "\n".join(success)

lib/cogs/Youtube.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ async def youtube_notify(self, ctx: Interaction, handle: str, message: Optional[
4747
latest_video_url = "https://www.youtube.com/watch?v=" + re.search('(?<="videoId":").*?(?=")', html).group()
4848
except AttributeError:
4949
latest_video_url = ""
50-
self.bot.db.run("""INSERT INTO youtube VALUES (?,?,?,?)""", handle, ctx.guild_id,
51-
message if message else f"@{handle} has uploaded a video", latest_video_url)
50+
self.bot.db.insert.youtube(handle=handle, guild_id=ctx.guild_id, message=message if message else f"@{handle} has uploaded a video", latest_url=latest_video_url)
5251
await ctx.response.send_message(embed=Embed(title=f'✅ | Waiting for @{handle} to post more videos'))
5352
self.bot.tasks.add_job(id=f"{handle}|{ctx.guild_id}", args=(handle, message, ctx.guild_id,), trigger='interval',
5453
minutes=1)

lib/db/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ def __init__(self):
196196
self.delete: Delete = Delete(self)
197197
self.update: Update = Update(self)
198198
self.insert: Insert = Insert(self)
199-
self.insert.guilds(id=1, level_id=1)
200199

201200
def update_table(self, table: str, data: str):
202201
try:

0 commit comments

Comments
 (0)