Skip to content

Commit

Permalink
v1.7.3
Browse files Browse the repository at this point in the history
= Fixed Issue with Null-pointer on the Server Command.
= Fixed Issue with deleting all the Data of Guilds that kicked the Bot.
  • Loading branch information
DxsSucuk committed Apr 13, 2022
1 parent 2c7a506 commit e72a55e
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>de.presti</groupId>
<artifactId>Ree6</artifactId>
<version>1.7.2</version>
<version>1.7.3</version>
<packaging>jar</packaging>
<name>Ree6</name>
<description>Ree6 is an open-Source Discord Bot.</description>
Expand Down Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
<version>1.41.5</version>
<version>1.41.6</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand All @@ -111,7 +111,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-jetty</artifactId>
<version>1.33.1</version>
<version>1.33.2</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
Expand All @@ -126,7 +126,7 @@
<dependency>
<groupId>se.michaelthelin.spotify</groupId>
<artifactId>spotify-web-api-java</artifactId>
<version>7.0.0</version>
<version>7.0.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -233,7 +233,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.3</version>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>com.github.DxsSucuk</groupId>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/presti/ree6/commands/CommandManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public class CommandManager {
* Constructor for the Command-Manager used to register every Command.
*/
public CommandManager() throws CommandInitializerException {
Main.getInstance().getLogger().info("Initializing Commands!");

//Informative
addCommand(new Help());
addCommand(new Support());
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/de/presti/ree6/commands/impl/info/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.interactions.commands.build.CommandData;

import java.time.format.DateTimeFormatter;
Expand All @@ -23,13 +24,15 @@ public void onPerform(CommandEvent commandEvent) {
EmbedBuilder em = new EmbedBuilder();
em.setColor(BotWorker.randomEmbedColor());

Member owner = commandEvent.getGuild().getOwner();

em.setAuthor(commandEvent.getGuild().getName(), null, commandEvent.getGuild().getIconUrl());
em.addField(":id: **Server-ID**", commandEvent.getGuild().getId(), true);
em.addField(":calendar: **Creation Date**", commandEvent.getGuild().getTimeCreated().format(DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")), true);
em.addField(":crown: **Owner**", commandEvent.getGuild().getOwner().getAsMention(), true);
em.addField(":crown: **Owner**", owner != null ? owner.getAsMention() : "None existing.", true);
em.addField(":busts_in_silhouette: **Members (" + commandEvent.getGuild().getMemberCount() + ")**", "**" + (commandEvent.getGuild().getMemberCount() - (commandEvent.getGuild().getMembers().stream().filter(member -> !member.getUser().isBot())).count()) + "** User\n**" + commandEvent.getGuild().getBoostCount() + "** Boosts :sparkles:", true);
em.addField(":speech_balloon: **Channels (" + (commandEvent.getGuild().getChannels().stream().filter(channel -> channel.getType().equals(ChannelType.TEXT)).count() + commandEvent.getGuild().getChannels().stream().filter(channel -> channel.getType().equals(ChannelType.VOICE)).count()) + ")**", "**" + commandEvent.getGuild().getChannels().stream().filter(channel -> channel.getType().equals(ChannelType.TEXT)).count() + "** Text | **" + commandEvent.getGuild().getChannels().stream().filter(channel -> channel.getType().equals(ChannelType.VOICE)).count() + "** Voicechannel", true);
em.addField(":earth_africa: **Other**", "**Verificationlevel:** " + commandEvent.getGuild().getVerificationLevel().getKey(), true);
em.addField(":earth_africa: **Other**", "**Verification-level:** " + commandEvent.getGuild().getVerificationLevel().getKey(), true);
em.setFooter(commandEvent.getGuild().getName() + " - " + Data.ADVERTISEMENT, commandEvent.getGuild().getIconUrl());

Main.getInstance().getCommandManager().sendMessage(em, commandEvent.getTextChannel(), commandEvent.getInteractionHook());
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/presti/ree6/logger/events/LoggerQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ else if (loggerMessage.getType() == LoggerMessage.LogTyp.MEMBERROLE_CHANGE) {
}
}

if (memberData != null && memberData.getAddedRoles() != null && !memberData.getAddedRoles().isEmpty() && memberData.getAddedRoles().stream().anyMatch(role -> role != null && loggerMessage.getMemberData().getAddedRoles().contains(role) &&
!loggerMessage.getMemberData().getRemovedRoles().contains(role))) {
if (memberData != null && memberData.getAddedRoles() != null && !memberData.getAddedRoles().isEmpty() && memberData.getAddedRoles().stream().anyMatch(role -> role != null && !loggerMessage.getMemberData().getAddedRoles().contains(role) &&
loggerMessage.getMemberData().getRemovedRoles().contains(role))) {
try {
memberData.getAddedRoles().stream().filter(role -> role != null && !loggerMessage.getMemberData().getAddedRoles().contains(role) &&
!loggerMessage.getMemberData().getRemovedRoles().contains(role)).forEach(role -> loggerMessage.getMemberData().getAddedRoles().add(role));
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/de/presti/ree6/main/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,11 @@ public static void main(String[] args) {
// Create a RayGun Client to send Exception to an external Service for Bug fixing.
Thread.setDefaultUncaughtExceptionHandler((t, e) -> new RaygunClient(instance.config.getConfiguration().getString("raygun.apitoken")).send(e));

instance.logger.info("Connecting to SQl.");

// Create a new connection between the Application and the SQL-Server.
instance.sqlConnector = new SQLConnector(instance.config.getConfiguration().getString("mysql.user"),
instance.config.getConfiguration().getString("mysql.db"), instance.config.getConfiguration().getString("mysql.pw"),
instance.config.getConfiguration().getString("mysql.host"), instance.config.getConfiguration().getInt("mysql.port"));

instance.logger.info("Initializing Commands!");

try {
// Create the Command-Manager instance.
instance.commandManager = new CommandManager();
Expand All @@ -130,7 +126,7 @@ public static void main(String[] args) {

// Create a new Instance of the Bot, as well as add the Events.
try {
BotWorker.createBot(BotVersion.PUBLIC, "1.7.2");
BotWorker.createBot(BotVersion.PUBLIC, "1.7.3");
instance.musicWorker = new MusicWorker();
instance.addEvents();
} catch (Exception ex) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/presti/ree6/sql/SQLConnector.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public SQLConnector(String databaseUser, String databaseName, String databasePas
* Try to open a connection to the SQL Server with the given data.
*/
public void connectToSQLServer() {

Main.getInstance().getLogger().info("Connecting to SQl.");
// Check if there is already an open Connection.
if (IsConnected()) {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/presti/ree6/sql/SQLWorker.java
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@ public void addStats(String guildId, String command) {
*/
public void deleteAllData(String guildId) {
// Go through every Table. And delete every entry with the Guild ID.
sqlConnector.getTables().forEach((s, s2) -> querySQL("DELETE FROM ? WHERE GID= ?", s, guildId));
sqlConnector.getTables().forEach((s, s2) -> querySQL("DELETE FROM '" + s + "' WHERE GID= ?", guildId));
}

//endregion
Expand Down

0 comments on commit e72a55e

Please sign in to comment.