ryujinx-archive/ryuko-ng
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix style in invites.py and logs.py

Browse source
This commit is contained in:
roblabla 2019-03-03 15:12:30 +01:00
parent 6760508e99
commit 2ccc10174d
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cogs/invites.py
View file

@ -14,11 +14,20 @@ class Invites(Cog):
async def invite(self, ctx): async def invite(self, ctx):
welcome_channel = self.bot.get_channel(config.welcome_channel) welcome_channel = self.bot.get_channel(config.welcome_channel)
author = ctx.message.author author = ctx.message.author
reason = f"Created by {author.name}#{author.discriminator} ({author.id})" reason = f"Created by {str(author)} ({author.id})"
invite = await welcome_channel.create_invite(max_age = 0, max_uses = 1, temporary = True, unique = True, reason = reason) invite = await welcome_channel.create_invite(max_age = 0,
max_uses = 1, temporary = True, unique = True, reason = reason)
with open("data/invites.json", "r") as f: with open("data/invites.json", "r") as f:
invites = json.load(f) invites = json.load(f)
invites[invite.id] = { "uses": 0, "url": invite.url, "max_uses": 1, "code": invite.code }
invites[invite.id] = {
"uses": 0,
"url": invite.url,
"max_uses": 1,
"code": invite.code
}
with open("data/invites.json", "w") as f: with open("data/invites.json", "w") as f:
f.write(json.dumps(invites)) f.write(json.dumps(invites))
@ -26,7 +35,8 @@ class Invites(Cog):
try: try:
await ctx.author.send(f"Created single-use invite {invite.url}") await ctx.author.send(f"Created single-use invite {invite.url}")
except discord.errors.Forbidden: except discord.errors.Forbidden:
await ctx.send(ctx.author.mention + " I could not send you the invite. Send me a DM so I can reply to you.") await ctx.send(f"{ctx.author.mention} I could not send you the \
invite. Send me a DM so I can reply to you.")
def setup(bot): def setup(bot):

10
cogs/logs.py
View file

@ -37,7 +37,12 @@ class Logs(Cog):
# Add unknown active invites. Can happen if invite was manually created # Add unknown active invites. Can happen if invite was manually created
for invite in real_invites: for invite in real_invites:
if invite.id not in invites: if invite.id not in invites:
invites[invite.id] = { "uses": 0, "url": invite.url, "max_uses": invite.max_uses, "code": invite.code } invites[invite.id] = {
"uses": 0,
"url": invite.url,
"max_uses": invite.max_uses,
"code": invite.code
}
probable_invites_used = [] probable_invites_used = []
items_to_delete = [] items_to_delete = []
@ -68,7 +73,8 @@ class Logs(Cog):
elif len(probable_invites_used) == 0: elif len(probable_invites_used) == 0:
invite_used = "Unknown" invite_used = "Unknown"
else: else:
invite_used = "One of: " + ", ".join([x["code"] for x in probable_invites_used]) invite_used = "One of: "
invite_used += ", ".join([x["code"] for x in probable_invites_used])
# Check if user account is older than 15 minutes # Check if user account is older than 15 minutes
age = member.joined_at - member.created_at age = member.joined_at - member.created_at