diff --git a/cogs/bot.py b/cogs/bot.py index 0df6ba93..2330c354 100644 --- a/cogs/bot.py +++ b/cogs/bot.py @@ -139,7 +139,7 @@ async def on_error(self, ctx: commands.Context, error): print("\n\n") def sendable_channel(self, channel): - if channel.guild.me.permissions_in(channel).send_messages: + if channel.permissions_for(channel.guild.me).send_messages: return channel return None @@ -159,7 +159,7 @@ async def on_guild_join(self, guild): channel = next( x for x in channels - if isinstance(x, TextChannel) and guild.me.permissions_in(x).send_messages + if isinstance(x, TextChannel) and x.permissions_for(guild.me).send_messages ) except StopIteration: return diff --git a/cogs/pokemon.py b/cogs/pokemon.py index cbdb1632..2d869345 100644 --- a/cogs/pokemon.py +++ b/cogs/pokemon.py @@ -1034,7 +1034,7 @@ async def pokedex(self, ctx, **flags): num = await self.bot.mongo.fetch_pokedex_count(ctx.author) do_emojis = ( - ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).external_emojis + ctx.guild is None or ctx.channel.permissions_for(ctx.guild.me).external_emojis ) member = await self.bot.mongo.fetch_pokedex(ctx.author, 0, 898 + 1) diff --git a/cogs/shop.py b/cogs/shop.py index eaaa1391..8a65b91d 100644 --- a/cogs/shop.py +++ b/cogs/shop.py @@ -91,7 +91,7 @@ async def vote(self, ctx): # ) # member = await self.bot.mongo.fetch_member_info(ctx.author) - do_emojis = ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).external_emojis + do_emojis = ctx.guild is None or ctx.channel.permissions_for(ctx.guild.me).external_emojis embed = self.bot.Embed(color=0xFE9AC9) embed.title = f"Voting Rewards" @@ -168,7 +168,7 @@ async def vote(self, ctx): async def open(self, ctx, type: str = "", amt: int = 1): """Open mystery boxes received from voting.""" - do_emojis = ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).external_emojis + do_emojis = ctx.guild is None or ctx.channel.permissions_for(ctx.guild.me).external_emojis if type.lower() not in ("normal", "great", "ultra", "master"): if type.lower() in ("n", "g", "u", "m"): @@ -427,7 +427,7 @@ async def shop(self, ctx, *, page: int = 0): items = [i for i in self.bot.data.all_items() if i.page == page] do_emojis = ( - ctx.guild is None or ctx.guild.me.permissions_in(ctx.channel).external_emojis + ctx.guild is None or ctx.channel.permissions_for(ctx.guild.me).external_emojis ) for item in items: diff --git a/docker_launcher.py b/docker_launcher.py index b8a66be1..e5d23b7d 100644 --- a/docker_launcher.py +++ b/docker_launcher.py @@ -60,7 +60,6 @@ cluster_name=str(cluster_idx), cluster_idx=cluster_idx, case_insensitive=True, - fetch_offline_members=False, member_cache_flags=discord.MemberCacheFlags.none(), allowed_mentions=discord.AllowedMentions(everyone=False, roles=False), intents=discord.Intents.default(), diff --git a/helpers/pagination.py b/helpers/pagination.py index 5d1fc08b..51c5267e 100644 --- a/helpers/pagination.py +++ b/helpers/pagination.py @@ -84,6 +84,11 @@ def __init__(self, source, allow_last=True, allow_go=True, **kwargs): for x in REMOVE_BUTTONS: self.remove_button(x) + async def send_initial_message(self, ctx, channel): + page = await self._source.get_page(self.current_page) + kwargs = await self._get_kwargs_from_page(page) + return await self.send_with_view(channel, **kwargs) + async def show_checked_page(self, page_number): max_pages = self._source.get_max_pages() try: diff --git a/launcher.py b/launcher.py index fd2b69cd..c18e23d0 100644 --- a/launcher.py +++ b/launcher.py @@ -154,7 +154,6 @@ def __init__(self, launcher, name, shard_ids, max_shards): cluster_name=name, cluster_idx=CLUSTER_NAMES.index(name), case_insensitive=True, - fetch_offline_members=False, member_cache_flags=discord.MemberCacheFlags.none(), allowed_mentions=discord.AllowedMentions(everyone=False, roles=False), intents=intents,