Merge remote-tracking branch 'origin/master'

.gitpod.yml

@@ -0,0 +1,9 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+tasks:
+  - init: pip3 install -r requirements.txt
+  - init: sudo apt update && sudo apt install ffmpeg -y

app.json

@@ -29,7 +29,7 @@
   "formation": {
     "worker": {
       "quantity": 1,
-      "size": "free"
+      "size": "eco"
     }
   },
   "buildpacks": [
@@ -40,4 +40,4 @@
       "url": "https://github.com/jonathanong/heroku-buildpack-ffmpeg-latest.git"
     }
   ]
-}
+}

ytdlbot/downloader.py

@@ -170,8 +170,8 @@ def ytdl_download(url: str, tempdir: str, bm, **kwargs) -> list:
             "--split=16",
         ]
     formats = [
-        # webm and av01 are not streamable on telegram, so we'll extract mp4 and not av01 codec
-        "bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/bestvideo+bestaudio",
+        # webm , vp9 and av01 are not streamable on telegram, so we'll extract mp4 and not av01 codec
+        "bestvideo[ext=mp4][vcodec!*=av01][vcodec!*=vp09]+bestaudio[ext=m4a]/bestvideo+bestaudio",
         "bestvideo[vcodec^=avc]+bestaudio[acodec^=mp4a]/best[vcodec^=avc]/best",
         None,
     ]

ytdlbot/ytdl_bot.py

@@ -357,8 +357,10 @@ def link_checker(url: str) -> str:
 
     if (
         not PLAYLIST_SUPPORT
-        and re.findall(r"^https://www\.youtube\.com/channel/", Channel.extract_canonical_link(url))
-        or "list" in url
+        and (
+         re.findall(r"^https://www\.youtube\.com/channel/", Channel.extract_canonical_link(url))
+         or "list" in url
+        )
     ):
         return "Playlist or channel links are disabled."