summaryrefslogtreecommitdiff
path: root/src/portal/py/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/portal/py/modules')
-rw-r--r--src/portal/py/modules/__init__.py8
-rw-r--r--src/portal/py/modules/youtube.py5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/portal/py/modules/__init__.py b/src/portal/py/modules/__init__.py
index c44e571..cc34b82 100644
--- a/src/portal/py/modules/__init__.py
+++ b/src/portal/py/modules/__init__.py
@@ -14,11 +14,11 @@ ALL_MODULES = {
# config.TWITTER_ACCESS_TOKEN, config.TWITTER_ACCESS_TOKEN_SECRET,
# config.TWITTER_CONSUMER_TOKEN, config.TWITTER_CONSUMER_TOKEN_SECRET), []),
# 'twitter': (TwitterScrapeModule(config.TWITTER_COOKIES_PATH), []),
- 'pixiv_web': (PixivWebModule(config.PIXIV_SESSID, config.PIXIV_USERID), []),
+# 'pixiv_web': (PixivWebModule(config.PIXIV_SESSID, config.PIXIV_USERID), []),
# 'pixiv_app': (PixivAppModule(config.PIXIV_REFRESH_TOKEN), []),
'fanbox': (FanboxModule(config.FANBOX_SESSID, config.FANBOX_CF_CLEARANCE), []),
- 'instagram': (InstagramModule(
- config.INSTAGRAM_USER_AGENT, config.INSTAGRAM_SETTINGS_PATH,
- config.INSTAGRAM_SESSION_ID), []),
+# 'instagram': (InstagramModule(
+# config.INSTAGRAM_USER_AGENT, config.INSTAGRAM_SETTINGS_PATH,
+# config.INSTAGRAM_SESSION_ID), []),
# 'patreon': (PatreonModule(config.PATREON_SESSION_ID, config.PATREON_UUID, config.PATREON_USER_ID), [])
}
diff --git a/src/portal/py/modules/youtube.py b/src/portal/py/modules/youtube.py
index 5125f85..582a16c 100644
--- a/src/portal/py/modules/youtube.py
+++ b/src/portal/py/modules/youtube.py
@@ -26,7 +26,8 @@ ydl_opts = {
'quiet': False,
'logger': YDLLogger(),
'cachedir': False,
- 'socket_timeout': 10
+ 'socket_timeout': 10,
+ 'extractor_args': {'youtube': {'skip': ['hls'], 'player_client': ['android_vr']}}
# 'cookiefile': ''
}
@@ -94,7 +95,7 @@ class YoutubeBase(Search):
if info.get('direct'):
url = info['url']
else:
- url = get_playback_url(info, video=True)
+ url = get_playback_url(info, video=False)
if not url:
return False
unique_id = f'youtube:v:{info['id']}'