Allow ;a and ;banner on users outside guild #85

tooruu · Jul 12, 2024 · 7c3d98c · 7c3d98c
1 parent 97277d7
commit 7c3d98c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/arabot/__init__.py b/arabot/__init__.py
@@ -2,7 +2,7 @@
 
 from dotenv import load_dotenv
 
-__version__ = "8.19.9"
+__version__ = "8.20.0"
 
 load_dotenv()
 TESTING = bool(getenv("TESTING"))

diff --git a/arabot/modules/userinfo.py b/arabot/modules/userinfo.py
@@ -25,8 +25,8 @@ async def guild_variant(self, button: disnake.ui.Button, inter: disnake.MessageI
 
 
 class Userinfo(Cog, category=Category.GENERAL):
-    @commands.command(aliases=["a", "pfp"], brief="Show user's avatar", usage="[member]")
-    async def avatar(self, ctx: Context, *, member: AnyMember = False):
+    @commands.command(aliases=["a", "pfp"], brief="Show user's avatar", usage="[user]")
+    async def avatar(self, ctx: Context, *, member: AnyMemberOrUser = False):
         if member is None:
             await ctx.send_("user_not_found", False)
             return
@@ -40,7 +40,7 @@ async def avatar(self, ctx: Context, *, member: AnyMember = False):
             .set_footer(text=ctx._("guild_avatar").format(member.display_name)),
         )
 
-        if not member.guild_avatar:
+        if not getattr(member, "guild_avatar", None):
             await ctx.send(embed=avatars[0])
             return
 
@@ -49,10 +49,10 @@ async def avatar(self, ctx: Context, *, member: AnyMember = False):
     @commands.command(
         aliases=["b"],
         brief="Show user's global banner",
-        usage="[member]",
+        usage="[user]",
         extras={"note": "Due to a Discord limitation, server banners are irretrievable"},
     )
-    async def banner(self, ctx: Context, *, member: AnyMember = False):
+    async def banner(self, ctx: Context, *, member: AnyMemberOrUser = False):
         if member is None:
             await ctx.send_("user_not_found", False)
             return
@@ -68,7 +68,7 @@ async def banner(self, ctx: Context, *, member: AnyMember = False):
         )
 
     @commands.command(
-        aliases=["user", "dox", "doxx", "whois"], brief="View user's info", usage="[member]"
+        aliases=["user", "dox", "doxx", "whois"], brief="View user's info", usage="[user]"
     )
     async def userinfo(self, ctx: Context, *, member: AnyMemberOrUser = False):
         if member is None: