diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelExtractor.java index f1c01a23..31cdd0f8 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelExtractor.java @@ -224,7 +224,7 @@ public void collectVideos( JsonArray results ) throws ParsingException { for (int i = 0; i < results.size(); i++) { - collector.commit(new BilibiliChannelInfoItemClientAPIExtractor(results.getObject(i), extractor.getName(), extractor.getAvatarUrl())); + collector.commit(new BilibiliChannelInfoItemClientAPIExtractor(results.getObject(i), extractor.getAvatarUrl())); } } @@ -312,7 +312,7 @@ public void collectVideos( JsonArray results ) throws ParsingException { for (int i = 0; i < results.size(); i++) { - collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), extractor.getName(), extractor.getAvatarUrl())); + collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), null, null)); } } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java index 5139bb7a..87da316d 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemClientAPIExtractor.java @@ -20,12 +20,10 @@ public class BilibiliChannelInfoItemClientAPIExtractor implements StreamInfoItemExtractor { protected final JsonObject item; - public String name; - public String face; + private final String face; - public BilibiliChannelInfoItemClientAPIExtractor(final JsonObject json, String name, String face) { + public BilibiliChannelInfoItemClientAPIExtractor(final JsonObject json, String face) { item = json; - this.name = name; this.face = face; } @@ -64,7 +62,7 @@ public long getViewCount() throws ParsingException { @Override public String getUploaderName() throws ParsingException { - return name; + return item.getString("author"); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java index f14ac9cf..bd6a274a 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliChannelInfoItemWebAPIExtractor.java @@ -19,8 +19,8 @@ public class BilibiliChannelInfoItemWebAPIExtractor implements StreamInfoItemExtractor { protected final JsonObject item; - public String name; - public String face; + private final String name; + private final String face; public BilibiliChannelInfoItemWebAPIExtractor(final JsonObject json, String name, String face) { item = json; @@ -63,7 +63,7 @@ public long getViewCount() throws ParsingException { @Override public String getUploaderName() throws ParsingException { - return name; + return Optional.of(item.getString("author")).orElse(name); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliPlaylistExtractor.java index 9bd08dde..cd518cff 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliPlaylistExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bilibili/extractors/BilibiliPlaylistExtractor.java @@ -97,7 +97,7 @@ public InfoItemsPage getPage(Page page) throws IOException, Extr } final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId()); for (int i = 0; i < results.size(); i++) { - collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), page.getUrl().split("username=")[1], null)); + collector.commit(new BilibiliChannelInfoItemWebAPIExtractor(results.getObject(i), getUploaderName(), getUploaderAvatarUrl())); } return new InfoItemsPage<>(collector, new Page(utils.getNextPageFromCurrentUrl(page.getUrl(), type.equals("seasons_archives") ? "page_num" : "pn", 1), getDefaultCookies())); }