Merge branch 'master' into app_emojis

Author: plun1331

CHANGELOG.md

@@ -39,6 +39,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2584](https://github.com/Pycord-Development/pycord/pull/2584))
 - Fixed the `is_owner()` `user` type hint: `User` -> `User | Member`.
   ([#2593](https://github.com/Pycord-Development/pycord/pull/2593))
+- Fixed `Guild.create_test_entitlement()` and `User.create_test_entitlement()` using the
+  guild/user ID instead of the application ID.
+  ([#2595](https://github.com/Pycord-Development/pycord/pull/2595))
 
 ### Changed
 

discord/bot.py

@@ -34,7 +34,16 @@
 import sys
 import traceback
 from abc import ABC, abstractmethod
-from typing import Any, Callable, Coroutine, Generator, Literal, Mapping, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Coroutine,
+    Generator,
+    Literal,
+    Mapping,
+    TypeVar,
+)
 
 from .client import Client
 from .cog import CogMixin
@@ -56,6 +65,9 @@
 from .user import User
 from .utils import MISSING, async_all, find, get
 
+if TYPE_CHECKING:
+    from .member import Member
+
 CoroFunc = Callable[..., Coroutine[Any, Any, Any]]
 CFT = TypeVar("CFT", bound=CoroFunc)
 

discord/guild.py

@@ -4091,7 +4091,9 @@ async def create_test_entitlement(self, sku: Snowflake) -> Entitlement:
             "owner_id": self.id,
             "owner_type": EntitlementOwnerType.guild.value,
         }
-        data = await self._state.http.create_test_entitlement(self.id, payload)
+        data = await self._state.http.create_test_entitlement(
+            self._state.application_id, payload
+        )
         return Entitlement(data=data, state=self._state)
 
     def entitlements(

discord/user.py

@@ -636,7 +636,9 @@ async def create_test_entitlement(self, sku: discord.abc.Snowflake) -> Entitleme
             "owner_id": self.id,
             "owner_type": 2,
         }
-        data = await self._state.http.create_test_entitlement(self.id, payload)
+        data = await self._state.http.create_test_entitlement(
+            self._state.application_id, payload
+        )
         return Entitlement(data=data, state=self._state)
 
     def entitlements(