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

More debugging!!! Empty?????? Losing my damn mind right now

Browse Source
This commit is contained in:
NovaFox161
2020-05-08 18:06:51 -05:00
parent 54ec3ae196
commit 67963d5aa4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
View File

@@ -222,13 +222,19 @@ public class GoogleExternalAuth {
.flatMap(em -> Messages.sendDirectMessage(em, poll.getUser()))
.doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 3.1")))
.then(Mono.just(GlobalConst.NOT_EMPTY))
))
).doOnNext(i -> LogFeed.log(LogObject.forDebug("Auth 200: 3.2"))))
.switchIfEmpty(Messages.sendDirectMessage(
Messages.getMessage("AddCalendar.Auth.Poll.Failure.ListCalendars", gs)
, poll.getUser()).then(Mono.empty()))
.doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 4")))
.then(Mono.error(new GoogleAuthCancelException()));
});
})
.doOnNext(s -> LogFeed.log(LogObject.forDebug("Auth 200: 5")))
.switchIfEmpty(Mono.defer(() -> {
LogFeed.log(LogObject.forDebug("Auth 200: Empty????"));
return Mono.empty(); //For now, so we aren't breaking things more...
}));
} else {
//Unknown network error...
LogFeed.log(LogObject.forDebug("Network error; poll failure", "Status code: " + response.code()

3
core/src/main/java/org/dreamexposure/discal/core/database/DatabaseManager.java
View File

@@ -232,6 +232,7 @@ public class DatabaseManager {
.bind(15, set.isBranded())
.execute())
).flatMap(res -> Mono.from(res.getRowsUpdated()))
.doOnNext(s -> LogFeed.log(LogObject.forDebug("Insert Settings: 3")))
.hasElement()
.thenReturn(true);
}
@@ -240,7 +241,7 @@ public class DatabaseManager {
return Mono.just(false);
}).switchIfEmpty(Mono.defer(() -> {
LogFeed.log(LogObject.forDebug("Update Settings: Empty?????"));
return Mono.empty();
return Mono.empty(); //So we aren't breaking anything even more yet
}));
}