TeamPiped-mirror
/
Piped-Backend
mirror of https://github.com/TeamPiped/Piped-Backend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix feed validation errors (#155)

This commit is contained in:
Kavin 2021-12-25 16:46:39 +00:00 committed by GitHub
parent 49f439e761
commit 2923e1ec76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View File

@ -369,14 +369,16 @@ public class ResponseHelper {
feed.setFeedType("rss_2.0"); feed.setFeedType("rss_2.0");
feed.setTitle(info.getName()); feed.setTitle(info.getName());
feed.setAuthor(info.getUploaderName()); feed.setAuthor(info.getUploaderName());
feed.setLink(info.getUrl());
feed.setDescription(String.format("%s - Piped", info.getName())); feed.setDescription(String.format("%s - Piped", info.getName()));
feed.setLink(Constants.FRONTEND_URL + substringYouTube(info.getUrl()));
feed.setPublishedDate(new Date());
info.getRelatedItems().forEach(o -> { info.getRelatedItems().forEach(o -> {
StreamInfoItem item = o; StreamInfoItem item = o;
SyndEntry entry = new SyndEntryImpl(); SyndEntry entry = new SyndEntryImpl();
entry.setAuthor(item.getUploaderName()); entry.setAuthor(item.getUploaderName());
entry.setLink(item.getUrl()); entry.setLink(item.getUrl());
entry.setUri(item.getUrl());
entry.setTitle(item.getName()); entry.setTitle(item.getName());
entries.add(entry); entries.add(entry);
}); });
@ -797,6 +799,7 @@ public class ResponseHelper {
feed.setTitle("Piped - Feed"); feed.setTitle("Piped - Feed");
feed.setDescription(String.format("Piped's RSS subscription feed for %s.", user.getUsername())); feed.setDescription(String.format("Piped's RSS subscription feed for %s.", user.getUsername()));
feed.setUri(Constants.FRONTEND_URL + "/feed"); feed.setUri(Constants.FRONTEND_URL + "/feed");
feed.setPublishedDate(new Date());
if (user.getSubscribed() != null && !user.getSubscribed().isEmpty()) { if (user.getSubscribed() != null && !user.getSubscribed().isEmpty()) {
@ -823,6 +826,7 @@ public class ResponseHelper {
entry.setAuthors(Collections.singletonList(person)); entry.setAuthors(Collections.singletonList(person));
entry.setLink(Constants.FRONTEND_URL + "/watch?v=" + video.getId()); entry.setLink(Constants.FRONTEND_URL + "/watch?v=" + video.getId());
entry.setUri(Constants.FRONTEND_URL + "/watch?v=" + video.getId());
entry.setTitle(video.getTitle()); entry.setTitle(video.getTitle());
entry.setPublishedDate(new Date(video.getUploaded())); entry.setPublishedDate(new Date(video.getUploaded()));
entries.add(entry); entries.add(entry);
@ -1119,7 +1123,7 @@ public class ResponseHelper {
} }
private static final String substringYouTube(String s) { private static final String substringYouTube(String s) {
return s == null || s.isEmpty() ? null : StringUtils.substringAfter(s, "youtube.com"); return StringUtils.isEmpty(s) ? null : StringUtils.substringAfter(s, "youtube.com");
} }
private static StreamItem collectRelatedStream(Object o) { private static StreamItem collectRelatedStream(Object o) {