From ed5b5e64b34942750432cbfcb77042b74a11fe8a Mon Sep 17 00:00:00 2001
From: Parmjit Virk <pvirk@mts.net>
Date: Thu, 6 Sep 2018 18:42:23 -0500
Subject: [PATCH 1/4] [PornHub] Add support for non-verified pornstar videos

---
 youtube_dl/extractor/pornhub.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index 6782848d9..31ead787c 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -346,7 +346,7 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE):
 
 
 class PornHubUserVideosIE(PornHubPlaylistBaseIE):
-    _VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.com/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos'
+    _VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.com/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)'
     _TESTS = [{
         'url': 'http://www.pornhub.com/users/zoe_ph/videos/public',
         'info_dict': {
@@ -384,6 +384,29 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE):
     }, {
         'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload',
         'only_matching': True,
+    }, {
+        # default sorting as Most Recent Videos
+        'url': 'https://www.pornhub.com/pornstar/liz-vicious',
+        'info_dict': {
+            'id': 'liz-vicious',
+        },
+        'playlist_mincount': 118,
+    }, {
+        # Most Viewed Videos
+        'url': 'https://www.pornhub.com/pornstar/liz-vicious?o=mv',
+        'only_matching': True,
+    }, {
+        # Top Rated Videos
+        'url': 'https://www.pornhub.com/pornstar/liz-vicious?o=tr',
+        'only_matching': True,
+    }, {
+        # Longest Videos
+        'url': 'https://www.pornhub.com/pornstar/liz-vicious?o=lg',
+        'only_matching': True,
+    }, {
+        # Newest Videos
+        'url': 'https://www.pornhub.com/pornstar/liz-vicious?o=cm',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):

From 79e784c5a43c4905db9899116a94381ae8645d6d Mon Sep 17 00:00:00 2001
From: Parmjit Virk <pvirk@mts.net>
Date: Thu, 6 Sep 2018 18:49:18 -0500
Subject: [PATCH 2/4] [PornHub] Updated test url

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

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index 31ead787c..db4160fd1 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -348,7 +348,7 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE):
 class PornHubUserVideosIE(PornHubPlaylistBaseIE):
     _VALID_URL = r'https?://(?:[^/]+\.)?pornhub\.com/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)'
     _TESTS = [{
-        'url': 'http://www.pornhub.com/users/zoe_ph/videos/public',
+        'url': 'https://www.pornhub.com/model/zoe_ph/videos/upload',
         'info_dict': {
             'id': 'zoe_ph',
         },

From 67a4bdc7ab18d0b866599379b9d84416d8db2644 Mon Sep 17 00:00:00 2001
From: Parmjit Virk <pvirk@mts.net>
Date: Sat, 8 Sep 2018 18:22:21 -0500
Subject: [PATCH 3/4] [PornHub] Added explicit check for pagination

---
 youtube_dl/extractor/pornhub.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index db4160fd1..408424172 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -426,5 +426,7 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE):
             if not page_entries:
                 break
             entries.extend(page_entries)
+            if re.search(r'<button\s+id="moreDataBtn"|<link\s+rel="next"', webpage) is None:
+                break
 
         return self.playlist_result(entries, user_id)

From ac46ac1d35680433e4563aaf9de23d8b99ab34c5 Mon Sep 17 00:00:00 2001
From: Parmjit Virk <pvirk@mts.net>
Date: Sun, 9 Sep 2018 19:17:49 -0500
Subject: [PATCH 4/4] [PornHub] Added test

---
 youtube_dl/extractor/pornhub.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py
index 408424172..f1f308e68 100644
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@@ -384,6 +384,9 @@ class PornHubUserVideosIE(PornHubPlaylistBaseIE):
     }, {
         'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload',
         'only_matching': True,
+    }, {
+        'url': 'https://www.pornhub.com/model/zoe_ph',
+        'only_matching': True,
     }, {
         # default sorting as Most Recent Videos
         'url': 'https://www.pornhub.com/pornstar/liz-vicious',