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

Release preparations

Browse Source
This commit is contained in:
ByteDream 2020-11-23 18:16:33 +01:00
parent 83ff5a98ac
commit dd883b71e2
2 changed files with 206 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -69,7 +69,7 @@ To set up the database, you have two options to choose from.
##### The short one: ##### The short one:
```bash ```bash
mysql --user=<user> --password=<password> -e "CREATE DATABASE Untis;" && https://raw.githubusercontent.com/ByteDream/untisbot-discord/master/src/org/bytedream/untisbot/dockerfiles/database.sql | mysql --user=<user> --password=<password> Untis mysql --user=<user> --password=<password> -e "CREATE DATABASE Untis;" && wget -qO- https://raw.githubusercontent.com/ByteDream/untisbot-discord/master/src/org/bytedream/untisbot/dockerfiles/database.sql | mysql --user=<user> --password=<password> Untis
``` ```
Just copy this and replace `<user>` with the sql user which should manage the database and `<password>` with the user's password. Just copy this and replace `<user>` with the sql user which should manage the database and `<password>` with the user's password.

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

@ -14,6 +14,7 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.bytedream.untis4j.LoginException; import org.bytedream.untis4j.LoginException;
import org.bytedream.untis4j.Session; import org.bytedream.untis4j.Session;
import org.bytedream.untis4j.responseObjects.Klassen;
import org.bytedream.untis4j.responseObjects.Teachers; import org.bytedream.untis4j.responseObjects.Teachers;
import org.bytedream.untis4j.responseObjects.TimeUnits; import org.bytedream.untis4j.responseObjects.TimeUnits;
import org.bytedream.untis4j.responseObjects.Timetable; import org.bytedream.untis4j.responseObjects.Timetable;
@ -32,10 +33,13 @@ import java.awt.*;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.sql.SQLException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
/** /**
* Adapter to handle all events * Adapter to handle all events
@ -52,6 +56,8 @@ public class DiscordCommandListener extends ListenerAdapter {
private final HashMap<Long, Timer> allTimetableChecker = new HashMap<>(); private final HashMap<Long, Timer> allTimetableChecker = new HashMap<>();
private final Logger logger = Main.getLogger(); private final Logger logger = Main.getLogger();
private final HashMap<Long, LocalDateTime> dataUpdated = new HashMap<>();
/** /**
* Sets up the adapter * Sets up the adapter
* *
@ -79,6 +85,7 @@ public class DiscordCommandListener extends ListenerAdapter {
*/ */
public void runTimetableChecker(Guild guild) { public void runTimetableChecker(Guild guild) {
long guildId = guild.getIdLong(); long guildId = guild.getIdLong();
String guildName = guild.getName();
Timer timer = new Timer(); Timer timer = new Timer();
Data.Guild data = guildDataConnector.get(guildId); Data.Guild data = guildDataConnector.get(guildId);
TimetableChecker timetableChecker; TimetableChecker timetableChecker;
@ -96,18 +103,18 @@ public class DiscordCommandListener extends ListenerAdapter {
timetableChecker = new TimetableChecker(data.getUsername(), data.getPassword(), data.getServer(), data.getSchool(), data.getKlasseId()); timetableChecker = new TimetableChecker(data.getUsername(), data.getPassword(), data.getServer(), data.getSchool(), data.getKlasseId());
} catch (LoginException e) { } catch (LoginException e) {
e.printStackTrace(); e.printStackTrace();
logger.warn(guild.getName() + " failed to login", e); logger.warn(guildName + " failed to login", e);
textChannel.sendMessage("Failed to login. Please try to re-set your data").queue(); textChannel.sendMessage("Failed to login. Please try to re-set your data").queue();
return; return;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.warn(guild.getName() + " ran into an exception while trying to setup the timetable checker", e); logger.warn(guildName + " ran into an exception while trying to setup the timetable checker", e);
textChannel.sendMessage("An error occurred while trying to setup the timetable checking process." + textChannel.sendMessage("An error occurred while trying to setup the timetable checking process." +
"You should try to re-set your data or trying to contact my author <@650417934073593886> (:3) if the problem won't go away").queue(); "You should try to re-set your data or trying to contact my author <@650417934073593886> (:3) if the problem won't go away").queue();
return; return;
} }
timer.scheduleAtFixedRate(new TimerTask() { timer.scheduleAtFixedRate(new TimerTask() {
private int latestImportTime = 0; private long latestImportTime = 0;
private void main() { private void main() {
Data.Guild data = guildDataConnector.get(guildId); Data.Guild data = guildDataConnector.get(guildId);
@ -124,6 +131,7 @@ public class DiscordCommandListener extends ListenerAdapter {
} }
} }
boolean changes = false;
boolean error = false; boolean error = false;
Data.Stats stats = statsDataConnector.get(guildId); Data.Stats stats = statsDataConnector.get(guildId);
String setLanguage = data.getLanguage(); String setLanguage = data.getLanguage();
@ -147,6 +155,9 @@ public class DiscordCommandListener extends ListenerAdapter {
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} catch (ArrayIndexOutOfBoundsException e) {
i++;
daysToCheck++;
} }
for (; i <= daysToCheck; i++) { for (; i <= daysToCheck; i++) {
@ -154,6 +165,14 @@ public class DiscordCommandListener extends ListenerAdapter {
try { try {
CheckCallback checkCallback = timetableChecker.check(localDate); CheckCallback checkCallback = timetableChecker.check(localDate);
ArrayList<Timetable.Lesson> cancelledLessons = checkCallback.getCancelled();
ArrayList<Timetable.Lesson[]> movedLessons = checkCallback.getMoved();
ArrayList<Timetable.Lesson> notCancelledLessons = checkCallback.getNotCancelled();
ArrayList<Timetable.Lesson[]> notMovedLessons = checkCallback.getNotMoved();
if (cancelledLessons.size() != 0 || movedLessons.size() != 0 || notCancelledLessons.size() != 0 || notMovedLessons.size() != 0) {
changes = true;
EmbedBuilder embedBuilder = new EmbedBuilder(); EmbedBuilder embedBuilder = new EmbedBuilder();
embedBuilder.setColor(Color.CYAN); embedBuilder.setColor(Color.CYAN);
embedBuilder.setTitle(Utils.advancedFormat(language.getString("title"), new HashMap<String, Object>() {{ embedBuilder.setTitle(Utils.advancedFormat(language.getString("title"), new HashMap<String, Object>() {{
@ -161,11 +180,6 @@ public class DiscordCommandListener extends ListenerAdapter {
put("date", localDate.format(DateTimeFormatter.ofPattern("dd.MM.yyyy"))); put("date", localDate.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")));
}})); }}));
ArrayList<Timetable.Lesson> cancelledLessons = checkCallback.getCancelled();
ArrayList<Timetable.Lesson[]> movedLessons = checkCallback.getMoved();
ArrayList<Timetable.Lesson> notCancelledLessons = checkCallback.getNotCancelled();
ArrayList<Timetable.Lesson[]> notMovedLessons = checkCallback.getNotMoved();
for (Timetable.Lesson lesson : cancelledLessons) { for (Timetable.Lesson lesson : cancelledLessons) {
TimeUnits.TimeUnitObject timeUnitObject = lesson.getTimeUnitObject(); TimeUnits.TimeUnitObject timeUnitObject = lesson.getTimeUnitObject();
HashMap<String, Object> formatMap = new HashMap<String, Object>() {{ HashMap<String, Object> formatMap = new HashMap<String, Object>() {{
@ -270,8 +284,9 @@ public class DiscordCommandListener extends ListenerAdapter {
if (error) { if (error) {
error = false; error = false;
} }
}
} catch (Exception e) { } catch (Exception e) {
logger.warn(guild.getName() + " ran into an exception while trying to check the timetable for the " + localDate.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")), e); logger.warn(guildName + " ran into an exception while trying to check the timetable for the " + localDate.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")), e);
if (!error) { if (!error) {
textChannel.sendMessage("An error occurred while trying to check the timetable." + textChannel.sendMessage("An error occurred while trying to check the timetable." +
"You can try to re-set your data or trying to contact my author <@650417934073593886> (:3) if the problem won't go away").queue(); "You can try to re-set your data or trying to contact my author <@650417934073593886> (:3) if the problem won't go away").queue();
@ -283,26 +298,40 @@ public class DiscordCommandListener extends ListenerAdapter {
} }
} }
} }
String changesString = "no changes";
if (changes) {
changesString = "changes";
}
logger.info("Checked timetable for " + guildName + " - " + changesString);
} }
@Override @Override
public void run() { public void run() {
Thread.currentThread().setName(guildName + "(" + guildId + ")");
try { try {
Session session = timetableChecker.getSession(); Session session = timetableChecker.getSession();
session.reconnect(); session.reconnect();
if (latestImportTime < session.getLatestImportTime().getLatestImportTime()) { long sessionLatestImportTime = session.getLatestImportTime().getLatestImportTime();
latestImportTime = session.getLatestImportTime().getLatestImportTime(); if (latestImportTime < sessionLatestImportTime) {
latestImportTime = sessionLatestImportTime;
main(); main();
} else { } else {
main(); try {
Main.getConnection().createStatement().execute("SELECT * FROM Guilds WHERE GUILDID = 0");
// just execute this so that the connect won't have a timeout
} catch (SQLException ignore) {
}
} }
} catch (IOException e) { } catch (IOException e) {
logger.info("Running main through IOException (" + e.getCause() + ")");
main(); main();
} }
} }
}, 0, data.getSleepTime()); }, 0, data.getSleepTime());
allTimetableChecker.put(guildId, timer); allTimetableChecker.put(guildId, timer);
logger.info(guild.getName() + " started timetable listening"); logger.info(guildName + " started timetable listening");
} }
@Override @Override
@ -334,7 +363,7 @@ public class DiscordCommandListener extends ListenerAdapter {
@Override @Override
public void onGuildMessageReceived(GuildMessageReceivedEvent event) { public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
new Thread(() -> { Thread t = new Thread(() -> {
long guildId = event.getGuild().getIdLong(); long guildId = event.getGuild().getIdLong();
Data.Guild data = guildDataConnector.get(guildId); Data.Guild data = guildDataConnector.get(guildId);
try { try {
@ -433,7 +462,13 @@ public class DiscordCommandListener extends ListenerAdapter {
break; break;
case "data": // `data <username> <password> <server> <school name>` command case "data": // `data <username> <password> <server> <school name>` command
if (args.length >= 3 && args.length <= 4) { if (args.length >= 3 && args.length <= 4) {
if (dataUpdated.getOrDefault(guildId, LocalDateTime.MIN).plusMinutes(1).isAfter(LocalDateTime.now())) {
// this gives the server a little decay time and prevents additional load (because of the untis data encryption) caused by spamming
channel.sendMessage("The data was changed recently, try again in about one minute").queue();
} else {
dataUpdated.put(guildId, LocalDateTime.now());
String schoolName; String schoolName;
String className;
try { try {
schoolName = new URL(args[2]).getQuery().split("=")[1]; schoolName = new URL(args[2]).getQuery().split("=")[1];
} catch (MalformedURLException | ArrayIndexOutOfBoundsException e) { } catch (MalformedURLException | ArrayIndexOutOfBoundsException e) {
@ -448,9 +483,12 @@ public class DiscordCommandListener extends ListenerAdapter {
Session session = Session.login(args[0], args[1], server, schoolName); Session session = Session.login(args[0], args[1], server, schoolName);
if (args.length == 3) { if (args.length == 3) {
klasseId = (short) session.getInfos().getKlasseId(); klasseId = (short) session.getInfos().getKlasseId();
className = session.getKlassen().findById(klasseId).getName();
} else { } else {
try { try {
klasseId = (short) session.getKlassen().findByName(args[3]).getId(); Klassen.KlasseObject klasse = session.getKlassen().findByName(args[3]);
klasseId = (short) klasse.getId();
className = klasse.getName();
} catch (NullPointerException e) { } catch (NullPointerException e) {
channel.sendMessage("❌ Cannot find the given class").queue(); channel.sendMessage("❌ Cannot find the given class").queue();
return; return;
@ -472,16 +510,17 @@ public class DiscordCommandListener extends ListenerAdapter {
if (isCheckActive) { if (isCheckActive) {
Timer timer = allTimetableChecker.get(guildId); Timer timer = allTimetableChecker.get(guildId);
allTimetableChecker.remove(guildId);
timer.cancel(); timer.cancel();
timer.purge(); timer.purge();
allTimetableChecker.remove(guildId);
runTimetableChecker(guild); runTimetableChecker(guild);
channel.sendMessage("✅ Updated data and restarted timetable listening").queue(); channel.sendMessage("✅ Updated data and restarted timetable listening for class " + className).queue();
} else { } else {
runTimetableChecker(guild); runTimetableChecker(guild);
channel.sendMessage("✅ Timetable listening has been started").queue(); channel.sendMessage("✅ Timetable listening has been started for class " + className).queue();
} }
logger.info(guildName + " set new data"); logger.info(guildName + " set new data");
}
} else { } else {
channel.sendMessage("Wrong number of arguments were given (expected 3 or 4, got " + args.length + "), type `" + data.getPrefix() + "help data` for help").queue(); channel.sendMessage("Wrong number of arguments were given (expected 3 or 4, got " + args.length + "), type `" + data.getPrefix() + "help data` for help").queue();
} }
@ -535,12 +574,14 @@ public class DiscordCommandListener extends ListenerAdapter {
} }
} catch (NullPointerException ignore) { } catch (NullPointerException ignore) {
} }
}).start(); });
t.setName("Guild message handler");
t.start();
} }
@Override @Override
public void onMessageReceived(@NotNull MessageReceivedEvent event) { // only for `help` command public void onMessageReceived(@NotNull MessageReceivedEvent event) { // only for the `help` command
new Thread(() -> { Thread t = new Thread(() -> {
if (event.getAuthor().isBot()) { if (event.getAuthor().isBot()) {
return; return;
} }
@ -636,7 +677,8 @@ public class DiscordCommandListener extends ListenerAdapter {
embedBuilder.setFooter("`<>` = required; `[]` = optional"); embedBuilder.setFooter("`<>` = required; `[]` = optional");
channel.sendMessage(embedBuilder.build()).queue(); channel.sendMessage(embedBuilder.build()).queue();
} }
}).start(); });
t.setName("Message handler");
} }
@Override @Override