Merge pull request #3 from JamsRepos/master

Added Support for Chunks & Async Changes

Author: ValDesign22

discordanalytics/__init__.py

@@ -1,6 +1,6 @@
 __title__ = 'discordanalytics'
 __author__ = "ValDesign"
 __license__ = "MIT"
-__version__ = "3.0.4"
+__version__ = "3.1.0"
 
 from .client import *

discordanalytics/client.py

@@ -1,9 +1,9 @@
 import asyncio
-from datetime import datetime, timezone
+from datetime import datetime
 from typing import Literal
 import discord
 from discord.enums import InteractionType
-import requests
+import aiohttp
 import sys
 
 from .__init__ import __version__
@@ -20,15 +20,14 @@ class ErrorCodes:
   INVALID_API_TOKEN = "Invalid API token, please get one at " + ApiEndpoints.BASE_URL.split("/api")[0] + " and try again."
   DATA_NOT_SENT = "Data cannot be sent to the API, I will try again in a minute."
   SUSPENDED_BOT = "Your bot has been suspended, please check your mailbox for more information."
-  INSTANCE_NOT_INITIALIZED = "It seem that you didn't initialize your instance. Please check the docs for more informations."
   INVALID_EVENTS_COUNT = "invalid events count"
 
 class DiscordAnalytics():
-  def __init__(self, client: discord.Client, api_key: str, debug: bool = False):
+  def __init__(self, client: discord.Client, api_key: str, debug: bool = False, chunk_guilds_at_startup: bool = True):
     self.client = client
     self.api_key = api_key
     self.debug = debug
-    self.is_ready = False
+    self.chunk_guilds = chunk_guilds_at_startup
     self.headers = {
       "Content-Type": "application/json",
       "Authorization": f"Bot {api_key}"
@@ -57,105 +56,135 @@ def __init__(self, client: discord.Client, api_key: str, debug: bool = False):
         "private_message": 0
       }
     }
-  
+
   def track_events(self):
     if not self.client.is_ready():
       @self.client.event
       async def on_ready():
-        self.init()
+        await self.init()
     else:
-      self.init()
+      asyncio.create_task(self.init())
+
     @self.client.event
     async def on_interaction(interaction: discord.Interaction):
       self.track_interactions(interaction)
+
     @self.client.event
     async def on_guild_join(guild: discord.Guild):
       self.trackGuilds(guild, "create")
+
     @self.client.event
     async def on_guild_remove(guild: discord.Guild):
       self.trackGuilds(guild, "delete")
-  
-  def init(self):
+
+  async def init(self):
     if not isinstance(self.client, discord.Client):
       raise ValueError(ErrorCodes.INVALID_CLIENT_TYPE)
     if not self.client.is_ready():
       raise ValueError(ErrorCodes.CLIENT_NOT_READY)
-    
-    response = requests.patch(
-      ApiEndpoints.BOT_URL.replace(":id", str(self.client.user.id)),
-      headers=self.headers,
-      json={
-        "username": self.client.user.name,
-        "avatar": self.client.user._avatar,
-        "framework": "discord.py",
-        "version": __version__
-      }
-    )
-
-    if response.status_code == 401:
-      raise ValueError(ErrorCodes.INVALID_API_TOKEN)
-    if response.status_code == 423:
-      raise ValueError(ErrorCodes.SUSPENDED_BOT)
-    if response.status_code != 200:
-      raise ValueError(ErrorCodes.INVALID_RESPONSE)
-    
+
+    # Proceed with initialization, API calls, etc.
+    async with aiohttp.ClientSession() as session:
+      async with session.patch(
+        ApiEndpoints.BOT_URL.replace(":id", str(self.client.user.id)),
+        headers=self.headers,
+        json={
+          "username": self.client.user.name,
+          "avatar": self.client.user._avatar,
+          "framework": "discord.py",
+          "version": __version__
+        }
+      ) as response:
+        if response.status == 401:
+          raise ValueError(ErrorCodes.INVALID_API_TOKEN)
+        elif response.status == 423:
+          raise ValueError(ErrorCodes.SUSPENDED_BOT)
+        elif response.status != 200:
+          raise ValueError(ErrorCodes.INVALID_RESPONSE)
+
     if self.debug:
       print("[DISCORDANALYTICS] Instance successfully initialized")
-    self.is_ready = True
 
     if self.debug:
       if "--dev" in sys.argv:
         print("[DISCORDANALYTICS] DevMode is enabled. Stats will be sent every 30s.")
       else:
         print("[DISCORDANALYTICS] DevMode is disabled. Stats will be sent every 5 minutes.")
 
+    if not self.chunk_guilds:
+      await self.load_members_for_all_guilds()
+
     self.client.loop.create_task(self.send_stats())
 
+  async def load_members_for_all_guilds(self):
+    """Load members for each guild when chunk_guilds_at_startup is False."""
+    tasks = [self.load_members_for_guild(guild) for guild in self.client.guilds]
+    await asyncio.gather(*tasks)
+
+  async def load_members_for_guild(self, guild: discord.Guild):
+    """Load members for a single guild."""
+    try:
+      await guild.chunk()
+      if self.debug:
+        print(f"[DISCORDANALYTICS] Chunked members for guild {guild.name}")
+    except Exception:
+      await self.query_members(guild)
+
+  async def query_members(self, guild: discord.Guild):
+    """Query members by prefix if chunking fails."""
+    try:
+      members = await guild.query_members(query="", limit=1000)
+      if self.debug:
+        print(f"[DISCORDANALYTICS] Queried members for guild {guild.name}: {len(members)} members found.")
+    except Exception as e:
+      print(f"[DISCORDANALYTICS] Error querying members for guild {guild.name}: {e}")
+
   async def send_stats(self):
     await self.client.wait_until_ready()
     while not self.client.is_closed():
       if self.debug:
         print("[DISCORDANALYTICS] Sending stats...")
-      
+
       guild_count = len(self.client.guilds)
       user_count = len(self.client.users)
 
-      response = requests.post(
-        ApiEndpoints.STATS_URL.replace(":id", str(self.client.user.id)),
-        headers=self.headers,
-        json=self.stats
-      )
-
-      if response.status_code == 401:
-        raise ValueError(ErrorCodes.INVALID_API_TOKEN)
-      if response.status_code == 423:
-        raise ValueError(ErrorCodes.SUSPENDED_BOT)
-      if response.status_code != 200:
-        raise ValueError(ErrorCodes.INVALID_RESPONSE)
-      if response.status_code == 200:
-        if self.debug:
-          print(f"[DISCORDANALYTICS] Stats {self.stats} sent to the API")
-        
-        self.stats = {
-          "date": datetime.today().strftime("%Y-%m-%d"),
-          "guilds": guild_count,
-          "users": user_count,
-          "interactions": [],
-          "locales": [],
-          "guildsLocales": [],
-          "guildMembers": self.calculate_guild_members_repartition(),
-          "guildsStats": [],
-          "addedGuilds": 0,
-          "removedGuilds": 0,
-          "users_type": {
-            "admin": 0,
-            "moderator": 0,
-            "new_member": 0,
-            "other": 0,
-            "private_message": 0
-          }
-        }
-      
+      async with aiohttp.ClientSession() as session:
+        async with session.post(
+          ApiEndpoints.STATS_URL.replace(":id", str(self.client.user.id)),
+          headers=self.headers,
+          json=self.stats
+        ) as response:
+          if response.status == 401:
+            raise ValueError(ErrorCodes.INVALID_API_TOKEN)
+          elif response.status == 423:
+            raise ValueError(ErrorCodes.SUSPENDED_BOT)
+          elif response.status != 200:
+            raise ValueError(ErrorCodes.INVALID_RESPONSE)
+
+          if response.status == 200:
+            if self.debug:
+              print(f"[DISCORDANALYTICS] Stats {self.stats} sent to the API")
+
+            self.stats = {
+              "date": datetime.today().strftime("%Y-%m-%d"),
+              "guilds": guild_count,
+              "users": user_count,
+              "interactions": [],
+              "locales": [],
+              "guildsLocales": [],
+              "guildMembers": self.calculate_guild_members_repartition(),
+              "guildsStats": [],
+              "addedGuilds": 0,
+              "removedGuilds": 0,
+              "users_type": {
+                "admin": 0,
+                "moderator": 0,
+                "new_member": 0,
+                "other": 0,
+                "private_message": 0
+              }
+            }
+
       await asyncio.sleep(10 if "--dev" in sys.argv else 300)
 
   def calculate_guild_members_repartition(self):
@@ -177,13 +206,14 @@ def calculate_guild_members_repartition(self):
         result["huge"] += 1
 
     return result
-  
+
   def track_interactions(self, interaction: discord.Interaction):
     if self.debug:
       print("[DISCORDANALYTICS] Track interactions triggered")
-    if not self.is_ready:
-      raise ValueError(ErrorCodes.INSTANCE_NOT_INITIALIZED)
-    
+
+    if not self.client.is_ready():
+      raise ValueError(ErrorCodes.CLIENT_NOT_READY)
+
     locale = next((x for x in self.stats["locales"] if x["locale"] == interaction.locale.value), None)
     if locale is not None:
       locale["number"] += 1
@@ -193,8 +223,9 @@ def track_interactions(self, interaction: discord.Interaction):
         "number": 1
       })
 
-    if interaction.type == InteractionType.application_command or interaction.type == InteractionType.autocomplete:
-      interaction_data = next((x for x in self.stats["interactions"] if x["name"] == interaction.data["name"] and x["type"] == interaction.type.value), None)
+    if interaction.type in {InteractionType.application_command, InteractionType.autocomplete}:
+      interaction_data = next((x for x in self.stats["interactions"]
+      if x["name"] == interaction.data["name"] and x["type"] == interaction.type.value), None)
       if interaction_data is not None:
         interaction_data["number"] += 1
       else:
@@ -203,8 +234,9 @@ def track_interactions(self, interaction: discord.Interaction):
           "number": 1,
           "type": interaction.type.value
         })
-    elif interaction.type == InteractionType.component or interaction.type == InteractionType.modal_submit:
-      interaction_data = next((x for x in self.stats["interactions"] if x["name"] == interaction.data["custom_id"] and x["type"] == interaction.type.value), None)
+    elif interaction.type in {InteractionType.component, InteractionType.modal_submit}:
+      interaction_data = next((x for x in self.stats["interactions"]
+      if x["name"] == interaction.data["custom_id"] and x["type"] == interaction.type.value), None)
       if interaction_data is not None:
         interaction_data["number"] += 1
       else:
@@ -219,9 +251,9 @@ def track_interactions(self, interaction: discord.Interaction):
     else:
       guilds = []
       for guild in self.client.guilds:
-        if guild.preferred_locale is not None:
+        if guild.preferred_locale:
           guild_locale = next((x for x in guilds if x["locale"] == guild.preferred_locale.value), None)
-          if guild_locale is not None:
+          if guild_locale:
             guild_locale["number"] += 1
           else:
             guilds.append({
@@ -232,7 +264,7 @@ def track_interactions(self, interaction: discord.Interaction):
 
       guild_data = next((x for x in self.stats["guildsStats"] if x["guildId"] == str(interaction.guild.id)), None)
       guild_icon = interaction.guild.icon.key if interaction.guild.icon else None
-      if guild_data is not None:
+      if guild_data:
         guild_data["interactions"] += 1
         guild_data["icon"] = guild_icon
       else:
@@ -243,30 +275,28 @@ def track_interactions(self, interaction: discord.Interaction):
           "members": interaction.guild.member_count,
           "interactions": 1
         })
-      
+
       if interaction.user.guild_permissions.administrator or interaction.user.guild_permissions.manage_guild:
         self.stats["users_type"]["admin"] += 1
-      elif (
-          interaction.user.guild_permissions.manage_messages
-          or interaction.user.guild_permissions.kick_members
-          or interaction.user.guild_permissions.ban_members
-          or interaction.user.guild_permissions.mute_members
-          or interaction.user.guild_permissions.deafen_members
-          or interaction.user.guild_permissions.move_members
-          or interaction.user.guild_permissions.moderate_members
-        ):
+      elif any(perm for perm in [
+          interaction.user.guild_permissions.manage_messages,
+          interaction.user.guild_permissions.kick_members,
+          interaction.user.guild_permissions.ban_members,
+          interaction.user.guild_permissions.mute_members,
+          interaction.user.guild_permissions.deafen_members,
+          interaction.user.guild_permissions.move_members,
+          interaction.user.guild_permissions.moderate_members]):
         self.stats["users_type"]["moderator"] += 1
-      elif interaction.user.joined_at is not None and (discord.utils.utcnow() - interaction.user.joined_at).days <= 7:
+      elif interaction.user.joined_at and (discord.utils.utcnow() - interaction.user.joined_at).days <= 7:
         self.stats["users_type"]["new_member"] += 1
       else:
         self.stats["users_type"]["other"] += 1
 
-  # type = delete or create
   def trackGuilds(self, guild: discord.Guild, type: Literal["create", "delete"]):
     if self.debug:
       print(f"[DISCORDANALYTICS] trackGuilds({type}) triggered")
 
     if type == "create":
       self.stats["addedGuilds"] += 1
     elif type == "delete":
-      self.stats["removedGuilds"] += 1
+      self.stats["removedGuilds"] += 1

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "discordanalytics"
 description = "A Python package for interacting with Discord Analytics API"
-version = "3.0.4"
+version = "3.1.0"
 authors = [
   {name = "ValDesign", email = "valdesign.dev@gmail.com"}
 ]

requirements.txt

@@ -1,4 +1,4 @@
 discord.py==2.4.0
-requests==2.32.3
+aiohttp==3.10.10
 setuptools==75.2.0
 wheel==0.44.0