mirrors/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend synced 2025-09-06 13:31:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE check for channel uploader.

Browse Source
This commit is contained in:
Kavin 2022-11-16 19:32:39 +00:00
parent 444d789987
commit 32f30e42f4
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
View File

@ -14,6 +14,7 @@ import me.kavin.piped.utils.ExceptionHandler;
import me.kavin.piped.utils.Multithreading; import me.kavin.piped.utils.Multithreading;
import me.kavin.piped.utils.obj.StreamItem; import me.kavin.piped.utils.obj.StreamItem;
import me.kavin.piped.utils.obj.SubscriptionChannel; import me.kavin.piped.utils.obj.SubscriptionChannel;
import me.kavin.piped.utils.obj.db.Channel;
import me.kavin.piped.utils.obj.db.UnauthenticatedSubscription; import me.kavin.piped.utils.obj.db.UnauthenticatedSubscription;
import me.kavin.piped.utils.obj.db.User; import me.kavin.piped.utils.obj.db.User;
import me.kavin.piped.utils.obj.db.Video; import me.kavin.piped.utils.obj.db.Video;
@ -436,8 +437,8 @@ public class FeedHandlers {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) {
CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaBuilder cb = s.getCriteriaBuilder();
var query = cb.createQuery(me.kavin.piped.utils.obj.db.Channel.class); var query = cb.createQuery(Channel.class);
var root = query.from(me.kavin.piped.utils.obj.db.Channel.class); var root = query.from(Channel.class);
var subquery = query.subquery(User.class); var subquery = query.subquery(User.class);
var subroot = subquery.from(User.class); var subroot = subquery.from(User.class);
@ -449,8 +450,8 @@ public class FeedHandlers {
List<SubscriptionChannel> subscriptionItems = s.createQuery(query) List<SubscriptionChannel> subscriptionItems = s.createQuery(query)
.stream().parallel() .stream().parallel()
.filter(Objects::nonNull) .filter(channel -> channel.getUploader() != null)
.sorted(Comparator.comparing(me.kavin.piped.utils.obj.db.Channel::getUploader, String.CASE_INSENSITIVE_ORDER)) .sorted(Comparator.comparing(Channel::getUploader, String.CASE_INSENSITIVE_ORDER))
.map(channel -> new SubscriptionChannel("/channel/" + channel.getUploaderId(), .map(channel -> new SubscriptionChannel("/channel/" + channel.getUploaderId(),
channel.getUploader(), rewriteURL(channel.getUploaderAvatar()), channel.isVerified())) channel.getUploader(), rewriteURL(channel.getUploaderAvatar()), channel.isVerified()))
.toList(); .toList();
@ -478,14 +479,15 @@ public class FeedHandlers {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) {
CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaBuilder cb = s.getCriteriaBuilder();
var query = cb.createQuery(me.kavin.piped.utils.obj.db.Channel.class); var query = cb.createQuery(Channel.class);
var root = query.from(me.kavin.piped.utils.obj.db.Channel.class); var root = query.from(Channel.class);
query.select(root); query.select(root);
query.where(root.get("uploader_id").in(filtered)); query.where(root.get("uploader_id").in(filtered));
List<SubscriptionChannel> subscriptionItems = s.createQuery(query) List<SubscriptionChannel> subscriptionItems = s.createQuery(query)
.stream().parallel() .stream().parallel()
.sorted(Comparator.comparing(me.kavin.piped.utils.obj.db.Channel::getUploader, String.CASE_INSENSITIVE_ORDER)) .filter(channel -> channel.getUploader() != null)
.sorted(Comparator.comparing(Channel::getUploader, String.CASE_INSENSITIVE_ORDER))
.map(channel -> new SubscriptionChannel("/channel/" + channel.getUploaderId(), .map(channel -> new SubscriptionChannel("/channel/" + channel.getUploaderId(),
channel.getUploader(), rewriteURL(channel.getUploaderAvatar()), channel.isVerified())) channel.getUploader(), rewriteURL(channel.getUploaderAvatar()), channel.isVerified()))
.toList(); .toList();