Skip to content

Commit 8de0568

Browse files
ValDesign22ValDesign22
committed
0.0.4-beta.1
1 parent 82c6d6b commit 8de0568

File tree

12 files changed

+363
-250
lines changed

12 files changed

+363
-250
lines changed

‎README.md‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Compatibility
44

5-
The package is compatible with Discord4J version 3.2.4 or higher,
5+
The package is compatible with Discord4J version 3.2.6 or higher,
66
Javacord version 3.8.0 or higher,
77
and JDA version 5.0.0-beta.8 or higher.
88

@@ -45,7 +45,6 @@ import discord4j.core.GatewayDiscordClient;
4545
import discord4j.core.event.domain.lifecycle.ReadyEvent;
4646
import discord4j.core.object.entity.User;
4747
import xyz.discordanalytics.D4JAnalytics;
48-
import xyz.discordanalytics.utilities.EventsTracker;
4948
import reactor.core.publisher.Mono;
5049

5150
import java.io.IOException;
@@ -61,19 +60,11 @@ public class ExampleWithD4J {
6160
gateway.on(ReadyEvent.class, event ->
6261
Mono.fromRunnable(() -> {
6362
final User self = event.getSelf();
64-
System.out.printf("Logged in as %s#%s%n", self.getUsername(), self.getDiscriminator());
65-
66-
// Initialize what you want to track
67-
EventsTracker eventsTracker = new EventsTracker();
68-
eventsTracker.trackInteractions = true;
69-
eventsTracker.trackGuilds = true;
70-
eventsTracker.trackUserCount = true;
71-
eventsTracker.trackUserLanguage = true;
72-
eventsTracker.trackGuildsLocale = true;
63+
System.out.printf("Logged in as %s%n", self.getUsername());
7364

7465
// Initialize the DiscordAnalytics class
7566
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
76-
D4JAnalytics analytics = new D4JAnalytics(client, eventsTracker, "YOUR_API_KEY");
67+
D4JAnalytics analytics = new D4JAnalytics(client, "YOUR_API_KEY");
7768
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
7869
try {
7970
analytics.trackEvents();
@@ -95,7 +86,6 @@ public class ExampleWithD4J {
9586
package example;
9687

9788
import xyz.discordanalytics.JavacordAnalytics;
98-
import xyz.discordanalytics.utilities.EventsTracker;
9989
import org.javacord.api.DiscordApi;
10090
import org.javacord.api.DiscordApiBuilder;
10191
import org.javacord.api.entity.intent.Intent;
@@ -111,17 +101,9 @@ public class ExampleWithJavacord {
111101
.addIntents(Intent.MESSAGE_CONTENT)
112102
.login().join();
113103

114-
// Initialize what you want to track
115-
EventsTracker eventsTracker = new EventsTracker();
116-
eventsTracker.trackInteractions = true;
117-
eventsTracker.trackGuilds = true;
118-
eventsTracker.trackUserCount = true;
119-
eventsTracker.trackUserLanguage = true;
120-
eventsTracker.trackGuildsLocale = true;
121-
122104
// Initialize the DiscordAnalytics class
123105
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
124-
JavacordAnalytics analytics = new JavacordAnalytics(api, eventsTracker, "YOUR_API_KEY");
106+
JavacordAnalytics analytics = new JavacordAnalytics(api, "YOUR_API_KEY");
125107
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
126108
try {
127109
analytics.trackEvents();
@@ -161,7 +143,6 @@ package example.jda;
161143
import discord4j.core.event.domain.lifecycle.ReadyEvent;
162144
import discord4j.core.object.entity.User;
163145
import xyz.discordanalytics.JDAAnalytics;
164-
import xyz.discordanalytics.utilities.EventsTracker;
165146
import net.dv8tion.jda.api.events.GenericEvent;
166147
import net.dv8tion.jda.api.hooks.EventListener;
167148
import org.jetbrains.annotations.NotNull;
@@ -173,19 +154,11 @@ public class ReadyListener implements EventListener {
173154
public void onEvent(@NotNull GenericEvent genericEvent) {
174155
if (genericEvent instanceof ReadyEvent) {
175156
final User self = ((ReadyEvent) genericEvent).getSelf();
176-
System.out.printf("Logged in as %s#%s%n", self.getUsername(), self.getDiscriminator());
177-
178-
// Initialize what you want to track
179-
EventsTracker eventsTracker = new EventsTracker();
180-
eventsTracker.trackInteractions = true;
181-
eventsTracker.trackGuilds = true;
182-
eventsTracker.trackUserCount = true;
183-
eventsTracker.trackUserLanguage = true;
184-
eventsTracker.trackGuildsLocale = true;
157+
System.out.printf("Logged in as %s%n", self.getUsername());
185158

186159
// Initialize the DiscordAnalytics class
187160
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
188-
JDAAnalytics analytics = new JDAAnalytics(genericEvent.getJDA(), eventsTracker, "YOUR_API_KEY");
161+
JDAAnalytics analytics = new JDAAnalytics(genericEvent.getJDA(), "YOUR_API_KEY");
189162
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
190163
try {
191164
analytics.trackEvents();

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>xyz.discordanalytics</groupId>
88
<artifactId>discord-analytics</artifactId>
99
<packaging>jar</packaging>
10-
<version>0.0.3</version>
10+
<version>0.0.4-beta.1</version>
1111

1212
<name>Discord Analytics</name>
1313
<description>The Discord Analytics package for java discord frameworks</description>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.discord4j</groupId>
3333
<artifactId>discord4j-core</artifactId>
34-
<version>3.2.4</version>
34+
<version>3.2.6</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.javacord</groupId>

‎src/main/java/example/d4j/ExampleWithD4J.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import discord4j.core.event.domain.lifecycle.ReadyEvent;
66
import discord4j.core.object.entity.User;
77
import xyz.discordanalytics.D4JAnalytics;
8-
import xyz.discordanalytics.utilities.EventsTracker;
98
import reactor.core.publisher.Mono;
109

1110
import java.io.IOException;
@@ -23,17 +22,9 @@ public static void main(String[] args) {
2322
final User self = event.getSelf();
2423
System.out.printf("Logged in as %s%n", self.getUsername());
2524

26-
// Initialize what you want to track
27-
EventsTracker eventsTracker = new EventsTracker();
28-
eventsTracker.trackInteractions = true;
29-
eventsTracker.trackGuilds = true;
30-
eventsTracker.trackUserCount = true;
31-
eventsTracker.trackUserLanguage = true;
32-
eventsTracker.trackGuildsLocale = true;
33-
3425
// Initialize the DiscordAnalytics class
3526
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
36-
D4JAnalytics analytics = new D4JAnalytics(client, eventsTracker, "YOUR_API_KEY");
27+
D4JAnalytics analytics = new D4JAnalytics(client, "YOUR_API_KEY");
3728
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
3829
try {
3930
analytics.trackEvents();

‎src/main/java/example/javacord/ExampleWithJavacord.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package example.javacord;
22

33
import xyz.discordanalytics.JavacordAnalytics;
4-
import xyz.discordanalytics.utilities.EventsTracker;
54
import org.javacord.api.DiscordApi;
65
import org.javacord.api.DiscordApiBuilder;
76
import org.javacord.api.entity.intent.Intent;
@@ -17,17 +16,9 @@ public static void main(String[] args) {
1716
.addIntents(Intent.MESSAGE_CONTENT)
1817
.login().join();
1918

20-
// Initialize what you want to track
21-
EventsTracker eventsTracker = new EventsTracker();
22-
eventsTracker.trackInteractions = true;
23-
eventsTracker.trackGuilds = true;
24-
eventsTracker.trackUserCount = true;
25-
eventsTracker.trackUserLanguage = true;
26-
eventsTracker.trackGuildsLocale = true;
27-
2819
// Initialize the DiscordAnalytics class
2920
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
30-
JavacordAnalytics analytics = new JavacordAnalytics(api, eventsTracker, "YOUR_API_KEY");
21+
JavacordAnalytics analytics = new JavacordAnalytics(api, "YOUR_API_KEY");
3122
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
3223
try {
3324
analytics.trackEvents();

‎src/main/java/example/jda/ReadyListener.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import net.dv8tion.jda.api.entities.User;
44
import net.dv8tion.jda.api.events.session.ReadyEvent;
55
import xyz.discordanalytics.JDAAnalytics;
6-
import xyz.discordanalytics.utilities.EventsTracker;
76
import net.dv8tion.jda.api.events.GenericEvent;
87
import net.dv8tion.jda.api.hooks.EventListener;
98
import org.jetbrains.annotations.NotNull;
@@ -17,17 +16,9 @@ public void onEvent(@NotNull GenericEvent genericEvent) {
1716
final User self = genericEvent.getJDA().getSelfUser();
1817
System.out.printf("Logged in as %s%n", self.getName());
1918

20-
// Initialize what you want to track
21-
EventsTracker eventsTracker = new EventsTracker();
22-
eventsTracker.trackInteractions = true;
23-
eventsTracker.trackGuilds = true;
24-
eventsTracker.trackUserCount = true;
25-
eventsTracker.trackUserLanguage = true;
26-
eventsTracker.trackGuildsLocale = true;
27-
2819
// Initialize the DiscordAnalytics class
2920
// Don't forget to replace YOUR_API_TOKEN by your Discord Analytics token !
30-
JDAAnalytics analytics = new JDAAnalytics(genericEvent.getJDA(), eventsTracker, "YOUR_API_KEY");
21+
JDAAnalytics analytics = new JDAAnalytics(genericEvent.getJDA(), "YOUR_API_KEY");
3122
// Start the tracking, it will be done every 10 minutes to avoid spamming the API
3223
try {
3324
analytics.trackEvents();

‎src/main/java/xyz/discordanalytics/AnalyticsBase.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@
1414
import java.util.HashMap;
1515

1616
public class AnalyticsBase {
17-
protected final EventsTracker eventsToTrack;
1817
protected final String apiKey;
1918
protected final HttpClient httpClient;
2019
protected HashMap<String, Object> dataToSend;
2120
protected String baseAPIUrl;
2221

23-
public AnalyticsBase(EventsTracker eventsToTrack, String apiKey) {
24-
this.eventsToTrack = eventsToTrack;
22+
public AnalyticsBase(String apiKey) {
2523
this.apiKey = apiKey;
2624
this.httpClient = HttpClient.newHttpClient();
2725

@@ -53,14 +51,8 @@ public LocalesItems parseStringToLocalesItems(String string) {
5351

5452
protected boolean isConfigInvalid(String username, String avatar, String id, String libType) throws IOException, InterruptedException {
5553
HashMap<String, Object> data = new HashMap<>() {{
56-
put("settings", new HashMap<>() {{
57-
put("trackGuilds", eventsToTrack.trackGuilds);
58-
put("trackGuildsLocale", eventsToTrack.trackGuildsLocale);
59-
put("trackInteractions", eventsToTrack.trackInteractions);
60-
put("trackUserCount", eventsToTrack.trackUserCount);
61-
put("trackUserLanguage", eventsToTrack.trackUserLanguage);
62-
}});
6354
put("framework", libType);
55+
put("version", AnalyticsBase.class.getPackage().getImplementationVersion());
6456
put("username", username);
6557
put("avatar", avatar);
6658
}};
@@ -91,10 +83,6 @@ protected boolean isConfigInvalid(String username, String avatar, String id, Str
9183
return response.statusCode() != 200;
9284
}
9385

94-
public EventsTracker getEventsToTrack() {
95-
return eventsToTrack;
96-
}
97-
9886
public HttpResponse<String> post(String data) throws IOException, InterruptedException {
9987
HttpRequest request = HttpRequest.newBuilder()
10088
.uri(URI.create(baseAPIUrl))

0 commit comments

Comments
 (0)