From 81929e77a3b050227b13fe0941d9d2f622b8194c Mon Sep 17 00:00:00 2001 From: Twentysix Date: Fri, 8 Feb 2019 15:32:48 +0100 Subject: [PATCH] [General] [p]userinfo: Handle 'None' Member.joined_at (#2425) Backport of #2406 --- cogs/general.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cogs/general.py b/cogs/general.py index 974e908cb..3e42d921d 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -188,11 +188,16 @@ class General: joined_at = self.fetch_joined_at(user, server) since_created = (ctx.message.timestamp - user.created_at).days - since_joined = (ctx.message.timestamp - joined_at).days - user_joined = joined_at.strftime("%d %b %Y %H:%M") + if joined_at is not None: + since_joined = (ctx.message.timestamp - joined_at).days + user_joined = joined_at.strftime("%d %b %Y %H:%M") + else: + since_joined = "?" + user_joined = "Unknown" user_created = user.created_at.strftime("%d %b %Y %H:%M") - member_number = sorted(server.members, - key=lambda m: m.joined_at).index(user) + 1 + member_number = (sorted(server.members, + key=lambda m: m.joined_at or ctx.message.timestamp) + .index(user) + 1) created_on = "{}\n({} days ago)".format(user_created, since_created) joined_on = "{}\n({} days ago)".format(user_joined, since_joined)