CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 11:48:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

[General] Fix server icon not showing up in [p]serverinfo

Browse Source
This commit is contained in:
Twentysix 2016-08-22 23:10:23 +02:00
parent 8da9487f52
commit 5484495d5d
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cogs/general.py
View File

@ -159,6 +159,7 @@ class General:
async def userinfo(self, ctx, user : discord.Member = None): async def userinfo(self, ctx, user : discord.Member = None):
"""Shows users's informations""" """Shows users's informations"""
author = ctx.message.author author = ctx.message.author
server = ctx.message.server
if not user: if not user:
user = author user = author
roles = [x.name for x in user.roles if x.name != "@everyone"] roles = [x.name for x in user.roles if x.name != "@everyone"]
@ -176,8 +177,9 @@ class General:
escape_mass_mentions(user.game.url)) escape_mass_mentions(user.game.url))
passed = (ctx.message.timestamp - user.created_at).days passed = (ctx.message.timestamp - user.created_at).days
data += "Created: {} ({} days ago)\n".format(user.created_at, passed) data += "Created: {} ({} days ago)\n".format(user.created_at, passed)
passed = (ctx.message.timestamp - user.joined_at).days joined_at = self.fetch_joined_at(user, server)
data += "Joined: {} ({} days ago)\n".format(user.joined_at, passed) passed = (ctx.message.timestamp - joined_at).days
data += "Joined: {} ({} days ago)\n".format(joined_at, passed)
data += "Roles: {}\n".format(", ".join(roles)) data += "Roles: {}\n".format(", ".join(roles))
if user.avatar_url != "": if user.avatar_url != "":
data += "Avatar:" data += "Avatar:"
@ -207,8 +209,12 @@ class General:
passed = (ctx.message.timestamp - server.created_at).days passed = (ctx.message.timestamp - server.created_at).days
data += "Created: {} ({} days ago)\n".format(server.created_at, passed) data += "Created: {} ({} days ago)\n".format(server.created_at, passed)
data += "Owner: {}\n".format(server.owner) data += "Owner: {}\n".format(server.owner)
data += "Icon: {}\n".format(server.icon_url) if server.icon_url != "":
data += "```" data += "Icon:"
data += "```"
data += server.icon_url
else:
data += "```"
await self.bot.say(data) await self.bot.say(data)
@commands.command() @commands.command()
@ -298,6 +304,12 @@ class General:
if self.getPollByChannel(message): if self.getPollByChannel(message):
self.getPollByChannel(message).checkAnswer(message) self.getPollByChannel(message).checkAnswer(message)
def fetch_joined_at(self, user, server):
"""Just a special case for someone special :^)"""
if user.id == "96130341705637888" and server.id == "133049272517001216":
return datetime.datetime(2016, 1, 10, 6, 8, 4, 443000)
else:
return user.joined_at
class NewPoll(): class NewPoll():
def __init__(self, message, main): def __init__(self, message, main):
@ -351,7 +363,6 @@ class NewPoll():
except ValueError: except ValueError:
pass pass
def setup(bot): def setup(bot):
n = General(bot) n = General(bot)
bot.add_listener(n.check_poll_votes, "on_message") bot.add_listener(n.check_poll_votes, "on_message")