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

Code reformatting

Browse Source
This commit is contained in:
ByteDream 2020-12-15 20:33:20 +01:00
parent 1a91ae3f2f
commit 246e130be9
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/org/bytedream/untisbot/discord/Discord.java
View File

@ -30,8 +30,8 @@ import java.util.concurrent.TimeUnit;
*/
public class Discord {
private final JDABuilder jdaBuilder;
private static JDA jda = null;
private final JDABuilder jdaBuilder;
/**
* Configures the bot to make it ready to launch
@ -47,6 +47,16 @@ public class Discord {
jdaBuilder.addEventListeners(new DiscordCommandListener(storeType, new Crypt(encryptPassword), languages));
}
/**
* Returns the running jda instance
*
* @return the jda instance
* @since 1.2
*/
public static JDA getJda() {
return jda;
}
/**
* Show rich presence if a bot update was released within then last 24 hours
*
@ -99,14 +109,4 @@ public class Discord {
jda = jdaBuilder.build();
}
/**
* Returns the running jda instance
*
* @return the jda instance
* @since 1.2
*/
public static JDA getJda() {
return jda;
}
}

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

@ -28,7 +28,10 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import java.awt.*;
import java.io.*;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.sql.SQLException;
@ -54,9 +57,8 @@ public class DiscordCommandListener extends ListenerAdapter {
private final HashMap<Long, Session> allUntisSessions = new HashMap<>();
private final HashMap<Long, Timer> allTimetableChecker = new HashMap<>();
private final Logger logger = Main.getLogger();
private boolean maintenance = false;
private final HashMap<Long, LocalDateTime> dataUpdated = new HashMap<>();
private boolean maintenance = false;
/**
* Sets up the adapter
@ -113,8 +115,8 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
Klassen klassen = session.getKlassen();
StringBuilder stringBuilder = new StringBuilder();
String end = klassen.size() > 10 ? "\n": ", ";
for (Klassen.KlasseObject klasse: klassen) {
String end = klassen.size() > 10 ? "\n" : ", ";
for (Klassen.KlasseObject klasse : klassen) {
stringBuilder.append(klasse.getName()).append(end);
}
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
@ -149,8 +151,8 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
Departments departments = session.getDepartments();
StringBuilder stringBuilder = new StringBuilder();
String end = departments.size() > 10 ? "\n": ", ";
for (Departments.DepartmentObject department: departments) {
String end = departments.size() > 10 ? "\n" : ", ";
for (Departments.DepartmentObject department : departments) {
stringBuilder.append(department.getName()).append(end);
}
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
@ -185,13 +187,14 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
session.reconnect();
} catch (IOException ignore) {}
} catch (IOException ignore) {
}
EmbedBuilder embedBuilder = new EmbedBuilder();
embedBuilder.setColor(new Color(30, 144, 255));
embedBuilder.setTitle(languages.getJSONObject(data.getLanguage()).getString("holidays-title") + "⛱️");
try {
for (Holidays.HolidaysObject holidays: Holidays.sortByStartDate(session.getHolidays())) {
for (Holidays.HolidaysObject holidays : Holidays.sortByStartDate(session.getHolidays())) {
HashMap<String, Object> format = new HashMap<String, Object>() {{
put("name", holidays.getName());
put("from", holidays.getStartDate().format(DateTimeFormatter.ofPattern("dd.MM.yyyy")));
@ -222,8 +225,8 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
Rooms rooms = session.getRooms();
StringBuilder stringBuilder = new StringBuilder();
String end = rooms.size() > 10 ? "\n": ", ";
for (Rooms.RoomObject room: rooms) {
String end = rooms.size() > 10 ? "\n" : ", ";
for (Rooms.RoomObject room : rooms) {
stringBuilder.append(room.getName()).append(end);
}
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
@ -258,8 +261,8 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
Subjects subjects = session.getSubjects();
StringBuilder stringBuilder = new StringBuilder();
String end = subjects.size() > 10 ? "\n": ", ";
for (Subjects.SubjectObject subject: subjects) {
String end = subjects.size() > 10 ? "\n" : ", ";
for (Subjects.SubjectObject subject : subjects) {
stringBuilder.append(subject.getName()).append(end);
}
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
@ -294,7 +297,7 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
Teachers teachers = session.getTeachers();
StringBuilder stringBuilder = new StringBuilder();
for (Teachers.TeacherObject teacher: teachers) {
for (Teachers.TeacherObject teacher : teachers) {
stringBuilder.append(teacher.getFullName()).append("\n");
}
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
@ -329,7 +332,8 @@ public class DiscordCommandListener extends ListenerAdapter {
try {
session.reconnect();
} catch (IOException ignore) {}
} catch (IOException ignore) {
}
LocalDate now = LocalDate.now();
Short classId = data.getKlasseId();