Skip to content

Commit 1f6dff3

Browse files
JasonLovesDoggoJasonLovesDoggo
committed
final touches
and reformat
1 parent ab656f0 commit 1f6dff3

File tree

4 files changed

+45
-41
lines changed

4 files changed

+45
-41
lines changed

‎cogs/Levels.py‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ async def grant_xp(self, message):
185185

186186
async def handle_message(self, message: Message):
187187
if any(
188-
[
189-
message.guild is None,
190-
message.author.bot,
191-
message.type not in [MessageType.default, MessageType.reply, MessageType.thread_starter_message],
192-
message.content.__len__() < 5,
193-
]
188+
[
189+
message.guild is None,
190+
message.author.bot,
191+
message.type not in [MessageType.default, MessageType.reply, MessageType.thread_starter_message],
192+
message.content.__len__() < 5,
193+
]
194194
):
195195
return
196196
if not random.randint(1, 3) == 1:
@@ -420,12 +420,14 @@ async def leaderboard(self, inter: ApplicationCommandInteraction):
420420
for i, record in enumerate(records):
421421
user = await self.bot.fetch_user(record.user_id)
422422
if record.user_id == inter.author.id:
423-
embed.add_field(name=f"{i + 1}. {user} ~ You ",
424-
value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False)
423+
embed.add_field(
424+
name=f"{i + 1}. {user} ~ You ", value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False
425+
)
425426
set_user = True
426427
else:
427-
embed.add_field(name=f"{i + 1}. {user}", value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}",
428-
inline=False)
428+
embed.add_field(
429+
name=f"{i + 1}. {user}", value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False
430+
)
429431
if not set_user:
430432
rank = await self.controller.get_rank(inter.guild.id, cmd_user)
431433
embed.add_field(
@@ -443,10 +445,10 @@ async def leaderboard(self, inter: ApplicationCommandInteraction):
443445
@commands.guild_only()
444446
@commands.has_any_role("Staff", "staff")
445447
async def set_lvl(
446-
self,
447-
inter: ApplicationCommandInteraction,
448-
user: Member,
449-
level: int = Param(description="The level to set the user to", le=100, ge=0),
448+
self,
449+
inter: ApplicationCommandInteraction,
450+
user: Member,
451+
level: int = Param(description="The level to set the user to", le=100, ge=0),
450452
):
451453
"""
452454
Set a user's level
@@ -471,17 +473,16 @@ async def role_reward(self, inter: ApplicationCommandInteraction):
471473
@role_reward.sub_command()
472474
@commands.has_permissions(manage_roles=True)
473475
async def add(
474-
self,
475-
inter: ApplicationCommandInteraction,
476-
role: Role = Param(name="role", description="what role to give"),
477-
level_needed: int = Param(name="level_needed", description="The level needed to get the role"),
476+
self,
477+
inter: ApplicationCommandInteraction,
478+
role: Role = Param(name="role", description="what role to give"),
479+
level_needed: int = Param(name="level_needed", description="The level needed to get the role"),
478480
):
479481
"""adds a role to the reward list"""
480482
if int(level_needed) not in self.levels:
481483
return await errorEmb(inter, text=f"Level must be within 1-{MAX_LEVEL} found")
482484

483-
if await self.bot.db.execute("SELECT 1 FROM role_rewards WHERE guild_id = ? AND role_id = ?",
484-
(inter.guild.id, role.id)):
485+
if await self.bot.db.execute("SELECT 1 FROM role_rewards WHERE guild_id = ? AND role_id = ?", (inter.guild.id, role.id)):
485486
sql = "INSERT OR IGNORE INTO role_rewards (guild_id, role_id, required_lvl) VALUES (?, ?, ?)"
486487
await self.bot.db.execute(sql, (inter.guild.id, role.id, level_needed))
487488
await self.bot.db.commit()
@@ -491,13 +492,12 @@ async def add(
491492
@role_reward.sub_command()
492493
@commands.has_permissions(manage_roles=True)
493494
async def remove(
494-
self,
495-
inter: ApplicationCommandInteraction,
496-
role: Role = Param(name="role", description="what role to remove"),
495+
self,
496+
inter: ApplicationCommandInteraction,
497+
role: Role = Param(name="role", description="what role to remove"),
497498
):
498499
"""remove a role reward"""
499-
if await self.bot.db.execute("SELECT 1 FROM role_rewards WHERE guild_id = ? AND role_id = ?",
500-
(inter.guild.id, role.id)):
500+
if await self.bot.db.execute("SELECT 1 FROM role_rewards WHERE guild_id = ? AND role_id = ?", (inter.guild.id, role.id)):
501501
sql = "DELETE FROM role_rewards WHERE guild_id = ? AND role_id = ?"
502502
await self.bot.db.execute(sql, (inter.guild.id, role.id))
503503
await self.bot.db.commit()
@@ -517,11 +517,9 @@ async def list(self, inter: ApplicationCommandInteraction):
517517
for record in records:
518518
record = RoleReward(*record)
519519
embed.add_field(
520-
name=f"Level {record.required_lvl}", value=f"{inter.guild.get_role(record.role_id).mention}",
521-
inline=False
520+
name=f"Level {record.required_lvl}", value=f"{inter.guild.get_role(record.role_id).mention}", inline=False
522521
)
523-
await inter.send(embed=embed,
524-
allowed_mentions=disnake.AllowedMentions(everyone=False, roles=False, users=False))
522+
await inter.send(embed=embed, allowed_mentions=disnake.AllowedMentions(everyone=False, roles=False, users=False))
525523

526524

527525
def setup(bot: OGIROID):

‎utils/CONSTANTS.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from dataclasses import dataclass
44

5-
__VERSION__ = "1.8.3"
5+
__VERSION__ = "1.8.5"
66

77
from typing import Final
88

‎utils/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def dev(cls):
2828

2929
@dataclass
3030
class Config:
31-
Development = True
31+
Development = False
3232
colors = Colors
3333
colours = colors
3434
tokens = Tokens

‎utils/pagination.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
from utils.exceptions import UserNotFound
66
from utils.shortcuts import errorEmb
77
import datetime as dt
8+
89
if TYPE_CHECKING:
910
from cogs.Levels import LevelsController
1011

12+
1113
class CreatePaginator(ui.View):
1214
"""
1315
Paginator for Embeds.
@@ -97,14 +99,19 @@ class LeaderboardView(ui.View):
9799
UserPicked: bool
98100
If True, the user has already been shown and no need to add an extra field
99101
"""
100-
def __init__(self, controller: "LevelsController", firstemb: Embed, author: int = 123, set_user: bool = False, timeout: float = None):
102+
103+
def __init__(
104+
self, controller: "LevelsController", firstemb: Embed, author: int = 123, set_user: bool = False, timeout: float = None
105+
):
101106

102107
self.controller = controller
103108
self.author = author
104109
self.CurrentEmbed = 0
105110
self.firstemb = firstemb
106111
self.user_set = set_user
107-
super().__init__(timeout=timeout if timeout else 180,)
112+
super().__init__(
113+
timeout=timeout if timeout else 180,
114+
)
108115

109116
async def at_last_page(self, inter):
110117
records = await self.controller.get_count(inter.guild.id)
@@ -113,13 +120,11 @@ async def at_last_page(self, inter):
113120
else:
114121
return False
115122

116-
117-
118123
async def create_page(self, inter, page_num) -> Embed:
119124
if page_num == 0:
120125
return self.firstemb
121126
else:
122-
records = await self.controller.get_leaderboard(inter.guild, limit=10, offset=page_num*10)
127+
records = await self.controller.get_leaderboard(inter.guild, limit=10, offset=page_num * 10)
123128
try:
124129
cmd_user = await self.controller.get_user(inter.author)
125130
except UserNotFound:
@@ -132,13 +137,14 @@ async def create_page(self, inter, page_num) -> Embed:
132137
for i, record in enumerate(records):
133138
user = await inter.bot.fetch_user(record.user_id)
134139
if record.user_id == inter.author.id:
135-
embed.add_field(name=f"{i + 1}. {user} ~ You ",
136-
value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False)
140+
embed.add_field(
141+
name=f"{i + 1}. {user} ~ You ", value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False
142+
)
137143
self.user_set = True
138144
else:
139-
embed.add_field(name=f"{i + 1}. {user}",
140-
value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}",
141-
inline=False)
145+
embed.add_field(
146+
name=f"{i + 1}. {user}", value=f"Level: {record.lvl}\nTotal XP: {record.total_exp:,}", inline=False
147+
)
142148
if not self.user_set:
143149
rank = await self.controller.get_rank(inter.guild.id, cmd_user)
144150
embed.add_field(

0 commit comments

Comments
 (0)