mirrors/untisbot-discord
1
0
Fork 0
mirror of https://github.com/bytedream/untisbot-discord.git synced 2025-05-09 20:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Database bugfix

Browse Source
This commit is contained in:
ByteDream 2020-12-05 01:40:15 +01:00
parent c2f0e41e71
commit ebc9ede60e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/bytedream/untisbot/data/DataConnector.java
View File

@ -192,7 +192,7 @@ public class DataConnector {
args.put("LANGUAGE", language); args.put("LANGUAGE", language);
if (username != null) { if (username != null) {
if (username.isEmpty()) { if (username.isEmpty()) {
args.put("USERNAME", "NULL"); args.put("USERNAME", "");
} else { } else {
try { try {
args.put("USERNAME", crypt.encrypt(username)); args.put("USERNAME", crypt.encrypt(username));
@ -205,12 +205,12 @@ public class DataConnector {
} }
if (password != null) { if (password != null) {
if (password.isEmpty()) { if (password.isEmpty()) {
args.put("PASSWORD", "NULL"); args.put("PASSWORD", "");
} else { } else {
try { try {
args.put("PASSWORD", crypt.encrypt(password)); args.put("PASSWORD", crypt.encrypt(password));
} catch (GeneralSecurityException ignore) { } catch (GeneralSecurityException ignore) {
args.put("PASSWORD", null); args.put("PASSWORD", "");
} }
} }
} else { } else {
@ -218,7 +218,7 @@ public class DataConnector {
} }
if (server != null) { if (server != null) {
if (server.isEmpty()) { if (server.isEmpty()) {
args.put("SERVER", "NULL"); args.put("SERVER", "");
} else { } else {
args.put("SERVER", server); args.put("SERVER", server);
} }
@ -227,7 +227,7 @@ public class DataConnector {
} }
if (school != null) { if (school != null) {
if (school.isEmpty()) { if (school.isEmpty()) {
args.put("SCHOOL", "NULL"); args.put("SCHOOL", "");
} else { } else {
args.put("SCHOOL", school); args.put("SCHOOL", school);
} }

8
src/org/bytedream/untisbot/discord/DiscordCommandListener.java
View File

@ -290,7 +290,7 @@ public class DiscordCommandListener extends ListenerAdapter {
timetableChecking = "\uD83D\uDD34 Inactive"; timetableChecking = "\uD83D\uDD34 Inactive";
embedBuilder.setColor(Color.RED); embedBuilder.setColor(Color.RED);
} }
if (data.getServer() != null && data.getSchool() != null) { if (data.getServer() != null && !data.getServer().equals("") && data.getSchool() != null && !data.getSchool().equals("")) {
dataSet = "✅ Set"; dataSet = "✅ Set";
if (!data.isCheckActive()) { if (!data.isCheckActive()) {
embedBuilder.setFooter("The timetable checker is deactivated. Type `" + data.getPrefix() + "start` to re-enable it - use `" + data.getPrefix() + "help start` for more details"); embedBuilder.setFooter("The timetable checker is deactivated. Type `" + data.getPrefix() + "start` to re-enable it - use `" + data.getPrefix() + "help start` for more details");
@ -333,7 +333,9 @@ public class DiscordCommandListener extends ListenerAdapter {
if (args.length == 0) { if (args.length == 0) {
guildDataConnector.update(guild.getIdLong(), null, "", "", "", "", (short) 0, null, null, null, false, null); guildDataConnector.update(guild.getIdLong(), null, "", "", "", "", (short) 0, null, null, null, false, null);
logger.info(guildName + " cleared their data"); logger.info(guildName + " cleared their data");
channel.sendMessage("Cleared untis data and stopped timetable listening").queue(); allUntisSessions.remove(guildId);
allTimetableChecker.remove(guildId);
channel.sendMessage("Cleared untis data and stopped timetable listening if active").queue();
} else { } else {
channel.sendMessage("Wrong number of arguments were given (expected 0, got " + args.length + "), type `" + data.getPrefix() + "help clear` for help").queue(); channel.sendMessage("Wrong number of arguments were given (expected 0, got " + args.length + "), type `" + data.getPrefix() + "help clear` for help").queue();
} }
@ -392,7 +394,7 @@ public class DiscordCommandListener extends ListenerAdapter {
runTimetableChecker(guild); runTimetableChecker(guild);
channel.sendMessage("✅ Updated data and restarted timetable listening for class " + className).queue(); channel.sendMessage("✅ Updated data and restarted timetable listening for class " + className).queue();
} else if (data.getLastChecked() != null) { } else if (data.getLastChecked() != null) {
channel.sendMessage("✅ Updated data. Timetable listening were manually stopped a while ago. To re-enable it, type `" + data.getPrefix() + "start`").queue(); channel.sendMessage("✅ Updated data. Timetable listening were stopped a while ago. To re-enable it, type `" + data.getPrefix() + "start`").queue();
} else { } else {
runTimetableChecker(guild); runTimetableChecker(guild);
channel.sendMessage("✅ Timetable listening has been started for class " + className).queue(); channel.sendMessage("✅ Timetable listening has been started for class " + className).queue();