From 31133b97fbde413a4c6d8e385ea83e9a436b1213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 2 Jun 2024 02:11:42 +0200 Subject: [PATCH] [nitter] remove instances --- docs/supportedsites.md | 34 ---------- gallery_dl/extractor/nitter.py | 20 ------ test/results/nitter1d4us.py | 95 --------------------------- test/results/nitterit.py | 18 ------ test/results/nitterkavinrocks.py | 46 ------------- test/results/nitternet.py | 107 ------------------------------- test/results/nitterunixfoxeu.py | 53 --------------- 7 files changed, 373 deletions(-) delete mode 100644 test/results/nitter1d4us.py delete mode 100644 test/results/nitterit.py delete mode 100644 test/results/nitterkavinrocks.py delete mode 100644 test/results/nitternet.py delete mode 100644 test/results/nitterunixfoxeu.py diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 573559c2..64fecde9 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1272,40 +1272,6 @@ Consider all listed sites to potentially be NSFW. Required - - Nitter Instances - - - Nitter.net - https://nitter.net/ - Media Files, Replies, Search Results, Tweets - - - - Nitter.1d4.us - https://nitter.1d4.us/ - Media Files, Replies, Search Results, Tweets - - - - Nitter.kavin.rocks - https://nitter.kavin.rocks/ - Media Files, Replies, Search Results, Tweets - - - - Nitter.unixfox.eu - https://nitter.unixfox.eu/ - Media Files, Replies, Search Results, Tweets - - - - Nitter.it - https://nitter.it/ - Media Files, Replies, Search Results, Tweets - - - Philomena Instances diff --git a/gallery_dl/extractor/nitter.py b/gallery_dl/extractor/nitter.py index 2bce5976..cfc8861f 100644 --- a/gallery_dl/extractor/nitter.py +++ b/gallery_dl/extractor/nitter.py @@ -234,26 +234,6 @@ class NitterExtractor(BaseExtractor): BASE_PATTERN = NitterExtractor.update({ - "nitter.net": { - "root": "https://nitter.net", - "pattern": r"nitter\.net", - }, - "nitter.1d4.us": { - "root": "https://nitter.1d4.us", - "pattern": r"nitter\.1d4\.us", - }, - "nitter.kavin.rocks": { - "root": "https://nitter.kavin.rocks", - "pattern": r"nitter\.kavin\.rocks", - }, - "nitter.unixfox.eu": { - "root": "https://nitter.unixfox.eu", - "pattern": r"nitter\.unixfox\.eu", - }, - "nitter.it": { - "root": "https://nitter.it", - "pattern": r"nitter\.it", - }, }) USER_PATTERN = BASE_PATTERN + r"/(i(?:/user/|d:)(\d+)|[^/?#]+)" diff --git a/test/results/nitter1d4us.py b/test/results/nitter1d4us.py deleted file mode 100644 index a54f8cbb..00000000 --- a/test/results/nitter1d4us.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import nitter - - -__tests__ = ( -{ - "#url" : "https://nitter.1d4.us/supernaturepics", - "#category": ("nitter", "nitter.1d4.us", "tweets"), - "#class" : nitter.NitterTweetsExtractor, - "#range" : "1", - - "user": {"id": "2976459548"}, -}, - -{ - "#url" : "https://nitter.1d4.us/supernaturepics/with_replies", - "#category": ("nitter", "nitter.1d4.us", "replies"), - "#class" : nitter.NitterRepliesExtractor, -}, - -{ - "#url" : "https://nitter.1d4.us/supernaturepics/media", - "#category": ("nitter", "nitter.1d4.us", "media"), - "#class" : nitter.NitterMediaExtractor, -}, - -{ - "#url" : "https://nitter.1d4.us/supernaturepics/search", - "#category": ("nitter", "nitter.1d4.us", "search"), - "#class" : nitter.NitterSearchExtractor, -}, - -{ - "#url" : "https://nitter.1d4.us/playpokemon/status/1263832915173048321", - "#comment" : "content with emoji, newlines, hashtags (#338)", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - - "content": r"""re:Gear up for #PokemonSwordShieldEX with special Mystery Gifts! \n -You’ll be able to receive four Galarian form Pokémon with Hidden Abilities, plus some very useful items. It’s our \(Mystery\) Gift to you, Trainers! \n -❓🎁➡️ """, -}, - -{ - "#url" : "https://nitter.1d4.us/StobiesGalaxy/status/1270755918330896395", - "#comment" : "quoted tweet (#526, #854)", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#pattern" : r"https://nitter\.1d4\.us/pic/orig/enc/bWVkaWEvRWFL\w+LmpwZw==", - "#count" : 4, - - "filename": r"re:EaK.{12}", -}, - -{ - "#url" : "https://nitter.1d4.us/i/status/894001459754180609", - "#comment" : "4 images", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#sha1_url": "bc6a91792ff6ec3ab9046f4f27299cc0e7ca7ce3", -}, - -{ - "#url" : "https://nitter.1d4.us/i/status/1065692031626829824", - "#comment" : "video", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#pattern" : r"ytdl:https://nitter\.1d4\.us/video/enc/F00083CDE8D74/aHR0cHM6Ly92aWRlby50d2ltZy5jb20vZXh0X3R3X3ZpZGVvLzEwNjU2OTE4Njg0MzkwMDcyMzIvcHUvcGwvbnY4aFVRQzFSMFNqaHpjWi5tM3U4P3RhZz01", - - "extension": "mp4", - "filename" : "nv8hUQC1R0SjhzcZ", -}, - -{ - "#url" : "https://nitter.1d4.us/i/status/1460044411165888515", - "#comment" : "deleted quote tweet (#2225)", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#count" : 0, -}, - -{ - "#url" : "https://nitter.1d4.us/i/status/1486373748911575046", - "#comment" : "'Misleading' content", - "#category": ("nitter", "nitter.1d4.us", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#count" : 4, -}, - -) diff --git a/test/results/nitterit.py b/test/results/nitterit.py deleted file mode 100644 index 79d6937f..00000000 --- a/test/results/nitterit.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import nitter - - -__tests__ = ( -{ - "#url" : "https://nitter.it/POTUS/status/1639409307878928384", - "#category": ("nitter", "nitter.it", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#count" : 0, -}, - -) diff --git a/test/results/nitterkavinrocks.py b/test/results/nitterkavinrocks.py deleted file mode 100644 index 22a72e2e..00000000 --- a/test/results/nitterkavinrocks.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import nitter - - -__tests__ = ( -{ - "#url" : "https://nitter.kavin.rocks/id:2976459548", - "#category": ("nitter", "nitter.kavin.rocks", "tweets"), - "#class" : nitter.NitterTweetsExtractor, -}, - -{ - "#url" : "https://nitter.kavin.rocks/id:2976459548/with_replies", - "#category": ("nitter", "nitter.kavin.rocks", "replies"), - "#class" : nitter.NitterRepliesExtractor, -}, - -{ - "#url" : "https://nitter.kavin.rocks/id:2976459548/media", - "#category": ("nitter", "nitter.kavin.rocks", "media"), - "#class" : nitter.NitterMediaExtractor, - "#pattern" : r"https://nitter\.kavin\.rocks/pic/orig/media%2F[\w-]+\.(jpg|png)$", - "#range" : "1-20", -}, - -{ - "#url" : "https://nitter.kavin.rocks/id:2976459548/search", - "#category": ("nitter", "nitter.kavin.rocks", "search"), - "#class" : nitter.NitterSearchExtractor, -}, - -{ - "#url" : "https://nitter.kavin.rocks/ed1conf/status/1163841619336007680", - "#comment" : "Nitter tweet (#890)", - "#category": ("nitter", "nitter.kavin.rocks", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#sha1_url" : "e115bd1c86c660064e392b05269bbcafcd8c8b7a", - "#sha1_content": "f29501e44d88437fe460f5c927b7543fda0f6e34", -}, - -) diff --git a/test/results/nitternet.py b/test/results/nitternet.py deleted file mode 100644 index 31786a37..00000000 --- a/test/results/nitternet.py +++ /dev/null @@ -1,107 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import nitter -import datetime - - -__tests__ = ( -{ - "#url" : "https://nitter.net/supernaturepics", - "#category": ("nitter", "nitter.net", "tweets"), - "#class" : nitter.NitterTweetsExtractor, - "#pattern" : r"https://nitter\.net/pic/orig/media%2F[\w-]+\.(jpg|png)$", - "#range" : "1-20", - "#count" : 20, - - "author" : { - "name": "supernaturepics", - "nick": "Nature Pictures", - }, - "comments": int, - "content" : str, - "count" : 1, - "date" : datetime.datetime, - "likes" : int, - "quotes" : int, - "retweets": int, - "tweet_id": r"re:\d+", - "user" : { - "date" : "dt:2015-01-12 10:25:00", - "description" : "The very best nature pictures.", - "favourites_count": int, - "followers_count" : int, - "friends_count" : int, - "id" : "2976459548", - "name" : "supernaturepics", - "nick" : "Nature Pictures", - "profile_banner" : "https://nitter.net/pic/https%3A%2F%2Fpbs.twimg.com%2Fprofile_banners%2F2976459548%2F1421058583%2F1500x500", - "profile_image" : "https://nitter.net/pic/pbs.twimg.com%2Fprofile_images%2F554585280938659841%2FFLVAlX18.jpeg", - "statuses_count" : 1568, - "verified" : False, - }, -}, - -{ - "#url" : "https://nitter.net/supernaturepics/with_replies", - "#category": ("nitter", "nitter.net", "replies"), - "#class" : nitter.NitterRepliesExtractor, - "#pattern" : r"https://nitter\.net/pic/orig/media%2F[\w-]+\.(jpg|png)$", - "#range" : "1-20", -}, - -{ - "#url" : "https://nitter.net/supernaturepics/media", - "#category": ("nitter", "nitter.net", "media"), - "#class" : nitter.NitterMediaExtractor, - "#pattern" : r"https://nitter\.net/pic/orig/media%2F[\w-]+\.(jpg|png)$", - "#range" : "1-20", -}, - -{ - "#url" : "https://nitter.net/supernaturepics/search", - "#category": ("nitter", "nitter.net", "search"), - "#class" : nitter.NitterSearchExtractor, - "#pattern" : r"https://nitter\.net/pic/orig/media%2F[\w-]+\.(jpg|png)$", - "#range" : "1-20", -}, - -{ - "#url" : "https://nitter.net/supernaturepics/status/604341487988576256", - "#category": ("nitter", "nitter.net", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#sha1_url" : "3f2b64e175bf284aa672c3bb53ed275e470b919a", - "#sha1_content": "ab05e1d8d21f8d43496df284d31e8b362cd3bcab", - - "comments" : int, - "content" : "Big Wedeene River, Canada", - "count" : 1, - "date" : "dt:2015-05-29 17:40:00", - "extension": "jpg", - "filename" : "CGMNYZvW0AIVoom", - "likes" : int, - "num" : 1, - "quotes" : int, - "retweets" : int, - "tweet_id" : "604341487988576256", - "url" : "https://nitter.net/pic/orig/media%2FCGMNYZvW0AIVoom.jpg", - "user" : { - "name": "supernaturepics", - "nick": "Nature Pictures", - }, -}, - -{ - "#url" : "https://nitter.net/StobiesGalaxy/status/1270755918330896395", - "#comment" : "'quoted' option (#854)", - "#category": ("nitter", "nitter.net", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#options" : {"quoted": True}, - "#pattern" : r"https://nitter\.net/pic/orig/media%2FEa[KG].+\.jpg", - "#count" : 8, -}, - -) diff --git a/test/results/nitterunixfoxeu.py b/test/results/nitterunixfoxeu.py deleted file mode 100644 index d9b216e2..00000000 --- a/test/results/nitterunixfoxeu.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. - -from gallery_dl.extractor import nitter - - -__tests__ = ( -{ - "#url" : "https://nitter.unixfox.eu/supernaturepics", - "#category": ("nitter", "nitter.unixfox.eu", "tweets"), - "#class" : nitter.NitterTweetsExtractor, -}, - -{ - "#url" : "https://nitter.unixfox.eu/i/user/2976459548/with_replies", - "#category": ("nitter", "nitter.unixfox.eu", "replies"), - "#class" : nitter.NitterRepliesExtractor, -}, - -{ - "#url" : "https://nitter.unixfox.eu/i/user/2976459548/media", - "#category": ("nitter", "nitter.unixfox.eu", "media"), - "#class" : nitter.NitterMediaExtractor, -}, - -{ - "#url" : "https://nitter.unixfox.eu/i/user/2976459548/search", - "#category": ("nitter", "nitter.unixfox.eu", "search"), - "#class" : nitter.NitterSearchExtractor, -}, - -{ - "#url" : "https://nitter.unixfox.eu/i/web/status/1170041925560258560", - "#comment" : "Reply to deleted tweet (#403, #838)", - "#category": ("nitter", "nitter.unixfox.eu", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#pattern" : r"https://nitter\.unixfox\.eu/pic/orig/media%2FEDzS7VrU0AAFL4_\.jpg", -}, - -{ - "#url" : "https://nitter.unixfox.eu/mightbecurse/status/1492954264909479936", - "#comment" : "age-restricted (#2354)", - "#category": ("nitter", "nitter.unixfox.eu", "tweet"), - "#class" : nitter.NitterTweetExtractor, - "#count" : 1, - - "date": "dt:2022-02-13 20:10:00", -}, - -)