From 458d23c4bef5a47a6d2b00d0ffc7e37fcb6e0029 Mon Sep 17 00:00:00 2001 From: Twentysix Date: Fri, 18 Nov 2016 05:42:23 +0100 Subject: [PATCH] [General, Owner] Added more info and stylistic changes to r. embeds cmds --- cogs/general.py | 8 ++++---- cogs/owner.py | 25 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/cogs/general.py b/cogs/general.py index 5b8c67964..59688746a 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -182,7 +182,7 @@ class General: elif user.game.url is None: game = "Playing {}".format(user.game) else: - game = "Streaming: {} ({})".format(user.game, user.game.url) + game = "Streaming: [{}]({})".format(user.game, user.game.url) if roles: roles = sorted(roles, key=[x.name for x in server.role_hierarchy @@ -223,7 +223,7 @@ class General: if x.type == discord.ChannelType.text]) voice_channels = len(server.channels) - text_channels passed = (ctx.message.timestamp - server.created_at).days - created_at = ("Created on {} ({} days ago!)" + created_at = ("Since {}. That's over {} days ago!" "".format(server.created_at.strftime("%d %b %Y %H:%M"), passed)) @@ -231,7 +231,7 @@ class General: colour = int(colour, 16) data = discord.Embed( - description="Server ID: " + server.id, + description=created_at, colour=discord.Colour(value=colour)) data.add_field(name="Region", value=str(server.region)) data.add_field(name="Users", value="{}/{}".format(online, total_users)) @@ -239,7 +239,7 @@ class General: data.add_field(name="Voice Channels", value=voice_channels) data.add_field(name="Roles", value=len(server.roles)) data.add_field(name="Owner", value=str(server.owner)) - data.set_footer(text=created_at) + data.set_footer(text="Server ID: " + server.id) if server.icon_url: data.set_author(name=server.name, url=server.icon_url) diff --git a/cogs/owner.py b/cogs/owner.py index c60662605..e959a2dce 100644 --- a/cogs/owner.py +++ b/cogs/owner.py @@ -596,10 +596,24 @@ class Owner: author_repo = "https://github.com/Twentysix26" red_repo = author_repo + "/Red-DiscordBot" server_url = "https://discord.me/Red-DiscordBot" - discordpy_repo = "https://github.com/Rapptz/discord.py" + dpy_repo = "https://github.com/Rapptz/discord.py" python_url = "https://www.python.org/" since = datetime.datetime(2016, 1, 2, 0, 0) days_since = (datetime.datetime.now() - since).days + dpy_version = "[{}]({})".format(discord.__version__, dpy_repo) + py_version = "[{}.{}.{}]({})".format(*os.sys.version_info[:3], + python_url) + + owner = settings.owner if settings.owner != "id_here" else None + if owner: + owner = discord.utils.get(self.bot.get_all_members(), id=owner) + if not owner: + try: + owner = await self.bot.get_user_info(settings.owner) + except: + owner = None + if not owner: + owner = "Unknown" about = ( "This is an instance of [Red, an open source Discord bot]({}) " @@ -607,12 +621,13 @@ class Owner: "Red is backed by a passionate community who contributes and " "creates content for everyone to enjoy. [Join us today]({}) " "and help us improve!\n\n" - "Written in [Python]({}), powered by [discord.py]({})" - "".format(red_repo, author_repo, server_url, python_url, - discordpy_repo)) + "".format(red_repo, author_repo, server_url)) embed = discord.Embed(colour=discord.Colour.red()) - embed.add_field(name="About Red", value=about) + embed.add_field(name="Instance owned by", value=str(owner)) + embed.add_field(name="Python", value=py_version) + embed.add_field(name="discord.py", value=dpy_version) + embed.add_field(name="About Red", value=about, inline=False) embed.set_footer(text="Bringing joy since 02 Jan 2016 (over " "{} days ago!)".format(days_since))