fix: Fixes sub perms

yagomichalak · Aug 4, 2024 · 15ebf83 · 15ebf83
1 parent 73c4741
commit 15ebf83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cogs/slothsubscriber.py b/cogs/slothsubscriber.py
@@ -1,11 +1,11 @@
 import discord
 from discord.ext import commands
+from discord.enums import EntitlementType
 
 import os
 
 sloth_subscriber_role_id = int(os.getenv("SLOTH_SUBSCRIBER_ROLE_ID", 123))
-sloth_subscriber_sub_id = int(os.getenv("SLOTH_SUBSCRIBER_SUB_ID", 123))
-on_sloth_sub_log_channel_id = int(os.getenv("ON_SLOTH_SUB_LOG_CHANNEL_ID", 123))
+on_sloth_sub_log_channel_id = int(os.getenv("ON_SLOTH_SUB_CHANNEL_ID", 123))
 server_id = int(os.getenv('SERVER_ID', 123))
 guild_ids = [server_id]
 
@@ -25,7 +25,7 @@ async def on_entitlement_create(self, entitlement: discord.Entitlement) -> None:
         """ Handles subscriptions to the Sloth Subscriber subscription.
         :param entitlement: The entitlement/subscription. """
 
-        if entitlement.sku_id != sloth_subscriber_sub_id:
+        if not isinstance(entitlement.type, EntitlementType):
             return
 
         guild = self.client.get_guild(server_id)
@@ -60,7 +60,7 @@ async def on_entitlement_delete(self, entitlement: discord.Entitlement) -> None:
         """ Handles subscriptions to the Sloth Subscriber subscription.
         :param entitlement: The entitlement/subscription. """
 
-        if entitlement.sku_id != sloth_subscriber_sub_id:
+        if not isinstance(entitlement.type, EntitlementType):
             return
 
         guild = self.client.get_guild(server_id)

diff --git a/extra/utils.py b/extra/utils.py
@@ -1,4 +1,5 @@
 import discord
+from discord.enums import EntitlementType
 from discord.ext import commands
 from datetime import datetime
 import aiohttp
@@ -12,9 +13,6 @@
 from extra.customerrors import CommandNotReady, NotSubscribed
 from collections import OrderedDict
 import shlex
-import os
-
-sloth_subscriber_sub_id = int(os.getenv("SLOTH_SUBSCRIBER_SUB_ID", 123))
 
 session = aiohttp.ClientSession()
 
@@ -86,8 +84,7 @@ async def real_check(ctx: Optional[commands.Context] = None, channel: Optional[d
 
         entitlements = await member.entitlements().flatten()
         for entitlement in entitlements:
-            print(entitlement.sku_id)
-            if int(entitlement.sku_id) == sloth_subscriber_sub_id:
+            if isinstance(entitlement.type, EntitlementType.application_subscription):
                 return True
 
         if throw_exc: