Merge pull request #672 from gpchelkin/master

gpchelkin · Dec 18, 2022 · b42a32a · b42a32a
2 parents 2cb1829 + b1c1396
commit b42a32a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
         echo "$HOME/.poetry/bin" >> $GITHUB_PATH
         poetry config installer.parallel true
 
-    - name: Publish tagged release
+    - name: Publish release
       env:
         POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
       run: |

diff --git a/scdlbot/scdlbot.py b/scdlbot/scdlbot.py
@@ -395,9 +395,10 @@ def prepare_urls(self, message, mode=None, source_ip=None, proxy=None, apologize
 
         urls_dict = {}
         for url_item in urls:
-            url = url_item
-            # unshorten soundcloud.app.goo.gl and other links, but not tiktok or instagram:
-            if not ("tiktok" in url_item.host or "instagr" in url_item.host):
+            # unshorten soundcloud.app.goo.gl and other links, but not tiktok or instagram or youtube:
+            if "tiktok" in url_item.host or "instagr" in url_item.host or self.SITES["yt"] in url_item.host:
+                url = url_item
+            else:
                 try:
                     url = URL(
                         requests.head(
@@ -409,7 +410,7 @@ def prepare_urls(self, message, mode=None, source_ip=None, proxy=None, apologize
                         ).url
                     )
                 except:
-                    pass
+                    url = url_item
             url_text = url.to_text(True)
             # FIXME crutch:
             url_text = url_text.replace("m.soundcloud.com", "soundcloud.com")
@@ -576,6 +577,7 @@ def download_url_and_send(self, bot, url, direct_urls, chat_id, reply_to_message
                         },
                         # {'key': 'EmbedThumbnail',}, {'key': 'FFmpegMetadata',},
                     ],
+                    "noplaylist": True,
                 }
             if proxy:
                 ydl_opts["proxy"] = proxy