@discordanalytics/oceanic 2.8.0 → 2.8.2

package/dist/index.d.ts

@@ -0,0 +1,56 @@
+import { AnalyticsBase, AnalyticsOptions } from '@discordanalytics/core';
+/**
+ * @class DiscordAnalytics
+ * @description The Oceanic.js class for the DiscordAnalytics library.
+ * @param {AnalyticsOptions} options - Configuration options.
+ * @property {any} options.client The Oceanic.js client to track events for.
+ * @property {string} options.api_key The API token for DiscordAnalytics.
+ * @property {boolean} options.debug Enable or not the debug mode /!\ MUST BE USED ONLY FOR DEVELOPMENT PURPOSES /!\
+ * @example
+ * const { default: DiscordAnalytics } = require('discord-analytics/oceanic');
+ * const { Client } = require('oceanic.js');
+ * const client = new Client({
+ *   auth: 'Bot <YOUR_BOT_TOKEN>',
+ *   gateway: {
+ *     intents: ['GUILDS']
+ *   }
+ * })
+ * client.on('ready', () => {
+ *   const analytics = new DiscordAnalytics({
+ *     client: client,
+ *     api_key: 'YOUR_API_TOKEN'
+ *   });
+ *   analytics.init();
+ *   analytics.trackEvents();
+ * });
+ * client.connect();
+ * @link https://discordanalytics.xyz/docs/main/get-started/installation/oceanic.js Check docs for more informations about advanced usages
+ */
+export default class DiscordAnalytics extends AnalyticsBase {
+    private readonly _client;
+    private _isReady;
+    constructor(options: Omit<AnalyticsOptions, 'sharded'>);
+    /**
+     * Initialize DiscordAnalytics on your bot
+     * /!\ Advanced users only
+     * /!\ Required to use DiscordAnalytics
+     * /!\ Must be used when the client is ready (recommended to use in ready event to prevent problems)
+     */
+    init(): Promise<void>;
+    /**
+     * Track interactions
+     * /!\ Advanced users only
+     * /!\ You need to initialize the class first
+     * @param interaction BaseInteraction class and its extensions only
+     * @param interactionNameResolver A function that will resolve the name of the interaction
+     */
+    trackInteractions(interaction: any, interactionNameResolver?: (interaction: any) => string): Promise<void>;
+    /**
+     * Let DiscordAnalytics declare the events necessary for its operation.
+     * /!\ Not recommended for big bots
+     * /!\ Not compatible with other functions
+     * @param interactionNameResolver A function that will resolve the name of the interaction
+     */
+    trackEvents(interactionNameResolver?: (interaction: any) => string): void;
+    private is_guild_install;
+}

package/dist/index.js

@@ -92,7 +92,7 @@ class DiscordAnalytics extends core_1.AnalyticsBase {
         this.debug('[DISCORDANALYTICS] trackInteractions() triggered');
         if (!this._isReady)
             return this.error(core_1.ErrorCodes.INSTANCE_NOT_INITIALIZED);
-        this.updateOrInsert(this.stats_data.guildsLocales, (x) => x.locale === interaction.guild?.preferredLocale, (x) => x.number++, () => ({ locale: interaction.guild?.preferredLocale, number: 1 }));
+        this.updateOrInsert(this.stats_data.guildsLocales, (x) => x.locale === interaction.guildLocale, (x) => x.number++, () => ({ locale: interaction.guildLocale, number: 1 }));
         this.updateOrInsert(this.stats_data.locales, (x) => x.locale === interaction.locale, (x) => x.number++, () => ({ locale: interaction.locale, number: 1 }));
         if (interaction.type === core_1.InteractionType.ApplicationCommand) {
             const commandType = interaction.data.type;
@@ -119,29 +119,29 @@ class DiscordAnalytics extends core_1.AnalyticsBase {
             }));
         }
         this.updateOrInsert(this.stats_data.guildsStats, (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)
+        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
             && interaction.member.joinedAt
@@ -162,5 +162,8 @@ class DiscordAnalytics extends core_1.AnalyticsBase {
         this._client.on('guildCreate', async (guild) => this.trackGuilds('create'));
         this._client.on('guildDelete', async (guild) => this.trackGuilds('delete'));
     }
+    is_guild_install(interaction) {
+        return interaction.authorizingIntegrationOwners["0"] === interaction.guildID;
+    }
 }
 exports.default = DiscordAnalytics;

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@discordanalytics/oceanic",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "description": "Oceanic package for working with Discord Analytics",
+  "files": [
+    "dist"
+  ],
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "author": "Discord Analytics",
   "homepage": "https://discordanalytics.xyz",
   "readme": "README.md",
@@ -14,16 +18,14 @@
     "url": "https://github.com/DiscordAnalytics/node-package/issues"
   },
   "dependencies": {
-    "@types/node-fetch": "^2.6.13",
-    "node-fetch": "^2.7.0",
-    "@discordanalytics/core": "2.8.0"
+    "@discordanalytics/core": "2.8.2"
   },
   "devDependencies": {
-    "oceanic.js": "^1.12.0",
+    "oceanic.js": "^1.13.0",
     "typescript": "*"
   },
   "peerDependencies": {
-    "oceanic.js": ">=1.12.x"
+    "oceanic.js": ">=1.13.x"
   },
   "scripts": {
     "prebuild": "pnpm --filter @discordanalytics/core build",