feat: format ratelimit messages with major params (#1360)

Author: LordOfPolls

interactions/api/http/http_client.py

@@ -403,7 +403,7 @@ async def request(
                                 # resource ratelimit is reached
                                 self.log_ratelimit(
                                     self.logger.warning,
-                                    f"{route.endpoint} The resource is being rate limited! "
+                                    f"{route.resolved_endpoint} The resource is being rate limited! "
                                     f"Reset in {result.get('retry_after')} seconds",
                                 )
                                 # lock this resource and wait for unlock
@@ -414,15 +414,15 @@ async def request(
                                 # so long as these are infrequent we're doing well
                                 self.log_ratelimit(
                                     self.logger.warning,
-                                    f"{route.endpoint} Has exceeded it's ratelimit ({lock.limit})! Reset in {lock.delta} seconds",
+                                    f"{route.resolved_endpoint} Has exceeded its ratelimit ({lock.limit})! Reset in {lock.delta} seconds",
                                 )
                                 await lock.lock_for_duration(lock.delta, block=True)
                             continue
                         if lock.remaining == 0:
                             # Last call available in the bucket, lock until reset
                             self.log_ratelimit(
                                 self.logger.debug,
-                                f"{route.endpoint} Has exhausted its ratelimit ({lock.limit})! Locking route for {lock.delta} seconds",
+                                f"{route.resolved_endpoint} Has exhausted its ratelimit ({lock.limit})! Locking route for {lock.delta} seconds",
                             )
                             await lock.lock_for_duration(
                                 lock.delta
@@ -431,7 +431,7 @@ async def request(
                         elif response.status in {500, 502, 504}:
                             # Server issues, retry
                             self.logger.warning(
-                                f"{route.endpoint} Received {response.status}... retrying in {1 + attempt * 2} seconds"
+                                f"{route.resolved_endpoint} Received {response.status}... retrying in {1 + attempt * 2} seconds"
                             )
                             await asyncio.sleep(1 + attempt * 2)
                             continue
@@ -440,7 +440,7 @@ async def request(
                             await self._raise_exception(response, route, result)
 
                         self.logger.debug(
-                            f"{route.endpoint} Received {response.status} :: [{lock.remaining}/{lock.limit} calls remaining]"
+                            f"{route.resolved_endpoint} Received {response.status} :: [{lock.remaining}/{lock.limit} calls remaining]"
                         )
                         return result
                 except OSError as e:

interactions/api/http/route.py

@@ -55,14 +55,36 @@ def rl_bucket(self) -> str:
             return f"{self.webhook_id}{self.webhook_token}:{self.channel_id}:{self.guild_id}:{self.endpoint}"
         return f"{self.channel_id}:{self.guild_id}:{self.endpoint}"
 
+    @property
+    def major_params(self) -> dict[str, str | int]:
+        """The major parameters for this route"""
+        return {
+            "channel_id": self.channel_id,
+            "guild_id": self.guild_id,
+            "webhook_id": self.webhook_id,
+            "webhook_token": self.webhook_token,
+        }
+
+    @property
+    def resolved_path(self) -> str:
+        """The endpoint for this route, with all parameters resolved"""
+        return self.path.format_map({k: _uriquote(v) if isinstance(v, str) else v for k, v in self.params.items()})
+
     @property
     def endpoint(self) -> str:
         """The endpoint for this route"""
         return f"{self.method} {self.path}"
 
+    @property
+    def resolved_endpoint(self) -> str:
+        """The endpoint for this route, with all major parameters resolved"""
+        path = self.path
+        for key, value in self.major_params.items():
+            path = path.replace(f"{{{key}}}", str(value))
+
+        return f"{self.method} {path}"
+
     @property
     def url(self) -> str:
         """The full url for this route"""
-        return f"{self.BASE}{self.path}".format_map(
-            {k: _uriquote(v) if isinstance(v, str) else v for k, v in self.params.items()}
-        )
+        return f"{self.BASE}{self.resolved_path}"