mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-11 22:18:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Making some progress on fixing the /embed/calendar/<guild-id> page.

Browse Source
This commit is contained in:
NovaFox161
2018-09-13 23:44:29 -05:00
parent 28508b4a62
commit 29fcb0c6ac
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v1/EventEndpoint.java
View File

@@ -59,10 +59,15 @@ public class EventEndpoint {
GuildSettings settings;
if (DiscordAccountHandler.getHandler().hasAccount(request)) {
Map m = DiscordAccountHandler.getHandler().getAccount(request);
WebGuild g = (WebGuild) m.get("selected");
g.setSettings(DatabaseManager.getManager().getSettings(Long.valueOf(g.getId())));
settings = g.getSettings();
if (requestBody.has("guild_id")) {
long guildId = Long.valueOf(requestBody.getString("guild_id"));
settings = DatabaseManager.getManager().getSettings(guildId);
} else {
Map m = DiscordAccountHandler.getHandler().getAccount(request);
WebGuild g = (WebGuild) m.get("selected");
g.setSettings(DatabaseManager.getManager().getSettings(Long.valueOf(g.getId())));
settings = g.getSettings();
}
} else {
long guildId = requestBody.getLong("guild_id");
settings = DatabaseManager.getManager().getSettings(guildId);
@@ -125,10 +130,15 @@ public class EventEndpoint {
GuildSettings settings;
if (DiscordAccountHandler.getHandler().hasAccount(request)) {
Map m = DiscordAccountHandler.getHandler().getAccount(request);
WebGuild g = (WebGuild) m.get("selected");
g.setSettings(DatabaseManager.getManager().getSettings(Long.valueOf(g.getId())));
settings = g.getSettings();
if (requestBody.has("guild_id")) {
long guildId = requestBody.getLong("guild_id");
settings = DatabaseManager.getManager().getSettings(guildId);
} else {
Map m = DiscordAccountHandler.getHandler().getAccount(request);
WebGuild g = (WebGuild) m.get("selected");
g.setSettings(DatabaseManager.getManager().getSettings(Long.valueOf(g.getId())));
settings = g.getSettings();
}
} else {
long guildId = requestBody.getLong("guild_id");
settings = DatabaseManager.getManager().getSettings(guildId);

10
server/src/main/java/org/dreamexposure/discal/server/handler/DiscordAccountHandler.java
View File

@@ -51,7 +51,11 @@ public class DiscordAccountHandler {
//Boolean/checkers
public boolean hasAccount(HttpServletRequest request) {
return discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"));
try {
return discordAccounts.containsKey((String) request.getSession(true).getAttribute("account"));
} catch (Exception e) {
return false;
}
}
//Getters
@@ -87,7 +91,7 @@ public class DiscordAccountHandler {
//Add guild for guild embed
JSONObject requestBody = new JSONObject();
requestBody.put("Reason", CrossTalkReason.GET.name());
requestBody.put("Realm", DisCalRealm.WEBSITE_DASHBOARD_GUILD);
requestBody.put("Realm", DisCalRealm.WEBSITE_EMBED_CALENDAR);
requestBody.put("Guild-Id", guildId);
m.remove("embed");
@@ -114,7 +118,7 @@ public class DiscordAccountHandler {
//Add guild for guild embed
JSONObject requestBody = new JSONObject();
requestBody.put("Reason", CrossTalkReason.GET.name());
requestBody.put("Realm", DisCalRealm.WEBSITE_DASHBOARD_GUILD);
requestBody.put("Realm", DisCalRealm.WEBSITE_EMBED_CALENDAR);
requestBody.put("Guild-Id", guildId);
m.remove("embed");

3
server/src/main/java/org/dreamexposure/discal/server/utils/Authentication.java
View File

@@ -28,6 +28,8 @@ public class Authentication {
//TODO: Handle this shit better but whatever
if (key.equals("EMBEDDED")) {
Logger.getLogger().api("User using embed", request.getRemoteAddr(), request.getServerName(), request.getPathInfo());
//TODO: Verify its using the correct /embed/ path!!!!
return new AuthenticationState(true).setStatus(200).setReason("Success");
} else {
UserAPIAccount acc = DatabaseManager.getManager().getAPIAccount(key);
if (acc != null) {
@@ -52,6 +54,5 @@ public class Authentication {
return new AuthenticationState(false).setStatus(400).setReason("Bad Request");
}
}
return new AuthenticationState(false).setStatus(500).setReason("Internal Server Error");
}
}

2
server/src/main/resources/static/scripts/embed/calendar.js
View File

@@ -147,7 +147,7 @@ function getEventsForMonth() {
var bodyRaw = {
"guild_id": calendar.guildId,
"guild_id": calendar.guildId.toString(),
"DaysInMonth": daysInMonth().toString(),
"StartEpoch": ds.getTime().toString()
};