diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 39e1c010..0bc38b32 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -430,7 +430,7 @@ Consider all listed sites to potentially be NSFW. Instagram https://www.instagram.com/ - Avatars, Collections, Followed Users, Guides, Highlights, Posts, User Profile Data, Reels, Saved Posts, Stories, Tag Searches, Tagged Posts, User Profiles + Avatars, Collections, Followed Users, Guides, Highlights, User Profile Information, Posts, Reels, Saved Posts, Stories, Tag Searches, Tagged Posts, User Profiles Cookies @@ -898,7 +898,7 @@ Consider all listed sites to potentially be NSFW. Twitter https://x.com/ - Avatars, Backgrounds, Bookmarks, Communities, Events, Followed Users, Hashtags, individual Images, Likes, Lists, List Members, Media Timelines, User Profile Data, Quotes, Search Results, Timelines, Tweets, User Profiles + Avatars, Backgrounds, Bookmarks, Communities, Events, Followed Users, Hashtags, individual Images, User Profile Information, Likes, Lists, List Members, Media Timelines, Quotes, Search Results, Timelines, Tweets, User Profiles Supported diff --git a/gallery_dl/extractor/instagram.py b/gallery_dl/extractor/instagram.py index 7cf315d0..4778edb2 100644 --- a/gallery_dl/extractor/instagram.py +++ b/gallery_dl/extractor/instagram.py @@ -596,11 +596,11 @@ class InstagramTagExtractor(InstagramExtractor): return self.api.tags_media(self.item) -class InstagramProfileExtractor(InstagramExtractor): +class InstagramInfoExtractor(InstagramExtractor): """Extractor for an Instagram user's profile data""" - subcategory = "profile" - pattern = USER_PATTERN + r"/profile" - example = "https://www.instagram.com/USER/profile/" + subcategory = "info" + pattern = USER_PATTERN + r"/info" + example = "https://www.instagram.com/USER/info/" def items(self): screen_name = self.item diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 52899c11..9fa5b3f3 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -924,11 +924,11 @@ class TwitterQuotesExtractor(TwitterExtractor): yield Message.Queue, url, data -class TwitterProfileExtractor(TwitterExtractor): - """Extractor a user's profile data""" - subcategory = "profile" - pattern = BASE_PATTERN + r"/(?!search)([^/?#]+)/profile" - example = "https://x.com/USER/profile" +class TwitterInfoExtractor(TwitterExtractor): + """Extractor for a user's profile data""" + subcategory = "info" + pattern = BASE_PATTERN + r"/(?!search)([^/?#]+)/info" + example = "https://x.com/USER/info" def items(self): api = TwitterAPI(self) diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 0d142fb4..3ab86f62 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -161,12 +161,12 @@ SUBCATEGORY_MAP = { "home" : "Home Feed", "image" : "individual Images", "index" : "Site Index", + "info" : "User Profile Information", "issue" : "Comic Issues", "manga" : "Manga", "media" : "Media Files", "note" : "Images from Notes", "popular": "Popular Images", - "profile": "User Profile Data", "recent" : "Recent Images", "search" : "Search Results", "status" : "Images from Statuses", diff --git a/test/results/instagram.py b/test/results/instagram.py index 2462ee1e..f04da380 100644 --- a/test/results/instagram.py +++ b/test/results/instagram.py @@ -133,9 +133,10 @@ __tests__ = ( }, { - "#url" : "https://www.instagram.com/instagram/profile", - "#category": ("", "instagram", "profile"), - "#class" : instagram.InstagramProfileExtractor, + "#url" : "https://www.instagram.com/instagram/info", + "#category": ("", "instagram", "info"), + "#class" : instagram.InstagramInfoExtractor, + "#auth" : False, }, { diff --git a/test/results/twitter.py b/test/results/twitter.py index 7f748a9a..7c3a4753 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -637,6 +637,12 @@ The Washington Post writes, "Three weeks after the toxic train derailment in Ohi "#urls" : "https://x.com/search?q=quoted_tweet_id:1263832915173048321", }, +{ + "#url" : "https://twitter.com/supernaturepics/info", + "#category": ("", "twitter", "info"), + "#class" : twitter.TwitterInfoExtractor, +}, + { "#url" : "https://twitter.com/supernaturepics/photo", "#category": ("", "twitter", "avatar"),