From b0a441f1e37add81874726a9b01e6266472e36c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Fri, 19 Jan 2024 19:34:16 +0100
Subject: [PATCH] [nitter] remove 'nitter.lacontrevoie.fr'

"Fermeture de Nitter / Closing down Nitter"
---
 docs/supportedsites.md               |  6 ---
 gallery_dl/extractor/nitter.py       |  4 --
 test/results/nitter1d4us.py          | 35 +++++++++++++
 test/results/nitterlacontrevoiefr.py | 73 ----------------------------
 4 files changed, 35 insertions(+), 83 deletions(-)
 delete mode 100644 test/results/nitterlacontrevoiefr.py

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 1f9602ad..ba9e5b91 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -1293,12 +1293,6 @@ Consider all listed sites to potentially be NSFW.
     <td>Media Files, Replies, Search Results, Tweets</td>
     <td></td>
 </tr>
-<tr>
-    <td>Nitter.lacontrevoie.fr</td>
-    <td>https://nitter.lacontrevoie.fr/</td>
-    <td>Media Files, Replies, Search Results, Tweets</td>
-    <td></td>
-</tr>
 <tr>
     <td>Nitter.1d4.us</td>
     <td>https://nitter.1d4.us/</td>
diff --git a/gallery_dl/extractor/nitter.py b/gallery_dl/extractor/nitter.py
index bc7b308b..d36f5098 100644
--- a/gallery_dl/extractor/nitter.py
+++ b/gallery_dl/extractor/nitter.py
@@ -235,10 +235,6 @@ BASE_PATTERN = NitterExtractor.update({
         "root": "https://nitter.net",
         "pattern": r"nitter\.net",
     },
-    "nitter.lacontrevoie.fr": {
-        "root": "https://nitter.lacontrevoie.fr",
-        "pattern": r"nitter\.lacontrevoie\.fr",
-    },
     "nitter.1d4.us": {
         "root": "https://nitter.1d4.us",
         "pattern": r"nitter\.1d4\.us",
diff --git a/test/results/nitter1d4us.py b/test/results/nitter1d4us.py
index b816b44f..a54f8cbb 100644
--- a/test/results/nitter1d4us.py
+++ b/test/results/nitter1d4us.py
@@ -57,4 +57,39 @@ You’ll be able to receive four Galarian form Pokémon with Hidden Abilities, p
     "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/nitterlacontrevoiefr.py b/test/results/nitterlacontrevoiefr.py
deleted file mode 100644
index b2a81ec1..00000000
--- a/test/results/nitterlacontrevoiefr.py
+++ /dev/null
@@ -1,73 +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.lacontrevoie.fr/supernaturepics",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "tweets"),
-    "#class"   : nitter.NitterTweetsExtractor,
-    "#pattern" : r"https://nitter\.lacontrevoie\.fr/pic/orig/media%2FCGMNYZvW0AIVoom\.jpg",
-    "#range"   : "1",
-    "#sha1_url": "54f4b55f2099dcc248f3fb7bfacf1349e08d8e2d",
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/supernaturepics/with_replies",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "replies"),
-    "#class"   : nitter.NitterRepliesExtractor,
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/supernaturepics/media",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "media"),
-    "#class"   : nitter.NitterMediaExtractor,
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/supernaturepics/search",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "search"),
-    "#class"   : nitter.NitterSearchExtractor,
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/i/status/894001459754180609",
-    "#comment" : "4 images",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "tweet"),
-    "#class"   : nitter.NitterTweetExtractor,
-    "#sha1_url": "9c51b3a4a1114535eb9b168bba97ad95db0d59ff",
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/i/status/1065692031626829824",
-    "#comment" : "video",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "tweet"),
-    "#class"   : nitter.NitterTweetExtractor,
-    "#pattern" : r"ytdl:https://nitter\.lacontrevoie\.fr/video/[0-9A-F]{10,}/https%3A%2F%2Fvideo.twimg.com%2Fext_tw_video%2F1065691868439007232%2Fpu%2Fpl%2Fnv8hUQC1R0SjhzcZ.m3u8%3Ftag%3D5",
-
-    "extension": "mp4",
-    "filename" : "nv8hUQC1R0SjhzcZ",
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/i/status/1460044411165888515",
-    "#comment" : "deleted quote tweet (#2225)",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "tweet"),
-    "#class"   : nitter.NitterTweetExtractor,
-    "#count"   : 0,
-},
-
-{
-    "#url"     : "https://nitter.lacontrevoie.fr/i/status/1486373748911575046",
-    "#comment" : "'Misleading' content",
-    "#category": ("nitter", "nitter.lacontrevoie.fr", "tweet"),
-    "#class"   : nitter.NitterTweetExtractor,
-    "#count"   : 4,
-},
-
-)