diff --git a/cogs/changes.py b/cogs/changes.py index 7c3d271..94bb112 100644 --- a/cogs/changes.py +++ b/cogs/changes.py @@ -26,7 +26,8 @@ 'V1.5.0': '1. Fixed where bot wouldn\'t react with ⏹️ when paginating 1 page only\n2. Added more roasts.\n3. Added competing activity status to `userinfo` command\n4. Fixed fun commands opening a new session each time.\n5. You can now use roast outside NSFW channels', 'V1.5.1': '1. Imported aiohttp module where I should\'ve had it', 'V1.5.2': '1. Fixed `userinfo` command throwing an error when fetched user is unknown', - 'V1.5.3': '1. Fixed `snipe` showing content sniped from NSFW channels in SFW channels.' + 'V1.5.3': '1. Fixed `snipe` showing content sniped from NSFW channels in SFW channels.', + 'V1.5.4': '1. Added intents\n2. Fixed `togglemsg joinembed` not enabling embeds when joinlogs are on.' } version = '1.5.3' diff --git a/cogs/info.py b/cogs/info.py index 3429138..599655b 100644 --- a/cogs/info.py +++ b/cogs/info.py @@ -578,8 +578,8 @@ async def invite(self, ctx): async def vote(self, ctx): """ Give me a vote, please. Thanks... """ - if len(self.bot.guilds) >= 100 <= 110: - return await ctx.send(f"{emotes.bot_vip} We reached 100 servers! The voting will be disabled until we get 110 servers!") + # if len(self.bot.guilds) >= 100 <= 110: + # return await ctx.send(f"{emotes.bot_vip} We reached 100 servers! The voting will be disabled until we get 110 servers!") e = discord.Embed(color=self.color['embed_color'], description=f"{emotes.pfp_normal} You can vote for me [here](https://discord.boats/bot/667117267405766696/vote)") await ctx.send(embed=e) diff --git a/cogs/manage.py b/cogs/manage.py index 1966071..d5880e6 100644 --- a/cogs/manage.py +++ b/cogs/manage.py @@ -382,7 +382,7 @@ async def togglemsg_leavebots(self, ctx): async def togglemsg_joinembed(self, ctx): """ Enable or disable embedded welcoming messages """ check = await self.bot.db.fetchval("SELECT embed FROM joinmsg WHERE guild_id = $1", ctx.guild.id) - checks = await self.bot.db.fetchval('SELECT * FROM leavemsg WHERE guild_id = $1', ctx.guild.id) + checks = await self.bot.db.fetchval('SELECT * FROM joinmsg WHERE guild_id = $1', ctx.guild.id) if not checks: return await ctx.send(f"{emotes.warning} Please enable welcoming messages first!") if not check: @@ -686,4 +686,4 @@ async def antidehoistnick(self, ctx, new_nick: str): def setup(bot): bot.add_cog(Managment(bot)) - \ No newline at end of file + diff --git a/cogs/misc.py b/cogs/misc.py index f385a92..a1f5139 100644 --- a/cogs/misc.py +++ b/cogs/misc.py @@ -452,7 +452,7 @@ async def snipe(self, ctx, channel: discord.TextChannel = None): check = cm.get_cache(self.bot, channel.id, 'snipes') if check is None: return await ctx.send(f"{emotes.red_mark} Haven't logged anything yet") - if check['nsfw']: + if check['nsfw'] and not channel.is_nsfw(): return await ctx.send(f"{emotes.other_nsfw} This channel needs to be NSFW in order for you to see the sniped content") content = check['message'] if len(content) > 2000: diff --git a/utils/checks.py b/utils/checks.py index 8b1e7d1..a4ef83f 100644 --- a/utils/checks.py +++ b/utils/checks.py @@ -12,7 +12,7 @@ def has_voted(): async def predicate(ctx): if await ctx.bot.is_booster(ctx.author): return True - if len(ctx.bot.guilds) >= 100 <= 110: + if 100 <= len(ctx.bot.guilds) <= 110: return True async with aiohttp.ClientSession() as session: async with session.get(f'https://discord.boats/api/bot/667117267405766696/voted?id={ctx.author.id}') as r: