be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1162 from Stypox/fix-comment-description-npe 

Make getCommentText @Nonnull
This commit is contained in:
Tobi 2024-03-27 20:04:17 +01:00 committed by GitHub
parent adcc1f17ee c57016b79b
commit ad71864b23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java
View File

@ -13,7 +13,8 @@ import java.util.List;
public class CommentsInfoItem extends InfoItem { public class CommentsInfoItem extends InfoItem {
private String commentId; private String commentId;
private Description commentText; @Nonnull
private Description commentText = Description.EMPTY_DESCRIPTION;
private String uploaderName; private String uploaderName;
@Nonnull @Nonnull
private List<Image> uploaderAvatars = List.of(); private List<Image> uploaderAvatars = List.of();
@ -50,11 +51,12 @@ public class CommentsInfoItem extends InfoItem {
this.commentId = commentId; this.commentId = commentId;
} }
@Nonnull
public Description getCommentText() { public Description getCommentText() {
return commentText; return commentText;
} }
public void setCommentText(final Description commentText) { public void setCommentText(@Nonnull final Description commentText) {
this.commentText = commentText; this.commentText = commentText;
} }

1
extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java
View File

@ -45,6 +45,7 @@ public interface CommentsInfoItemExtractor extends InfoItemExtractor {
/** /**
* The text of the comment * The text of the comment
*/ */
@Nonnull
default Description getCommentText() throws ParsingException { default Description getCommentText() throws ParsingException {
return Description.EMPTY_DESCRIPTION; return Description.EMPTY_DESCRIPTION;
} }

1
extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsInfoItemExtractor.java
View File

@ -38,6 +38,7 @@ public class BandcampCommentsInfoItemExtractor implements CommentsInfoItemExtrac
return getUploaderAvatars(); return getUploaderAvatars();
} }
@Nonnull
@Override @Override
public Description getCommentText() throws ParsingException { public Description getCommentText() throws ParsingException {
return new Description(review.getString("why"), Description.PLAIN_TEXT); return new Description(review.getString("why"), Description.PLAIN_TEXT);

1
extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java
View File

@ -77,6 +77,7 @@ public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtrac
return new DateWrapper(parseDateFrom(textualUploadDate)); return new DateWrapper(parseDateFrom(textualUploadDate));
} }
@Nonnull
@Override @Override
public Description getCommentText() throws ParsingException { public Description getCommentText() throws ParsingException {
final String htmlText = JsonUtils.getString(item, "text"); final String htmlText = JsonUtils.getString(item, "text");

1
extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudCommentsInfoItemExtractor.java
View File

@ -29,6 +29,7 @@ public class SoundcloudCommentsInfoItemExtractor implements CommentsInfoItemExtr
return Objects.toString(json.getLong("id"), null); return Objects.toString(json.getLong("id"), null);
} }
@Nonnull
@Override @Override
public Description getCommentText() { public Description getCommentText() {
return new Description(json.getString("body"), Description.PLAIN_TEXT); return new Description(json.getString("body"), Description.PLAIN_TEXT);

1
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsInfoItemExtractor.java
View File

@ -184,6 +184,7 @@ public class YoutubeCommentsInfoItemExtractor implements CommentsInfoItemExtract
} }
} }
@Nonnull
@Override @Override
public Description getCommentText() throws ParsingException { public Description getCommentText() throws ParsingException {
try { try {