Skip to content

Commit

Permalink
fix(prefix): Prefix not loaded properly
Browse files Browse the repository at this point in the history
  • Loading branch information
null2264 committed Feb 15, 2023
1 parent 55e442a commit 1b6aeb9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# v3.5 (Overhaul an Overhaul?)

## 3.5.4 ()
## 3.5.4 (Bugfix)
- [**Fixed**] Prefixes is not loaded properly

## 3.5.3 (Docker Fix)
- [**Fixed**] Assets is missing for docker setup
Expand Down
19 changes: 11 additions & 8 deletions src/main/core/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,23 @@ def fromContext(cls, guild: discord.Guild | None, bot: ziBot) -> GuildWrapper |
return cls(guild, bot)
return None

def __str__(self) -> str:
return str(self.guild)

def __getattr__(self, name: str):
try:
return self.guild.__getattribute__(name)
except:
return self.__getattribute__(name)

def getPrefixes(self):
return self.prefix.get()
async def getPrefixes(self):
return await self.prefix.get()

def getFormattedPrefixes(self):
return self.prefix.getFormatted()
async def getFormattedPrefixes(self):
return await self.prefix.getFormatted()

def rmPrefix(self, prefix: str):
return self.prefix.remove(prefix)
async def rmPrefix(self, prefix: str):
return await self.prefix.remove(prefix)

def addPrefix(self, prefix: str):
return self.prefix.add(prefix)
async def addPrefix(self, prefix: str):
return await self.prefix.add(prefix)
4 changes: 2 additions & 2 deletions src/main/core/prefix.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(self, *, owner: discord.Guild | discord.User, bot: ziBot):
self.bot: ziBot = bot

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

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

self.bot.cache.prefixes.add(self.owner.id, prefix) # type: ignore
await db.Prefixes.create(prefix=prefix, guild_id=self.owner.id)
self.bot.cache.prefixes.add(self.owner.id, prefix) # type: ignore
except (CacheUniqueViolation, IntegrityError) as exc:
if exc is IntegrityError:
self.bot.cache.prefixes.remove(self.owner.id, prefix) # type: ignore
Expand Down

0 comments on commit 1b6aeb9

Please sign in to comment.