From e62e347794fdc1e34506b379b55643664540a704 Mon Sep 17 00:00:00 2001 From: taurhel Date: Wed, 19 Jun 2019 00:06:31 +0300 Subject: [PATCH] Instagram ripper renewed Hash extraction fixed 'switch' blocks code style fixed --- .../rarchives/ripme/ripper/rippers/InstagramRipper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java index f9b46218..0d5098ff 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java @@ -120,6 +120,8 @@ public class InstagramRipper extends AbstractJSONRipper { return "post_" + urlMatcher.group("shortcode"); case USER_PROFILE: return urlMatcher.group("username"); + default: + throw new RuntimeException("Reached unreachable"); } } } @@ -175,7 +177,7 @@ public class InstagramRipper extends AbstractJSONRipper { if ((storiesRip || pinnedReelRip) && href.contains("Consumer.js")) { pattern = Pattern.compile(storiesRegex); break; - } else if (href.contains("ProfilePageContainer") || href.contains("TagPageContainer")) { + } else if (href.contains("ProfilePageContainer.js") || href.contains("TagPageContainer.js")) { pattern = Pattern.compile(pinnedRip ? pinnedRegex : format(hashRegex, hashtagRip ? forHashtag : taggedRip ? forTagged : forUser)); break; @@ -357,8 +359,9 @@ public class InstagramRipper extends AbstractJSONRipper { JSONArray sideCar = getJsonArrayByPath(mediaItem, "edge_sidecar_to_children.edges"); return getStreamOfJsonArray(sideCar).map(object -> object.getJSONObject("node")) .flatMap(this::parseRootForUrls); + default: + return Stream.empty(); } - return Stream.empty(); } private String getVideoUrlFromPage(String videoID) {