izebra_projects/Rixa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix update (fail)

Browse Source
This commit is contained in:
Savvy 2017-09-29 23:58:44 -04:00
parent 4ff2163b49
commit c2b013b4f5
5 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -38,4 +38,4 @@ compileJava.options.encoding = 'UTF-8'
compileJava.options.fork = true
// Change this if you are getting errors building
compileJava.options.forkOptions.executable = 'C:\\Program Files\\Java\\jdk1.8.0_131\\bin\\javac.exe'
compileJava.options.forkOptions.executable = 'C:\\Program Files\\Java\\jdk1.8.0_144\\bin\\javac.exe'

8
src/main/java/me/majrly/database/Database.java
View File

@ -5,6 +5,7 @@ import com.zaxxer.hikari.HikariDataSource;
import me.majrly.database.params.Parameter;
import me.majrly.database.statements.Query;
import me.majrly.database.statements.Statement;
import me.savvy.rixa.Rixa;
import java.sql.*;
import java.util.Map;
@ -113,7 +114,12 @@ public class Database {
*/
public Optional<PreparedStatement> prepare(Statement statement) {
try {
PreparedStatement preparedStatement = getConnection().get().prepareStatement(statement.getSQL());
Optional<Connection> optional = getConnection();
if (!optional.isPresent()) {
Rixa.getInstance().getLogger().severe("Could not find connection, GuildSettings:117");
return Optional.empty();
}
PreparedStatement preparedStatement = optional.get().prepareStatement(statement.getSQL());
for (Map.Entry<Integer, Parameter> parameter : statement.getParameters().entrySet()) {
switch (parameter.getValue().getType()) {
case STRING:

4
src/main/java/me/savvy/rixa/Rixa.java
View File

@ -111,7 +111,6 @@ public class Rixa {
try {
int shards = 5;
for (int i = 0; i < shards; i++) {
Thread.sleep(5000);
Logger.getLogger("Rixa").info("Loading shard #" + i);
JDABuilder jda = new JDABuilder(AccountType.BOT)
.setToken(config.getJsonObject().getString("secretToken"))
@ -128,12 +127,13 @@ public class Rixa {
.useSharding(i, shards);
shardsList.add(jda.buildBlocking());
getInstance().getLogger().info("Shard #" + i + " has been loaded");
Thread.sleep(5000);
}
} catch (LoginException | InterruptedException | RateLimitedException e) {
e.printStackTrace();
}
Guilds.getGuilds().values().parallelStream().forEach((rixaGuild) -> rixaGuild.load());
//Guilds.getGuilds().values().parallelStream().forEach((rixaGuild) -> rixaGuild.load());
timeUp = System.currentTimeMillis();
register(new InfoCommand(), new ServerInfoCommand(), new HelpCommand(),

18
src/main/java/me/savvy/rixa/guild/RixaGuild.java
View File

@ -71,15 +71,18 @@ public class RixaGuild {
Result r = Result.ERROR;
try {
Query query = new Query("SELECT `guild_name` FROM `core` WHERE `guild_id` = '" + guild.getId() + "';");
Query query = new Query("SELECT `guild_name` FROM `core` WHERE `guild_id` = ?;");
query.setString(guild.getId());
Optional<?> optional = db.send(query);
if (!optional.isPresent() || !(optional.get() instanceof ResultSet)) {
r = Result.ERROR;
} else {
r = Result.SUCCESS;
}
if (r != Result.ERROR) {
if (!optional.isPresent()) {
if (!(optional.get() instanceof ResultSet)) {
Rixa.getInstance().getLogger().severe("Could not find " + guild.getName() + " in settings it wasn't an instance of result set!, GuildSettings:75");
return false;
}
Rixa.getInstance().getLogger().severe("Could not find " + guild.getName() + ", GuildSettings:75");
return false;
}
ResultSet set = (ResultSet) optional.get();
if (set.next()) {
r = Result.TRUE;
@ -87,7 +90,6 @@ public class RixaGuild {
r = Result.FALSE;
}
set.close();
}
} catch (SQLException e) {
e.printStackTrace();
}

17
src/main/java/me/savvy/rixa/guild/management/GuildSettings.java
View File

@ -92,20 +92,25 @@ public class GuildSettings {
}
private boolean checkExists() {
Result r = Result.FALSE;
Result r;
try {
Query query = new Query("SELECT `guild_id` FROM `settings` WHERE `guild_id` = '" + guild.getId() + "'");
Query query = new Query("SELECT `guild_id` FROM `settings` WHERE `guild_id` = ?");
query.setString(guild.getId());
Optional<?> optional = Rixa.getDatabase().send(query);
if (!optional.isPresent()) r = Result.ERROR;
if (!(optional.get() instanceof ResultSet)) r = Result.ERROR;
if (!optional.isPresent()) {
if (!(optional.get() instanceof ResultSet)) {
Rixa.getInstance().getLogger().severe("Could not find " + guild.getName() + " in settings it wasn't an instance of result set!, GuildSettings:97");
return false;
}
Rixa.getInstance().getLogger().severe("Could not find " + guild.getName() + ", GuildSettings:99");
return false;
}
ResultSet set = (ResultSet) optional.get();
if (r != Result.ERROR) {
if (set.next()) {
r = Result.TRUE;
} else {
r = Result.FALSE;
}
}
set.close();
return r == Result.TRUE;
} catch (SQLException e) {