From 457c8a8d9e7fd3a718e56b98d8ebfa8e42cd2170 Mon Sep 17 00:00:00 2001
From: Jamil Karami <jamil_karami@hotmail.com>
Date: Mon, 20 Feb 2023 20:25:02 +0100
Subject: [PATCH] Incorporate review comments

---
 youtube_dl/extractor/kick.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/youtube_dl/extractor/kick.py b/youtube_dl/extractor/kick.py
index 31fd7a3bf..0c8d75276 100644
--- a/youtube_dl/extractor/kick.py
+++ b/youtube_dl/extractor/kick.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
+from ..utils import url_or_none, traverse_obj, strip_or_none, float_or_none, parse_iso8601, int_or_none
 
 
 class KickIE(InfoExtractor):
@@ -11,10 +12,12 @@ class KickIE(InfoExtractor):
         'md5': 'f052bc1046cd9ca6751925dd12420010',
         'info_dict': {
             'id': '82a3c11d-7a17-4747-aecb-2e61413eb11f',
-            'ext': 'm3u8',
+            'ext': 'mp4',
             'title': 'Weekly Stake Stream',
             'uploader': 'Eddie',
             'thumbnail': r're:^https?://.*\.jpg.*$',
+            'timestamp': 1676890314,
+            'upload_date': '20230220',
         }
     }
 
@@ -23,24 +26,28 @@ class KickIE(InfoExtractor):
 
         headers = {
             'Accept': 'application/json',
-            'User-Agent': 'Mozilla',
         }
 
         data = self._download_json('https://kick.com/api/v1/video/%s' % id, id, headers=headers)
 
-        video_url = data['source']
         formats = self._extract_m3u8_formats(
             data['source'], id, 'mp4')
         self._sort_formats(formats)
-        title = data['livestream']['session_title']
-        uploader = data['livestream']['channel']['user']['username']
-        thumbnail = data['livestream']['thumbnail']
+        livestream = data['livestream']
+        strip_lambda = lambda x: strip_or_none(x) or None
 
         return {
-            'url': video_url,
             'id': id,
-            'title': title,
-            'uploader': uploader,
-            'thumbnail': thumbnail,
             'formats': formats,
+            'title': livestream.get('session_title'),
+            'uploader': traverse_obj(livestream, ('channel', 'user', 'username'), expected_type=strip_lambda),
+            'thumbnail': url_or_none(livestream.get('thumbnail')),
+            'duration': float_or_none(data['livestream'].get('duration'), scale=1000),
+            'timestamp': traverse_obj(data, 'updated_at', 'created_at', expected_type=parse_iso8601),
+            'release_timestamp': parse_iso8601(data.get('created_at')),
+            'view_count': int_or_none(data.get('views')),
+            'is_live': data['livestream'].get('is_live'),
+            'channel': traverse_obj(data['livestream'], ('channel', 'slug'), expected_type=strip_lambda),
+            'categories': traverse_obj(data, ('categories', Ellipsis, 'name'), expected_type=strip_lambda) or None,
+            'tags': traverse_obj(data, ('categories', Ellipsis, 'tags', Ellipsis), expected_type=strip_lambda) or None,
         }