From 7537e35b64b9aa6b7e4c7ee6e0b8c790065e9539 Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Tue, 28 Dec 2021 02:49:02 +0530
Subject: [PATCH] [gfycat] Fix `uploader`

---
 yt_dlp/extractor/gfycat.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/yt_dlp/extractor/gfycat.py b/yt_dlp/extractor/gfycat.py
index 18a30fe678..56a6dc03d3 100644
--- a/yt_dlp/extractor/gfycat.py
+++ b/yt_dlp/extractor/gfycat.py
@@ -24,9 +24,10 @@ class GfycatIE(InfoExtractor):
             'duration': 10.4,
             'view_count': int,
             'like_count': int,
-            'dislike_count': int,
             'categories': list,
             'age_limit': 0,
+            'uploader_id': 'anonymous',
+            'description': '',
         }
     }, {
         'url': 'http://gfycat.com/ifr/JauntyTimelyAmazontreeboa',
@@ -40,9 +41,27 @@ class GfycatIE(InfoExtractor):
             'duration': 3.52,
             'view_count': int,
             'like_count': int,
-            'dislike_count': int,
             'categories': list,
             'age_limit': 0,
+            'uploader_id': 'anonymous',
+            'description': '',
+        }
+    }, {
+        'url': 'https://gfycat.com/alienatedsolidgreathornedowl',
+        'info_dict': {
+            'id': 'alienatedsolidgreathornedowl',
+            'ext': 'mp4',
+            'upload_date': '20211226',
+            'uploader_id': 'reactions',
+            'timestamp': 1640536930,
+            'like_count': int,
+            'description': '',
+            'title': 'Ingrid Michaelson, Zooey Deschanel - Merry Christmas Happy New Year',
+            'categories': list,
+            'age_limit': 0,
+            'duration': 2.9583333333333335,
+            'uploader': 'Reaction GIFs',
+            'view_count': int,
         }
     }, {
         'url': 'https://gfycat.com/ru/RemarkableDrearyAmurstarfish',
@@ -74,7 +93,7 @@ def _real_extract(self, url):
         title = gfy.get('title') or gfy['gfyName']
         description = gfy.get('description')
         timestamp = int_or_none(gfy.get('createDate'))
-        uploader = gfy.get('userName')
+        uploader = gfy.get('userName') or gfy.get('username')
         view_count = int_or_none(gfy.get('views'))
         like_count = int_or_none(gfy.get('likes'))
         dislike_count = int_or_none(gfy.get('dislikes'))
@@ -114,7 +133,8 @@ def _real_extract(self, url):
             'title': title,
             'description': description,
             'timestamp': timestamp,
-            'uploader': uploader,
+            'uploader': gfy.get('userDisplayName') or uploader,
+            'uploader_id': uploader,
             'duration': duration,
             'view_count': view_count,
             'like_count': like_count,