Merge pull request #521 from B0pol/verified

Add uploader verified by service extraction

Author: B0pol

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java

@@ -40,4 +40,6 @@ public ChannelExtractor(StreamingService service, ListLinkHandler linkHandler) {
     public abstract String getParentChannelName() throws ParsingException;
     public abstract String getParentChannelUrl() throws ParsingException;
     public abstract String getParentChannelAvatarUrl() throws ParsingException;
+    public abstract boolean isVerified() throws ParsingException;
+
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java

@@ -27,7 +27,7 @@ public class ChannelInfoItem extends InfoItem {
     private String description;
     private long subscriberCount = -1;
     private long streamCount = -1;
-
+    private boolean verified = false;
 
     public ChannelInfoItem(int serviceId, String url, String name) {
         super(InfoType.CHANNEL, serviceId, url, name);
@@ -56,4 +56,12 @@ public long getStreamCount() {
     public void setStreamCount(long stream_count) {
         this.streamCount = stream_count;
     }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    public void setVerified(boolean verified) {
+        this.verified = verified;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java

@@ -27,5 +27,8 @@ public interface ChannelInfoItemExtractor extends InfoItemExtractor {
     String getDescription() throws ParsingException;
 
     long getSubscriberCount() throws ParsingException;
+
     long getStreamCount() throws ParsingException;
+
+    boolean isVerified() throws ParsingException;
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java

@@ -59,6 +59,12 @@ public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws Parsin
         } catch (Exception e) {
             addError(e);
         }
+        try {
+            resultItem.setVerified(extractor.isVerified());
+        } catch (Exception e) {
+            addError(e);
+        }
+
         return resultItem;
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItem.java

@@ -12,6 +12,7 @@ public class CommentsInfoItem extends InfoItem {
     private String uploaderName;
     private String uploaderAvatarUrl;
     private String uploaderUrl;
+    private boolean uploaderVerified;
     private String textualUploadDate;
     @Nullable
     private DateWrapper uploadDate;
@@ -103,4 +104,12 @@ public boolean isPinned() {
     public void setPinned(boolean pinned) {
         this.pinned = pinned;
     }
+
+    public void setUploaderVerified(boolean uploaderVerified) {
+        this.uploaderVerified = uploaderVerified;
+    }
+
+    public boolean isUploaderVerified() {
+        return uploaderVerified;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfoItemExtractor.java

@@ -53,4 +53,9 @@ public interface CommentsInfoItemExtractor extends InfoItemExtractor {
      * Whether the comment is pinned
      */
     boolean isPinned() throws ParsingException;
+
+    /**
+     * Whether the uploader is verified by the service
+     */
+    boolean isUploaderVerified() throws ParsingException;
 }

extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java

@@ -20,6 +20,7 @@ public PlaylistExtractor(StreamingService service, ListLinkHandler linkHandler)
     public abstract String getUploaderUrl() throws ParsingException;
     public abstract String getUploaderName() throws ParsingException;
     public abstract String getUploaderAvatarUrl() throws ParsingException;
+    public abstract boolean isUploaderVerified() throws ParsingException;
 
     public abstract long getStreamCount() throws ParsingException;
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java

@@ -4,7 +4,6 @@
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
-
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -17,9 +16,8 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
 
-import java.io.IOException;
-
 import javax.annotation.Nonnull;
+import java.io.IOException;
 
 public class MediaCCCConferenceExtractor extends ChannelExtractor {
     private JsonObject conferenceData;
@@ -69,6 +67,11 @@ public String getParentChannelAvatarUrl() throws ParsingException {
         return "";
     }
 
+    @Override
+    public boolean isVerified() throws ParsingException {
+        return false;
+    }
+
     @Nonnull
     @Override
     public InfoItemsPage<StreamInfoItem> getInitialPage() {

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java

@@ -126,6 +126,11 @@ public String getUploaderName() throws ParsingException {
         return conference.getString("conference");
     }
 
+    @Override
+    public boolean isUploaderVerified() throws ParsingException {
+        return false;
+    }
+
     @Nonnull
     @Override
     public String getUploaderAvatarUrl() {
@@ -180,7 +185,7 @@ public List<AudioStream> getAudioStreams() throws IOException, ExtractionExcepti
         for (int s = 0; s < room.getArray("streams").size(); s++) {
             final JsonObject stream = room.getArray("streams").getObject(s);
             if (stream.getString("type").equals("audio")) {
-                for (final String type :stream.getObject("urls").keySet()) {
+                for (final String type : stream.getObject("urls").keySet()) {
                     final JsonObject url = stream.getObject("urls").getObject(type);
                     audioStreams.add(new AudioStream(url.getString("url"), MediaFormat.getFromSuffix(type), -1));
                 }
@@ -197,7 +202,7 @@ public List<VideoStream> getVideoStreams() throws IOException, ExtractionExcepti
             if (stream.getString("type").equals("video")) {
                 final String resolution = stream.getArray("videoSize").getInt(0) + "x"
                         + stream.getArray("videoSize").getInt(1);
-                for (final String type :stream.getObject("urls").keySet()) {
+                for (final String type : stream.getObject("urls").keySet()) {
                     if (!type.equals("hls")) {
                         final JsonObject url = stream.getObject("urls").getObject(type);
                         videoStreams.add(new VideoStream(
@@ -218,7 +223,7 @@ public List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionExc
 
     @Nonnull
     @Override
-    public List<SubtitlesStream> getSubtitlesDefault(){
+    public List<SubtitlesStream> getSubtitlesDefault() {
         return Collections.emptyList();
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamKioskExtractor.java

@@ -73,6 +73,11 @@ public String getUploaderUrl() throws ParsingException {
         return "https://media.ccc.de/c/" + conferenceInfo.getString("slug");
     }
 
+    @Override
+    public boolean isUploaderVerified() throws ParsingException {
+        return false;
+    }
+
     @Nullable
     @Override
     public String getTextualUploadDate() throws ParsingException {