Actually use a user's iNat home server defaults.

dronefly-garden · Aug 11, 2024 · 6d0dd9c · 6d0dd9c
1 parent 0b48764
commit 6d0dd9c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/inatcog/utils.py b/inatcog/utils.py
@@ -150,14 +150,16 @@ async def get_dronefly_user_config(
     - the Dronefly user is not known either globally or in the guild scope
       (i.e. anywhere=False vs. True)
     """
+    _user = user or ctx.author
     try:
-        user_config = await get_valid_user_config(ctx, user or ctx.author, anywhere)
+        user_config = await get_valid_user_config(ctx, _user, anywhere)
         user_config_dict = await user_config.all()
     except LookupError:
         user_config_dict = None
-    guild = ctx.guild or user_config_dict.get("server")
-    global_config = ctx.config
-    guild_config = ctx.config.guild(guild) if guild else None
+    cog = get_cog(ctx)
+    guild = ctx.guild or await get_home_server(cog, _user)
+    global_config = cog.config
+    guild_config = cog.config.guild(guild) if guild else None
 
     dronefly_config = {}
     for cog_key, core_key in COG_TO_CORE_USER_KEY.items():