mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-07 20:09:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add package-info to all packages

Browse Source
This commit is contained in:
NovaFox161
2020-08-03 00:13:02 -05:00
parent f66870307d
commit caa300ceca
68 changed files with 120 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/java/org/dreamexposure/discal/client/announcement/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.announcement;

1
client/src/main/java/org/dreamexposure/discal/client/calendar/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.calendar;

1
client/src/main/java/org/dreamexposure/discal/client/conf/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.conf;

1
client/src/main/java/org/dreamexposure/discal/client/event/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.event;

1
client/src/main/java/org/dreamexposure/discal/client/listeners/discord/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.listeners.discord;

1
client/src/main/java/org/dreamexposure/discal/client/message/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.message;

1
client/src/main/java/org/dreamexposure/discal/client/module/announcement/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.module.announcement;

1
client/src/main/java/org/dreamexposure/discal/client/module/command/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.module.command;

1
client/src/main/java/org/dreamexposure/discal/client/module/misc/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.module.misc;

1
client/src/main/java/org/dreamexposure/discal/client/module/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.module;

1
client/src/main/java/org/dreamexposure/discal/client/network/google/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.network.google;

1
client/src/main/java/org/dreamexposure/discal/client/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client;

1
client/src/main/java/org/dreamexposure/discal/client/service/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.client.service;

1
core/src/main/java/org/dreamexposure/discal/core/calendar/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.calendar;

1
core/src/main/java/org/dreamexposure/discal/core/crypto/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.crypto;

1
core/src/main/java/org/dreamexposure/discal/core/database/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.database;

1
core/src/main/java/org/dreamexposure/discal/core/enums/announcement/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.enums.announcement;

1
core/src/main/java/org/dreamexposure/discal/core/enums/event/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.enums.event;

1
core/src/main/java/org/dreamexposure/discal/core/enums/network/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.enums.network;

1
core/src/main/java/org/dreamexposure/discal/core/enums/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.enums;

1
core/src/main/java/org/dreamexposure/discal/core/exceptions/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.exceptions;

1
core/src/main/java/org/dreamexposure/discal/core/file/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.file;

1
core/src/main/java/org/dreamexposure/discal/core/filter/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.filter;

1
core/src/main/java/org/dreamexposure/discal/core/logger/enums/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger.enums;

1
core/src/main/java/org/dreamexposure/discal/core/logger/interfaces/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger.interfaces;

1
core/src/main/java/org/dreamexposure/discal/core/logger/loggers/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger.loggers;

1
core/src/main/java/org/dreamexposure/discal/core/logger/object/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger.object;

1
core/src/main/java/org/dreamexposure/discal/core/logger/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger;

1
core/src/main/java/org/dreamexposure/discal/core/logger/threads/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.logger.threads;

1
core/src/main/java/org/dreamexposure/discal/core/network/google/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.network.google;

1
core/src/main/java/org/dreamexposure/discal/core/object/announcement/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.announcement;

1
core/src/main/java/org/dreamexposure/discal/core/object/calendar/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.calendar;

1
core/src/main/java/org/dreamexposure/discal/core/object/command/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.command;

1
core/src/main/java/org/dreamexposure/discal/core/object/event/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.event;

1
core/src/main/java/org/dreamexposure/discal/core/object/network/discal/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.network.discal;

1
core/src/main/java/org/dreamexposure/discal/core/object/network/google/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.network.google;

1
core/src/main/java/org/dreamexposure/discal/core/object/network/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.network;

1
core/src/main/java/org/dreamexposure/discal/core/object/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object;

1
core/src/main/java/org/dreamexposure/discal/core/object/web/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.object.web;

1
core/src/main/java/org/dreamexposure/discal/core/utils/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.utils;

1
core/src/main/java/org/dreamexposure/discal/core/wrapper/google/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.core.wrapper.google;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v1/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v1;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/account/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.account;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/announcement/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.announcement;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/calendar/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.calendar;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/event/list/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.event.list;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/event/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.event;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/guild/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.guild;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/guild/settings/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.guild.settings;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/rsvp/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.rsvp;

1
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/status/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.api.endpoints.v2.status;

1
server/src/main/java/org/dreamexposure/discal/server/conf/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.conf;

1
server/src/main/java/org/dreamexposure/discal/server/network/discal/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.network.discal;

1
server/src/main/java/org/dreamexposure/discal/server/network/discordbots/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.network.discordbots;

1
server/src/main/java/org/dreamexposure/discal/server/network/discordpw/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.network.discordpw;

1
server/src/main/java/org/dreamexposure/discal/server/network/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.network;

1
server/src/main/java/org/dreamexposure/discal/server/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server;

1
server/src/main/java/org/dreamexposure/discal/server/utils/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.server.utils;

1
web/src/main/java/org/dreamexposure/discal/web/conf/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.conf;

108
web/src/main/java/org/dreamexposure/discal/web/handler/DiscordAccountHandler.java
View File

@@ -21,7 +21,7 @@ import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
@SuppressWarnings({"RedundantCast", "Duplicates", "WeakerAccess", "ConstantConditions"})
@SuppressWarnings({"RedundantCast", "Duplicates", "ConstantConditions"})
public class DiscordAccountHandler {
private static DiscordAccountHandler instance;
private static Timer timer;
@@ -40,15 +40,13 @@ public class DiscordAccountHandler {
}
public void init() {
if (BotSettings.RUN_API.get().equalsIgnoreCase("true")) {
timer = new Timer(true);
timer.schedule(new TimerTask() {
@Override
public void run() {
removeTimedOutAccounts();
}
}, 60 * 30 * 1000);
}
timer = new Timer(true);
timer.schedule(new TimerTask() {
@Override
public void run() {
DiscordAccountHandler.this.removeTimedOutAccounts();
}
}, 60 * 30 * 1000);
}
public void shutdown() {
@@ -57,18 +55,18 @@ public class DiscordAccountHandler {
}
//Boolean/checkers
public boolean hasAccount(HttpServletRequest request) {
public boolean hasAccount(final HttpServletRequest request) {
try {
return discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"));
} catch (Exception e) {
return this.discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"));
} catch (final Exception e) {
return false;
}
}
//Getters
public Map<String, Object> getAccount(HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"))) {
Map<String, Object> m = discordAccounts.get((String) request.getSession(true).getAttribute("account"));
public Map<String, Object> getAccount(final HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && this.discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"))) {
final Map<String, Object> m = this.discordAccounts.get((String) request.getSession(true).getAttribute("account"));
m.remove("last_use");
m.put("last_use", System.currentTimeMillis());
@@ -79,7 +77,7 @@ public class DiscordAccountHandler {
} else {
//Not logged in...
Map<String, Object> m = new HashMap<>();
final Map<String, Object> m = new HashMap<>();
m.put("logged_in", false);
m.put("bot_id", BotSettings.ID.get());
m.put("year", LocalDate.now().getYear());
@@ -92,36 +90,36 @@ public class DiscordAccountHandler {
}
}
public Map<String, Object> getEmbedAccount(HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"))) {
Map<String, Object> m = discordAccounts.get((String) request.getSession(true).getAttribute("account"));
public Map<String, Object> getEmbedAccount(final HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && this.discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"))) {
final Map<String, Object> m = this.discordAccounts.get((String) request.getSession(true).getAttribute("account"));
m.remove("last_use");
m.put("last_use", System.currentTimeMillis());
if (!m.containsKey("embed_key")) {
//Get and add read-only API key for embed page. Only good for one hour.
try {
OkHttpClient client = new OkHttpClient();
RequestBody keyGrantRequestBody = RequestBody.create(GlobalConst.JSON, "");
Request keyGrantRequest = new Request.Builder()
.url(BotSettings.API_URL_INTERNAL.get() + "/v2/account/key/readonly/get")
.header("Authorization", BotSettings.BOT_API_TOKEN.get())
.post(keyGrantRequestBody)
.build();
Response keyGrantResponse = client.newCall(keyGrantRequest).execute();
final OkHttpClient client = new OkHttpClient();
final RequestBody keyGrantRequestBody = RequestBody.create(GlobalConst.JSON, "");
final Request keyGrantRequest = new Request.Builder()
.url(BotSettings.API_URL_INTERNAL.get() + "/v2/account/key/readonly/get")
.header("Authorization", BotSettings.BOT_API_TOKEN.get())
.post(keyGrantRequestBody)
.build();
final Response keyGrantResponse = client.newCall(keyGrantRequest).execute();
//Handle response...
if (keyGrantResponse.isSuccessful()) {
JSONObject keyGrantResponseBody = new JSONObject(keyGrantResponse.body().string());
final JSONObject keyGrantResponseBody = new JSONObject(keyGrantResponse.body().string());
//API key received, map....
m.put("embed_key", keyGrantResponseBody.getString("key"));
} else {
//Something didn't work... add invalid key that embed page is programmed to respond to.
LogFeed.log(LogObject
.forDebug("Embed Key Fail: ", keyGrantResponse.body().string()));
.forDebug("Embed Key Fail: ", keyGrantResponse.body().string()));
m.put("embed_key", "internal_error");
}
} catch (Exception e) {
} catch (final Exception e) {
//Something didn't work... add invalid key that embed page is programmed to respond to.
LogFeed.log(LogObject.forException("Embed key get failure", e, this.getClass()));
m.put("embed_key", "internal_error");
@@ -132,7 +130,7 @@ public class DiscordAccountHandler {
} else {
//Not logged in...
Map<String, Object> m = new HashMap<>();
final Map<String, Object> m = new HashMap<>();
m.put("logged_in", false);
m.put("bot_id", BotSettings.ID.get());
m.put("year", LocalDate.now().getYear());
@@ -143,27 +141,27 @@ public class DiscordAccountHandler {
//Get and add read-only API key for embed page. Only good for one hour.
try {
OkHttpClient client = new OkHttpClient();
RequestBody keyGrantRequestBody = RequestBody.create(GlobalConst.JSON, "");
Request keyGrantRequest = new Request.Builder()
.url(BotSettings.API_URL_INTERNAL.get() + "/v2/account/key/readonly/get")
.header("Authorization", BotSettings.BOT_API_TOKEN.get())
.post(keyGrantRequestBody)
.build();
Response keyGrantResponse = client.newCall(keyGrantRequest).execute();
final OkHttpClient client = new OkHttpClient();
final RequestBody keyGrantRequestBody = RequestBody.create(GlobalConst.JSON, "");
final Request keyGrantRequest = new Request.Builder()
.url(BotSettings.API_URL_INTERNAL.get() + "/v2/account/key/readonly/get")
.header("Authorization", BotSettings.BOT_API_TOKEN.get())
.post(keyGrantRequestBody)
.build();
final Response keyGrantResponse = client.newCall(keyGrantRequest).execute();
//Handle response...
if (keyGrantResponse.isSuccessful()) {
JSONObject keyGrantResponseBody = new JSONObject(keyGrantResponse.body().string());
final JSONObject keyGrantResponseBody = new JSONObject(keyGrantResponse.body().string());
//API key received, map....
m.put("embed_key", keyGrantResponseBody.getString("key"));
} else {
//Something didn't work... add invalid key that embed page is programmed to respond to.
LogFeed.log(LogObject.forDebug("Embed key fail",
keyGrantResponse.body().string()));
keyGrantResponse.body().string()));
m.put("embed_key", "internal_error");
}
} catch (Exception e) {
} catch (final Exception e) {
//Something didn't work... add invalid key that embed page is programmed to respond to.
LogFeed.log(LogObject.forException("Embed key get failure", e, this.getClass()));
m.put("embed_key", "internal_error");
@@ -175,30 +173,30 @@ public class DiscordAccountHandler {
//Functions
public void addAccount(Map<String, Object> m, HttpServletRequest request) {
discordAccounts.remove((String) request.getSession(true).getAttribute("account"));
public void addAccount(final Map<String, Object> m, final HttpServletRequest request) {
this.discordAccounts.remove((String) request.getSession(true).getAttribute("account"));
m.remove("last_use");
m.put("last_use", System.currentTimeMillis());
discordAccounts.put((String) request.getSession(true).getAttribute("account"), m);
this.discordAccounts.put((String) request.getSession(true).getAttribute("account"), m);
}
public void removeAccount(HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && hasAccount(request))
discordAccounts.remove((String) request.getSession(true).getAttribute("account"));
public void removeAccount(final HttpServletRequest request) {
if ((String) request.getSession(true).getAttribute("account") != null && this.hasAccount(request))
this.discordAccounts.remove((String) request.getSession(true).getAttribute("account"));
}
private void removeTimedOutAccounts() {
long limit = Long.parseLong(BotSettings.TIME_OUT.get());
final long limit = Long.parseLong(BotSettings.TIME_OUT.get());
final List<String> toRemove = new ArrayList<>();
for (String id : discordAccounts.keySet()) {
Map<String, Object> m = discordAccounts.get(id);
long lastUse = (long) m.get("last_use");
for (final String id : this.discordAccounts.keySet()) {
final Map<String, Object> m = this.discordAccounts.get(id);
final long lastUse = (long) m.get("last_use");
if (System.currentTimeMillis() - lastUse > limit)
toRemove.remove(id); //Timed out, remove account info and require sign in.
}
for (String id : toRemove) {
discordAccounts.remove(id);
for (final String id : toRemove) {
this.discordAccounts.remove(id);
}
}
}

1
web/src/main/java/org/dreamexposure/discal/web/handler/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.handler;

1
web/src/main/java/org/dreamexposure/discal/web/network/discal/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.network.discal;

1
web/src/main/java/org/dreamexposure/discal/web/network/discord/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.network.discord;

1
web/src/main/java/org/dreamexposure/discal/web/network/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.network;

1
web/src/main/java/org/dreamexposure/discal/web/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web;

1
web/src/main/java/org/dreamexposure/discal/web/spring/package-info.java Normal file
View File

@@ -0,0 +1 @@
package org.dreamexposure.discal.web.spring;