Bump version to 3.0.0, update dependencies, and track users type

Author: ValDesign22

discordanalytics/__pycache__/__init__.cpython-312.pyc

@@ -49,6 +49,13 @@ def __init__(self, client: discord.Client, api_key: str, debug: bool = False):
       "guildsStats": [], # {guildId:str, name:str, icon:str, members:int, interactions: int}[]
       "addedGuilds": 0,
       "removedGuilds": 0,
+      "users_type": {
+        "admin": 0,
+        "moderator": 0,
+        "new_member": 0,
+        "other": 0,
+        "private_message": 0
+      }
     }
 
   def track_events(self):
@@ -140,6 +147,13 @@ async def send_stats(self):
           "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)
@@ -170,19 +184,6 @@ def track_interactions(self, interaction: discord.Interaction):
     if not self.is_ready:
       raise ValueError(ErrorCodes.INSTANCE_NOT_INITIALIZED)
 
-    guilds = []
-    for guild in self.client.guilds:
-      if guild.preferred_locale is not None:
-        guild_locale = next((x for x in guilds if x["locale"] == guild.preferred_locale.value), None)
-        if guild_locale is not None:
-          guild_locale["number"] += 1
-        else:
-          guilds.append({
-            "locale": guild.preferred_locale.value,
-            "number": 1
-          })
-    self.stats["guildsLocales"] = guilds
-    
     locale = next((x for x in self.stats["locales"] if x["locale"] == interaction.locale.value), None)
     if locale is not None:
       locale["number"] += 1
@@ -213,17 +214,43 @@ def track_interactions(self, interaction: discord.Interaction):
           "type": interaction.type.value
         })
 
-    guild_data = next((x for x in self.stats["guildsStats"] if x["guildId"] == str(interaction.guild.id)), None)
-    if guild_data is not None:
-      guild_data["interactions"] += 1
+    if interaction.guild is None:
+      self.stats["users_type"]["private_message"] += 1
     else:
-      self.stats["guildsStats"].append({
-        "guildId": str(interaction.guild.id),
-        "name": interaction.guild.name,
-        "icon": interaction.guild.icon,
-        "members": interaction.guild.member_count,
-        "interactions": 1
-      })
+      guilds = []
+      for guild in self.client.guilds:
+        if guild.preferred_locale is not None:
+          guild_locale = next((x for x in guilds if x["locale"] == guild.preferred_locale.value), None)
+          if guild_locale is not None:
+            guild_locale["number"] += 1
+          else:
+            guilds.append({
+              "locale": guild.preferred_locale.value,
+              "number": 1
+            })
+      self.stats["guildsLocales"] = guilds
+
+      guild_data = next((x for x in self.stats["guildsStats"] if x["guildId"] == str(interaction.guild.id)), None)
+      if guild_data is not None:
+        guild_data["interactions"] += 1
+      else:
+        self.stats["guildsStats"].append({
+          "guildId": str(interaction.guild.id),
+          "name": interaction.guild.name,
+          "icon": interaction.guild.icon.key,
+          "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:
+        self.stats["users_type"]["moderator"] += 1
+        # check if the member is less than 7 days old
+      elif interaction.user.joined_at is not None and (datetime.now() - 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"]):

discordanalytics/__pycache__/client.cpython-312.pyc

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

discordanalytics/client.py

@@ -1,4 +1,4 @@
-discord.py==2.3.2
-requests==2.31.0
-setuptools==68.0.0
+discord.py==2.4.0
+requests==2.32.3
+setuptools==71.0.3
 wheel==0.43.0