Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 263b331

Browse files
greg6775greg6775
authored
Merge pull request #78 from BigBotNetwork/Greg
Greg
2 parents 90af475 + ea7e091 commit 263b331

26 files changed

+484
-712
lines changed

‎.idea/workspace.xml

Lines changed: 286 additions & 500 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GBideen.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
GottBotReloaded ideen
2+
3+
- 1 Handler mit Owner überprüfung, Language Handler, Menu handler, MySQL Handler, (commandHandler?), usw
4+
- Better language integration/Handler
5+
- Sharding?
6+
- commandRegisterHandler damit man nicht so viele zeilen nur für commandRegistering braucht
7+
- games

‎GottBotReloaded.iml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
<orderEntry type="inheritedJdk" />
1212
<orderEntry type="sourceFolder" forTests="false" />
1313
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_351" level="project" />
14-
<orderEntry type="library" name="Maven: com.github.ForYaSee:HttpRequest:1.1.0" level="project" />
15-
<orderEntry type="library" name="Maven: com.github.DiscordBotList:DBL-Java-Wrapper:v1.0" level="project" />
16-
<orderEntry type="library" name="Maven: com.squareup.retrofit2:converter-gson:2.3.0" level="project" />
17-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
18-
<orderEntry type="library" name="Maven: com.squareup.retrofit2:retrofit:2.3.0" level="project" />
14+
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_353" level="project" />
1915
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.8.0-beta2" level="project" />
2016
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.8.0-beta2" level="project" />
2117
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
@@ -27,11 +23,11 @@
2723
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.2" level="project" />
2824
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
2925
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.9-rc" level="project" />
30-
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
3126
<orderEntry type="library" name="Maven: com.google.code.scriptengines:scriptengines-javascript:1.1.1" level="project" />
3227
<orderEntry type="library" name="Maven: org.livetribe:livetribe-jsr223:2.0.3" level="project" />
3328
<orderEntry type="library" name="Maven: rhino:js:1.7R1" level="project" />
34-
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.5.1_353" level="project" />
29+
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
30+
<orderEntry type="library" name="Maven: net.dv8tion:JDA:3.6.0_354" level="project" />
3531
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
3632
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
3733
<orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
@@ -44,5 +40,6 @@
4440
<orderEntry type="library" name="Maven: com.squareup.retrofit2:converter-gson:2.3.0" level="project" />
4541
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
4642
<orderEntry type="library" name="Maven: com.squareup.retrofit2:retrofit:2.3.0" level="project" />
43+
<orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
4744
</component>
4845
</module>

‎src/META-INF/MANIFEST.MF

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Manifest-Version: 1.0
2+
Main-Class: core.Main
3+

‎src/main/java/commands/botowner/CommandBlacklist.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
1010
import util.Embed;
1111

12+
import java.awt.*;
1213
import java.util.List;
1314

1415
public class CommandBlacklist implements Command {

‎src/main/java/commands/botowner/CommandGuild.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ public void action(String[] args, MessageReceivedEvent event) {
4242
public void executed(boolean success, MessageReceivedEvent event) {
4343

4444
}
45+
}
46+
4547

46-
}

‎src/main/java/commands/botowner/CommandRegisterServer.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import commands.Command;
44
import core.MySQL;
5-
import net.dv8tion.jda.core.MessageBuilder;
65
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
76
import org.slf4j.Logger;
87
import org.slf4j.LoggerFactory;
9-
import util.Embed;
108

119
public class CommandRegisterServer implements Command {
1210
private static Logger logger = LoggerFactory.getLogger(CommandRegisterServer.class);
@@ -18,16 +16,19 @@ public boolean called(String[] args, MessageReceivedEvent event) {
1816
@Override
1917
public void action(String[] args, MessageReceivedEvent event) {
2018
if (Owner.get(event.getAuthor())) {
21-
int i = 0;
22-
while (event.getJDA().getGuilds().size()-1>=i) {
23-
if (MySQL.get("server", "id", event.getJDA().getGuilds().get(i).getId(), "id")==null) {
24-
MySQL.insert("server", "id", event.getJDA().getGuilds().get(i).getId()+"");
25-
MySQL.insert("log", "serverid", event.getJDA().getGuilds().get(i).getId() + "");
26-
logger.info("neuer Server in database Name: " + event.getJDA().getGuilds().get(i).getName() + " ID: " + event.getJDA().getGuilds().get(i).getId());
27-
event.getTextChannel().sendMessage(Embed.success("Registered", "Succesfully registered server!").build()).queue();
19+
Thread t = new Thread(() -> {
20+
int i = 0;
21+
while (event.getJDA().getGuilds().size() - 1 >= i) {
22+
if (MySQL.get("server", "id", event.getJDA().getGuilds().get(i).getId(), "id") == null) {
23+
MySQL.insert("server", "id", event.getJDA().getGuilds().get(i).getId() + "");
24+
logger.info("neuer Server in database Name: " + event.getJDA().getGuilds().get(i).getName() + " ID: " + event.getJDA().getGuilds().get(i).getId());
25+
}
26+
i++;
2827
}
29-
i++;
30-
}
28+
event.getTextChannel().sendMessage("Succesfully registered " + i + " server").queue();
29+
});
30+
t.setName("registerserver");
31+
t.start();
3132
}
3233
}
3334

‎src/main/java/commands/botowner/CommandRegisterUser.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ public boolean called(String[] args, MessageReceivedEvent event) {
1616
@Override
1717
public void action(String[] args, MessageReceivedEvent event) {
1818
if (Owner.get(event.getAuthor())) {
19-
int i = 0;
20-
while (event.getGuild().getMembers().size()-1>=i) {
21-
if (MySQL.get("user", "id", event.getGuild().getMembers().get(i).getUser().getId(), "id")==null) {
22-
MySQL.insert("user", "id", event.getGuild().getMembers().get(i).getUser().getId()+"");
23-
logger.info("neuer User in database Name: " + event.getGuild().getMembers().get(i).getUser().getName() + " ID: " + event.getGuild().getMembers().get(i).getUser().getId() + " von " + event.getGuild().getName());
19+
Thread t = new Thread(() -> {
20+
int i = 0;
21+
while (event.getGuild().getMembers().size() - 1 >= i) {
22+
if (MySQL.get("user", "id", event.getGuild().getMembers().get(i).getUser().getId(), "id") == null) {
23+
MySQL.insert("user", "id", event.getGuild().getMembers().get(i).getUser().getId() + "");
24+
logger.info("neuer User in database Name: " + event.getGuild().getMembers().get(i).getUser().getName() + " ID: " + event.getGuild().getMembers().get(i).getUser().getId() + " von " + event.getGuild().getName());
25+
}
26+
i++;
2427
}
25-
i++;
26-
}
28+
event.getTextChannel().sendMessage("Succesfully registered "+i+" user").queue();
29+
});
30+
t.setName("registeruser");
31+
t.start();
2732
}
2833
}
2934

‎src/main/java/commands/botowner/CommandRestart.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/main/java/commands/botowner/CommandStop.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package commands.botowner;
22

33
import commands.Command;
4-
import core.MessageHandler;
4+
import core.Main;
55
import net.dv8tion.jda.core.EmbedBuilder;
6-
import net.dv8tion.jda.core.MessageBuilder;
76
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
8-
import util.Embed;
97

108
public class CommandStop implements Command {
119

@@ -18,8 +16,7 @@ public boolean called(String[] args, MessageReceivedEvent event) {
1816
public void action(String[] args, MessageReceivedEvent event) {
1917
if (Owner.get(event.getAuthor())) {
2018
event.getMessage().getTextChannel().sendMessage(new EmbedBuilder().setDescription(":white_check_mark: Bot herruntergefahren :white_check_mark: ").build()).queue();
21-
event.getTextChannel().sendMessage(Embed.success("", ":white_check_mark: Bot herruntergefahren :white_check_mark: ").build()).queue();
22-
System.exit(0);
19+
Main.jda.shutdown();
2320
}
2421
}
2522

0 commit comments

Comments
 (0)