jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Await async get_(member|role) events

Browse source
This commit is contained in:
Zeva Rose 2022-02-03 15:09:02 -07:00
parent 6f8f93e9bd
commit 9c9bd36816
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jarvis/cogs/admin/roleping.py
View file

@ -77,11 +77,11 @@ class RolepingCog(CacheCog):
embeds = [] embeds = []
for roleping in rolepings: for roleping in rolepings:
role = ctx.guild.get_role(roleping.role) role = await ctx.guild.get_role(roleping.role)
bypass_roles = list(filter(lambda x: x.id in roleping.bypass["roles"], ctx.guild.roles)) bypass_roles = list(filter(lambda x: x.id in roleping.bypass["roles"], ctx.guild.roles))
bypass_roles = [r.mention or "||`[redacted]`||" for r in bypass_roles] bypass_roles = [r.mention or "||`[redacted]`||" for r in bypass_roles]
bypass_users = [ bypass_users = [
ctx.guild.get_member(u).mention or "||`[redacted]`||" await ctx.guild.get_member(u).mention or "||`[redacted]`||"
for u in roleping.bypass["users"] for u in roleping.bypass["users"]
] ]
bypass_roles = bypass_roles or ["None"] bypass_roles = bypass_roles or ["None"]
@ -108,7 +108,7 @@ class RolepingCog(CacheCog):
], ],
) )
admin = ctx.guild.get_member(roleping.admin) admin = await ctx.guild.get_member(roleping.admin)
if not admin: if not admin:
admin = self.bot.user admin = self.bot.user

2
jarvis/cogs/admin/warning.py
View file

@ -123,7 +123,7 @@ class WarningCog(CacheCog):
else: else:
fields = [] fields = []
for warn in active_warns: for warn in active_warns:
admin = ctx.guild.get_member(warn.admin) admin = await ctx.guild.get_member(warn.admin)
admin_name = "||`[redacted]`||" admin_name = "||`[redacted]`||"
if admin: if admin:
admin_name = f"{admin.username}#{admin.discriminator}" admin_name = f"{admin.username}#{admin.discriminator}"

2
jarvis/cogs/ctc2.py
View file

@ -107,7 +107,7 @@ class CTCCog(CacheCog):
guesses = Guess.objects().order_by("-correct", "-id") guesses = Guess.objects().order_by("-correct", "-id")
fields = [] fields = []
for guess in guesses: for guess in guesses:
user = ctx.guild.get_member(guess["user"]) user = await ctx.guild.get_member(guess["user"])
if not user: if not user:
user = await self.bot.fetch_user(guess["user"]) user = await self.bot.fetch_user(guess["user"])
if not user: if not user:

6
jarvis/cogs/verify.py
View file

@ -45,7 +45,7 @@ class VerifyCog(commands.Cog):
if not role: if not role:
await ctx.send("This guild has not enabled verification", delete_after=5) await ctx.send("This guild has not enabled verification", delete_after=5)
return return
if ctx.guild.get_role(role.value) in ctx.author.roles: if await ctx.guild.get_role(role.value) in ctx.author.roles:
await ctx.send("You are already verified.", delete_after=5) await ctx.send("You are already verified.", delete_after=5)
return return
components = create_layout() components = create_layout()
@ -70,11 +70,11 @@ class VerifyCog(commands.Cog):
for c2 in c["components"]: for c2 in c["components"]:
c2["disabled"] = True c2["disabled"] = True
setting = Setting.objects(guild=ctx.guild.id, setting="verified").first() setting = Setting.objects(guild=ctx.guild.id, setting="verified").first()
role = ctx.guild.get_role(setting.value) role = await ctx.guild.get_role(setting.value)
await ctx.author.add_roles(role, reason="Verification passed") await ctx.author.add_roles(role, reason="Verification passed")
setting = Setting.objects(guild=ctx.guild.id, setting="unverified").first() setting = Setting.objects(guild=ctx.guild.id, setting="unverified").first()
if setting: if setting:
role = ctx.guild.get_role(setting.value) role = await ctx.guild.get_role(setting.value)
await ctx.author.remove_roles(role, reason="Verification passed") await ctx.author.remove_roles(role, reason="Verification passed")
await ctx.edit_origin( await ctx.edit_origin(
content=f"Welcome, {ctx.author.mention}. Please enjoy your stay.", content=f"Welcome, {ctx.author.mention}. Please enjoy your stay.",