TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #423 from TeamPiped/better-error

Browse source 
Fix some "NullPointerException: null" errors
This commit is contained in:
Kavin 2022-11-04 19:43:44 +00:00 • committed by GitHub
commit 4a95926a16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/me/kavin/piped/server/ServerLauncher.java
View file

@ -18,10 +18,7 @@ import me.kavin.piped.server.handlers.auth.AuthPlaylistHandlers;
import me.kavin.piped.server.handlers.auth.FeedHandlers;
import me.kavin.piped.server.handlers.auth.UserHandlers;
import me.kavin.piped.utils.*;
import me.kavin.piped.utils.resp.DeleteUserRequest;
import me.kavin.piped.utils.resp.LoginRequest;
import me.kavin.piped.utils.resp.StackTraceResponse;
import me.kavin.piped.utils.resp.SubscriptionUpdateRequest;
import me.kavin.piped.utils.resp.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.hibernate.Session;
@ -289,7 +286,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
})).map(GET, "/feed/unauthenticated", AsyncServlet.ofBlocking(executor, request -> {
try {
return getJsonResponse(FeedHandlers.unauthenticatedFeedResponse(
Objects.requireNonNull(request.getQueryParameter("channels")).split(",")
getArray(request.getQueryParameter("channels"))
), "public, s-maxage=120");
} catch (Exception e) {
return getErrorResponse(e, request.getPath());
@ -297,7 +294,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
})).map(GET, "/feed/unauthenticated/rss", AsyncServlet.ofBlocking(executor, request -> {
try {
return getRawResponse(FeedHandlers.unauthenticatedFeedResponseRSS(
Objects.requireNonNull(request.getQueryParameter("channels")).split(",")
getArray(request.getQueryParameter("channels"))
), "application/atom+xml", "public, s-maxage=120");
} catch (Exception e) {
return getErrorResponse(e, request.getPath());
@ -409,6 +406,15 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
return new CustomServletDecorator(router);
}
private static String[] getArray(String s) {
if (s == null) {
ExceptionHandler.throwErrorResponse(new InvalidRequestResponse());
}
return s.split(",");
}
@Override
protected Module getOverrideModule() {
return new AbstractModule() {