Lookup place abbrev for hub server if set.

inatcog/constants.py

@@ -1,2 +1,5 @@
 """Module for constants."""
 COG_NAME = "iNat"
+# ToDo: make this configurable:
+# - currently only contains iNaturalist and Dronefly server ids
+HUB_SERVERS = [525711945270296587, 615263302485803019]

inatcog/places.py

@@ -4,7 +4,8 @@
 from pyinaturalist.models import Place
 
 from .converters.base import QuotedContextMemberConverter
-from .utils import get_home_server, get_valid_user_config
+from .constants import HUB_SERVERS
+from .utils import get_home_server, get_hub_server, get_valid_user_config
 
 RESERVED_PLACES = ["home", "none", "clear", "all", "any"]
 
@@ -23,6 +24,14 @@ async def get_place(
         response = None
         home_id = None
 
+        async def _get_place(guild, abbrev):
+            response = None
+            guild_config = self.cog.config.guild(guild)
+            places = await guild_config.places()
+            if abbrev in places:
+                response = await self.cog.api.get_places(places[abbrev])
+            return response
+
         _guild = guild or await get_home_server(self.cog, user)
         if isinstance(query, str):
             abbrev = query.lower()
@@ -43,10 +52,11 @@ async def get_place(
             place_id = home_id or query
             response = await self.cog.api.get_places(int(place_id))
         elif _guild:
-            guild_config = self.cog.config.guild(_guild)
-            places = await guild_config.places()
-            if abbrev in places:
-                response = await self.cog.api.get_places(places[abbrev])
+            response = await _get_place(_guild, abbrev)
+            if not response and _guild.id not in HUB_SERVERS:
+                hub_server = await get_hub_server(self.cog, _guild)
+                if hub_server:
+                    response = await _get_place(hub_server, abbrev)
 
         if not response:
             response = await self.cog.api.get_places(

inatcog/utils.py

@@ -216,3 +216,18 @@ async def get_home_server(
     except LookupError:
         pass
     return guild
+
+
+async def get_hub_server(
+    cog: commands.Cog,
+    guild: discord.Guild,
+) -> discord.Guild:
+    hub_server = None
+    guild_config = cog.config.guild(guild)
+    if guild_config:
+        server_id = await guild_config.server()
+        hub_server = next(
+            (server for server in cog.bot.guilds if server.id == server_id),
+            None,
+        )
+    return hub_server