merge #5511: [twitter] [furaffinity] match fixvx.com and fxfuraffinity/fxraffinity.net URLs

gallery_dl/extractor/furaffinity.py

@@ -11,7 +11,7 @@
 from .common import Extractor, Message
 from .. import text, util
 
-BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?furaffinity\.net"
+BASE_PATTERN = r"(?:https?://)?(?:www\.|sfw\.)?f(?:u|x|xfu)raffinity\.net"
 
 
 class FuraffinityExtractor(Extractor):

gallery_dl/extractor/twitter.py

@@ -16,7 +16,7 @@ import json
 import re
 
 BASE_PATTERN = (r"(?:https?://)?(?:www\.|mobile\.)?"
-                r"(?:(?:[fv]x)?twitter|(?:fixup)?x)\.com")
+                r"(?:(?:[fv]x)?twitter|(?:fix(?:up|v))?x)\.com")
 
 
 class TwitterExtractor(Extractor):

test/results/furaffinity.py

@@ -121,6 +121,18 @@ __tests__ = (
     "#class"   : furaffinity.FuraffinityPostExtractor,
 },
 
+{
+    "#url"     : "https://fxfuraffinity.net/view/21835115/",
+    "#category": ("", "furaffinity", "post"),
+    "#class"   : furaffinity.FuraffinityPostExtractor,
+},
+
+{
+    "#url"     : "https://fxraffinity.net/view/21835115/",
+    "#category": ("", "furaffinity", "post"),
+    "#class"   : furaffinity.FuraffinityPostExtractor,
+},
+
 {
     "#url"     : "https://sfw.furaffinity.net/view/21835115/",
     "#category": ("", "furaffinity", "post"),

test/results/twitter.py

@@ -60,6 +60,12 @@ __tests__ = (
     "#class"   : twitter.TwitterUserExtractor,
 },
 
+{
+    "#url"     : "https://fixvx.com/supernaturepics",
+    "#category": ("", "twitter", "user"),
+    "#class"   : twitter.TwitterUserExtractor,
+},
+
 {
     "#url"     : "https://x.com/supernaturepics",
     "#category": ("", "twitter", "user"),