Skip to content

Commit 1b6aeb9

Browse files
committed
fix(prefix): Prefix not loaded properly
1 parent 55e442a commit 1b6aeb9

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# v3.5 (Overhaul an Overhaul?)
22

3-
## 3.5.4 ()
3+
## 3.5.4 (Bugfix)
4+
- [**Fixed**] Prefixes is not loaded properly
45

56
## 3.5.3 (Docker Fix)
67
- [**Fixed**] Assets is missing for docker setup

src/main/core/guild.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,23 @@ def fromContext(cls, guild: discord.Guild | None, bot: ziBot) -> GuildWrapper |
3333
return cls(guild, bot)
3434
return None
3535

36+
def __str__(self) -> str:
37+
return str(self.guild)
38+
3639
def __getattr__(self, name: str):
3740
try:
3841
return self.guild.__getattribute__(name)
3942
except:
4043
return self.__getattribute__(name)
4144

42-
def getPrefixes(self):
43-
return self.prefix.get()
45+
async def getPrefixes(self):
46+
return await self.prefix.get()
4447

45-
def getFormattedPrefixes(self):
46-
return self.prefix.getFormatted()
48+
async def getFormattedPrefixes(self):
49+
return await self.prefix.getFormatted()
4750

48-
def rmPrefix(self, prefix: str):
49-
return self.prefix.remove(prefix)
51+
async def rmPrefix(self, prefix: str):
52+
return await self.prefix.remove(prefix)
5053

51-
def addPrefix(self, prefix: str):
52-
return self.prefix.add(prefix)
54+
async def addPrefix(self, prefix: str):
55+
return await self.prefix.add(prefix)

src/main/core/prefix.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, *, owner: discord.Guild | discord.User, bot: ziBot):
3030
self.bot: ziBot = bot
3131

3232
async def fetch(self) -> list[db.Prefixes]:
33-
if self.owner is discord.Guild:
33+
if isinstance(self.owner, discord.Guild):
3434
return await db.Prefixes.filter(guild_id=self.owner.id)
3535
return []
3636

@@ -70,8 +70,8 @@ async def add(self, prefix: str) -> str:
7070
if prefixes and (len(prefixes) + 1) > self.bot.cache.prefixes.limit: # type: ignore
7171
raise CacheListFull
7272

73-
self.bot.cache.prefixes.add(self.owner.id, prefix) # type: ignore
7473
await db.Prefixes.create(prefix=prefix, guild_id=self.owner.id)
74+
self.bot.cache.prefixes.add(self.owner.id, prefix) # type: ignore
7575
except (CacheUniqueViolation, IntegrityError) as exc:
7676
if exc is IntegrityError:
7777
self.bot.cache.prefixes.remove(self.owner.id, prefix) # type: ignore

0 commit comments

Comments
 (0)