From 398c3d8c30df753e9954031c166507c1371817aa Mon Sep 17 00:00:00 2001
From: oxamun <123496932+oxamun@users.noreply.github.com>
Date: Tue, 9 Jul 2024 14:42:45 -0400
Subject: [PATCH 1/3] [tnaflix] fix detection issues with 'm'/'morigin'
 subdomains and localized urls

---
 yt_dlp/extractor/tnaflix.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/yt_dlp/extractor/tnaflix.py b/yt_dlp/extractor/tnaflix.py
index 22832e068..a1e854b55 100644
--- a/yt_dlp/extractor/tnaflix.py
+++ b/yt_dlp/extractor/tnaflix.py
@@ -221,7 +221,7 @@ class TNAEMPFlixBaseIE(TNAFlixNetworkBaseIE):
 
 
 class TNAFlixIE(TNAEMPFlixBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?(?P<host>tnaflix)\.com/[^/]+/(?P<display_id>[^/]+)/video(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:(morigin|m|www)\.)?(?P<host>tnaflix)\.com/(?:[^/]+/){1,2}(?P<display_id>[^/]+)/video(?P<id>\d+)'
 
     _TITLE_REGEX = r'<title>(.+?) - (?:TNAFlix Porn Videos|TNAFlix\.com)</title>'
 
@@ -234,6 +234,7 @@ class TNAFlixIE(TNAEMPFlixBaseIE):
             'display_id': 'Carmella-Decesare-striptease',
             'ext': 'mp4',
             'title': 'Carmella Decesare - striptease',
+            'description': 'No description provided',
             'thumbnail': r're:https?://.*\.jpg$',
             'duration': 91,
             'age_limit': 18,
@@ -252,7 +253,20 @@ class TNAFlixIE(TNAEMPFlixBaseIE):
             'thumbnail': r're:https?://.*\.jpg$',
             'duration': 164,
             'age_limit': 18,
-            'uploader': 'bobwhite39',
+            'categories': list,
+        },
+    }, {
+        'url': 'https://morigin.tnaflix.com/he/amateur-porn/Dirty-minded-girl-is-very-hot/video11310952',
+        'md5': 'b5a5da17899a3ab929586be5450f7adc',
+        'info_dict': {
+            'id': '11310952',
+            'display_id': 'Dirty-minded-girl-is-very-hot',
+            'ext': 'mp4',
+            'thumbnail': r're:https?://.*\.jpg$',
+            'age_limit': 18,
+            'title': 'Dirty minded girl is very hot',
+            'description': 'md5:69631ce458c36cd631be55121a9630f1',
+            'duration': 322,
             'categories': list,
         },
     }, {

From e7bf95b240333e5998ee7eb02e7661e39181fb21 Mon Sep 17 00:00:00 2001
From: oxamun <123496932+oxamun@users.noreply.github.com>
Date: Thu, 26 Dec 2024 22:48:31 -0500
Subject: [PATCH 2/3] Update yt_dlp/extractor/tnaflix.py

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
---
 yt_dlp/extractor/tnaflix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yt_dlp/extractor/tnaflix.py b/yt_dlp/extractor/tnaflix.py
index a1e854b55..8d02e29aa 100644
--- a/yt_dlp/extractor/tnaflix.py
+++ b/yt_dlp/extractor/tnaflix.py
@@ -221,7 +221,7 @@ class TNAEMPFlixBaseIE(TNAFlixNetworkBaseIE):
 
 
 class TNAFlixIE(TNAEMPFlixBaseIE):
-    _VALID_URL = r'https?://(?:(morigin|m|www)\.)?(?P<host>tnaflix)\.com/(?:[^/]+/){1,2}(?P<display_id>[^/]+)/video(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:(?:m(?:origin)?|www)\.)?(?P<host>tnaflix)\.com/(?:[^/?#]+/){1,2}(?P<display_id>[^/?#]+)/video(?P<id>\d+)'
 
     _TITLE_REGEX = r'<title>(.+?) - (?:TNAFlix Porn Videos|TNAFlix\.com)</title>'
 

From 801bccb0de0ee0127cf8ade031b9c1ff50079311 Mon Sep 17 00:00:00 2001
From: oxamun <123496932+oxamun@users.noreply.github.com>
Date: Thu, 26 Dec 2024 23:06:38 -0500
Subject: [PATCH 3/3] tnaflix no longer uses m subdomain

---
 yt_dlp/extractor/tnaflix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yt_dlp/extractor/tnaflix.py b/yt_dlp/extractor/tnaflix.py
index 8d02e29aa..20a03d710 100644
--- a/yt_dlp/extractor/tnaflix.py
+++ b/yt_dlp/extractor/tnaflix.py
@@ -221,7 +221,7 @@ class TNAEMPFlixBaseIE(TNAFlixNetworkBaseIE):
 
 
 class TNAFlixIE(TNAEMPFlixBaseIE):
-    _VALID_URL = r'https?://(?:(?:m(?:origin)?|www)\.)?(?P<host>tnaflix)\.com/(?:[^/?#]+/){1,2}(?P<display_id>[^/?#]+)/video(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:(morigin|www)\.)?(?P<host>tnaflix)\.com/(?:[^/?#]+/){1,2}(?P<display_id>[^/?#]+)/video(?P<id>\d+)'
 
     _TITLE_REGEX = r'<title>(.+?) - (?:TNAFlix Porn Videos|TNAFlix\.com)</title>'