mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-05-04 08:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get dashboard functioning again

Browse Source 
There are still some lingering issues that I am tracking down, but this is huge progress on the issues plaguing the dashboard since the 4.0.0 release.

Hopefully I can narrow down the rest of the major bugs that have popped up and get everything functioning correctly.
This commit is contained in:
NovaFox161
2020-08-11 09:02:22 -05:00
parent 13c31e2197
commit 81f11c8e6c
5 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/java/org/dreamexposure/discal/server/api/endpoints/v2/guild/GetWebGuildEndpoint.java
+18 -17
View File
@@ -1,5 +1,6 @@
package org.dreamexposure.discal.server.api.endpoints.v2.guild;
import org.dreamexposure.discal.core.exceptions.BotNotInGuildException;
import org.dreamexposure.discal.core.file.ReadFile;
import org.dreamexposure.discal.core.logger.LogFeed;
import org.dreamexposure.discal.core.logger.object.LogObject;
@@ -46,26 +47,26 @@ public class GetWebGuildEndpoint {
final RestGuild g = DisCalServer.getClient().getGuildById(guildId);
if (g != null) {
final WebGuild wg = WebGuild.fromGuild(g);
final WebGuild wg = WebGuild.fromGuild(g);
final RestMember m = g.member(userId);
final RestMember m = g.member(userId);
if (m != null) { //Assume false if we can't get the user...
wg.setManageServer(PermissionChecker.hasManageServerRole(m, g).block());
wg.setDiscalRole(PermissionChecker.hasSufficientRole(m, wg.getSettings()).block());
}
//Add available langs so that editing of langs can be done on the website
//noinspection unchecked
for (final String l : new ArrayList<String>(ReadFile.readAllLangFiles().block().keySet())) {
wg.getAvailableLangs().add(l);
}
response.setContentType("application/json");
response.setStatus(GlobalConst.STATUS_SUCCESS);
return wg.toJson(!authState.isFromDiscalNetwork()).toString();
if (m != null) { //Assume false if we can't get the user...
//TODO: Check logs for full stack trace here, something weird is up with it
wg.setManageServer(PermissionChecker.hasManageServerRole(m, g).blockOptional().orElse(false));
wg.setDiscalRole(PermissionChecker.hasSufficientRole(m, wg.getSettings()).blockOptional().orElse(false));
}
//Add available langs so that editing of langs can be done on the website
//noinspection unchecked
for (final String l : new ArrayList<String>(ReadFile.readAllLangFiles().block().keySet())) {
wg.getAvailableLangs().add(l);
}
response.setContentType("application/json");
response.setStatus(GlobalConst.STATUS_SUCCESS);
return wg.toJson(!authState.isFromDiscalNetwork()).toString();
} catch (final BotNotInGuildException e) {
response.setContentType("application/json");
response.setStatus(GlobalConst.STATUS_NOT_FOUND);
return JsonUtils.getJsonResponseMessage("Guild not connected to DisCal");