0.0.3

Author: ValDesign22

src/main/java/xyz/discordanalytics/D4JAnalytics.java

@@ -17,34 +17,21 @@
 public class D4JAnalytics extends AnalyticsBase {
     private final DiscordClient client;
 
-    private Number guildCount;
-    private Number userCount;
-    private ArrayList<String> guildsLocales;
-    private ArrayList<String> locales;
-    private ArrayList<String> interactions;
-
     public D4JAnalytics(DiscordClient client, EventsTracker eventsToTrack, String apiKey) {
         super(eventsToTrack, apiKey);
         this.client = client;
         this.baseAPIUrl = ApiEndpoints.BASE_URL + ApiEndpoints.BOT_STATS.replace("[id]", Objects.requireNonNull(Objects.requireNonNull(client.getSelf().block()).id().asString()));
 
         String[] date = new Date().toString().split(" ");
-        String dateString = date[5] + "-" + monthToNumber(date[1]) + "-" + date[2];
 
         this.setData(new HashMap<>() {{
-            put("date", dateString);
+            put("date", date[5] + "-" + monthToNumber(date[1]) + "-" + date[2]);
             put("guilds", client.getGuilds().count().block());
             put("users", client.getGuilds().flatMap(guild -> client.getGuildById(Snowflake.of(guild.id())).getMembers().count()).reduce(0L, Long::sum).block());
             put("interactions", new ArrayList<>());
             put("locales", new ArrayList<>());
             put("guildsLocales", new ArrayList<>());
         }});
-
-        this.guildCount = (Number) getData().get("guilds");
-        this.userCount = (Number) getData().get("users");
-        this.guildsLocales = (ArrayList<String>) getData().get("guildsLocales");
-        this.locales = (ArrayList<String>) getData().get("locales");
-        this.interactions = (ArrayList<String>) getData().get("interactions");
     }
 
     private boolean isInvalidClient() {
@@ -73,6 +60,12 @@ public void trackEvents() throws IOException, InterruptedException {
         client.withGateway((GatewayDiscordClient gateway) -> {
             if (eventsToTrack.trackInteractions) {
                 gateway.on(InteractionCreateEvent.class, event -> {
+                    Number guildCount = eventsToTrack.trackGuilds ? client.getGuilds().count().block() : null;
+                    Number userCount = eventsToTrack.trackUserCount ? client.getGuilds().flatMap(guild -> client.getGuildById(Snowflake.of(guild.id())).getMembers().count()).reduce(0L, Long::sum).block() : null;
+                    ArrayList<String> guildsLocales = (ArrayList<String>) getData().get("guildsLocales");
+                    ArrayList<String> locales = (ArrayList<String>) getData().get("locales");
+                    ArrayList<String> interactions = (ArrayList<String>) getData().get("interactions");
+
                     String[] date = new Date().toString().split(" ");
                     String dateString = date[5] + "-" + monthToNumber(date[1]) + "-" + date[2];
 
@@ -134,8 +127,8 @@ public void trackEvents() throws IOException, InterruptedException {
                         put("guilds", guildCount);
                         put("users", userCount);
                         put("interactions", interactions);
-                        put("locales", locales);
-                        put("guildsLocales", guildsLocales);
+                        put("locales", eventsToTrack.trackUserLanguage ? locales : new ArrayList<>());
+                        put("guildsLocales", eventsToTrack.trackGuildsLocale ? guildsLocales : new ArrayList<>());
                     }});
 
                     return Mono.empty();

src/main/java/xyz/discordanalytics/JDAAnalytics.java

@@ -22,8 +22,11 @@ public JDAAnalytics(JDA jda, EventsTracker eventsToTrack, String apiKey) {
         super(eventsToTrack, apiKey);
         this.client = jda;
         this.baseAPIUrl = ApiEndpoints.BASE_URL + ApiEndpoints.BOT_STATS.replace("[id]", client.getSelfUser().getId());
+
+        String[] date = new Date().toString().split(" ");
+
         this.setData(new HashMap<>() {{
-            put("date", new Date().toString());
+            put("date", date[5] + "-" + monthToNumber(date[1]) + "-" + date[2]);
             put("guilds", client.getGuilds().size());
             put("users", client.getUsers().size());
             put("interactions", new ArrayList<>());

src/main/java/xyz/discordanalytics/JavacordAnalytics.java

@@ -19,8 +19,11 @@ public JavacordAnalytics(DiscordApi api, EventsTracker eventsToTrack, String api
         super(eventsToTrack, apiKey);
         this.client = api;
         this.baseAPIUrl = ApiEndpoints.BASE_URL + ApiEndpoints.BOT_STATS.replace("[id]", client.getYourself().getIdAsString());
+
+        String[] date = new Date().toString().split(" ");
+
         this.setData(new HashMap<>() {{
-            put("date", new Date().toString());
+            put("date", date[5] + "-" + monthToNumber(date[1]) + "-" + date[2]);
             put("guilds", client.getServers().size());
             put("users", client.getCachedUsers().size());
             put("interactions", new ArrayList<>());
@@ -126,8 +129,8 @@ public void trackEvents() throws IOException, InterruptedException {
                         put("guilds", guildCount);
                         put("users", userCount);
                         put("interactions", interactions);
-                        put("locales", locales);
-                        put("guildsLocales", guildsLocales);
+                        put("locales", eventsToTrack.trackUserLanguage ? locales : new ArrayList<>());
+                        put("guildsLocales", eventsToTrack.trackGuildsLocale ? guildsLocales : new ArrayList<>());
                     }});
                 } catch (Exception e) {
                     e.printStackTrace();

src/main/java/xyz/discordanalytics/jda/InteractionTrackerListener.java

@@ -101,8 +101,8 @@ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent ev
                 put("guilds", guildCount);
                 put("users", userCount);
                 put("interactions", interactions);
-                put("locales", locales);
-                put("guildsLocales", guildsLocales);
+                put("locales", analytics.getEventsToTrack().trackUserLanguage ? locales : new ArrayList<>());
+                put("guildsLocales", analytics.getEventsToTrack().trackGuildsLocale ? guildsLocales : new ArrayList<>());
             }});
         } catch (Exception e) {
             e.printStackTrace();