fix: error using user installs in guild

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 19.x, 20.x, 21.x, 22.x]
+        node-version: [20.x, 21.x, 22.x, 23.x, 24.x, 25.x]
       fail-fast: true
 
     name: Test TypeScript build

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discordanalytics/core",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Core package to work with Discord Analytics",
   "files": ["dist"],
   "main": "dist/index.js",

packages/discordjs-light/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discordanalytics/discordjs-light",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Discord.js light package for working with Discord Analytics",
   "files": ["dist"],
   "main": "dist/index.js",

packages/discordjs/examples/index.ts

@@ -29,6 +29,8 @@ client.on('clientReady', async () => {
     name: 'test',
     description: 'Send a test message',
     dmPermission: true,
+    integrationTypes: [0, 1], // 0 = Guild Install, 1 = User Install
+    contexts: [0, 1, 2], // 0 = Guild, 1 = Bot DM, 2 = Private Channel
     options: [{
       name: 'test',
       description: 'Test option',

packages/discordjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discordanalytics/discordjs",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Discord.js package for working with Discord Analytics",
   "files": ["dist"],
   "main": "dist/index.js",

packages/discordjs/src/index.ts

@@ -178,7 +178,7 @@ export default class DiscordAnalytics extends AnalyticsBase {
     const oneWeekAgo = new Date();
     oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
 
-    if (!interaction.inGuild()) ++this.stats_data.users_type.private_message;
+    if (!interaction.inGuild() || !interaction.guild) ++this.stats_data.users_type.private_message;
     else if (
       interaction.member
       && interaction.member.permissions

packages/eris/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discordanalytics/eris",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Eris package for working with Discord Analytics",
   "files": ["dist"],
   "main": "dist/index.js",

packages/oceanic/examples/index.ts

@@ -33,6 +33,8 @@ client.on('ready', async () => {
     type: ApplicationCommandTypes.CHAT_INPUT,
     name: 'test',
     description: 'Do some tests',
+    integrationTypes: [0, 1], // 0 = Guild Install, 1 = User Install
+    contexts: [0, 1, 2], // 0 = Guild, 1 = Bot DM, 2 = Private Channel
     options: [{
       type: ApplicationCommandOptionTypes.STRING,
       name: 'type',
@@ -76,7 +78,7 @@ client.on('interactionCreate', async (interaction) => {
 
   if (interaction.isCommandInteraction() && interaction.data.name === 'test') {
     const option = interaction.data.options.getString('type', false);
-    
+
     if (option === 'button') interaction.reply({
       content: 'Here is the button!',
       components: [{

packages/oceanic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discordanalytics/oceanic",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "Oceanic package for working with Discord Analytics",
   "files": ["dist"],
   "main": "dist/index.js",

packages/oceanic/src/index.ts

@@ -108,9 +108,9 @@ export default class DiscordAnalytics extends AnalyticsBase {
 
     this.updateOrInsert(
       this.stats_data.guildsLocales,
-      (x) => x.locale === interaction.guild?.preferredLocale,
+      (x) => x.locale === interaction.guildLocale,
       (x) => x.number++,
-      () => ({ locale: interaction.guild?.preferredLocale, number: 1 }),
+      () => ({ locale: interaction.guildLocale, number: 1 }),
     );
 
     this.updateOrInsert(
@@ -159,33 +159,33 @@ export default class DiscordAnalytics extends AnalyticsBase {
       (x) => x.guildId === (interaction.guild ? interaction.guildID : 'dm'),
       (x) => x.interactions++,
       () => ({
-        guildId: interaction.guild ? interaction.guildID : 'dm',
-        name: interaction.guild ? interaction.guild.name : 'DM',
-        icon: interaction.guild && interaction.guild.icon ? interaction.guild.icon : undefined,
+        guildId: interaction.guildID ? interaction.guildID : 'dm',
+        name: this.is_guild_install(interaction) ? interaction.guild.name : 'DM',
+        icon: this.is_guild_install(interaction) && interaction.guild.icon ? interaction.guild.icon : undefined,
         interactions: 1,
-        members: interaction.guild ? interaction.guild.memberCount : 0,
+        members: this.is_guild_install(interaction) ? interaction.guild.memberCount : 0,
       }),
     );
 
     const oneWeekAgo = new Date();
     oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
 
-    if (!interaction.guild) ++this.stats_data.users_type.private_message
+    if (!interaction.guildID) ++this.stats_data.users_type.private_message
     else if (
       interaction.member
-      && interaction.member.permissions
-      && interaction.member.permissions.has(8n)
-      || interaction.member.permissions.has(32n)
+      && interaction.memberPermissions
+      && interaction.memberPermissions.has(8n)
+      || interaction.memberPermissions.has(32n)
     ) ++this.stats_data.users_type.admin
     else if (
       interaction.member
-      && interaction.member.permissions
-      && interaction.member.permissions.has(8192n)
-      || interaction.member.permissions.has(2n)
-      || interaction.member.permissions.has(4194304n)
-      || interaction.member.permissions.has(8388608n)
-      || interaction.member.permissions.has(16777216n)
-      || interaction.member.permissions.has(1099511627776n)
+      && interaction.memberPermissions
+      && interaction.memberPermissions.has(8192n)
+      || interaction.memberPermissions.has(2n)
+      || interaction.memberPermissions.has(4194304n)
+      || interaction.memberPermissions.has(8388608n)
+      || interaction.memberPermissions.has(16777216n)
+      || interaction.memberPermissions.has(1099511627776n)
     ) ++this.stats_data.users_type.moderator
     else if (
       interaction.member
@@ -208,4 +208,8 @@ export default class DiscordAnalytics extends AnalyticsBase {
     this._client.on('guildCreate', async (guild: any) => this.trackGuilds('create'));
     this._client.on('guildDelete', async (guild: any) => this.trackGuilds('delete'));
   }
+
+  private is_guild_install (interaction: any): boolean {
+    return interaction.authorizingIntegrationOwners["0"] === interaction.guildID
+  }
 }