diff --git a/.github/README.md b/.github/README.md index 91736ab1..2fdec092 100644 --- a/.github/README.md +++ b/.github/README.md @@ -6,4 +6,4 @@ ─「 ᴅᴇᴩʟᴏʏ ᴏɴ ʜᴇʀᴏᴋᴜ 」─ -
+ diff --git a/Dockerfile b/Dockerfile index 1d05a460..087ca82f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nikolaik/python-nodejs:python3.10-nodejs19 +FROM nikolaik/python-nodejs:python3.10-nodejs20 RUN apt-get update \ && apt-get install -y --no-install-recommends ffmpeg \ diff --git a/config.py b/config.py index 093e7883..91e8c3b7 100644 --- a/config.py +++ b/config.py @@ -1,4 +1,4 @@ -import re +kimport re from os import getenv from dotenv import load_dotenv @@ -16,7 +16,7 @@ # Get your mongo url from cloud.mongodb.com MONGO_DB_URI = getenv("MONGO_DB_URI", None) -DURATION_LIMIT_MIN = int(getenv("DURATION_LIMIT", 60)) +DURATION_LIMIT_MIN = int(getenv("DURATION_LIMIT", 17000)) # Chat id of a group for logging bot's activities LOGGER_ID = int(getenv("LOGGER_ID", None)) @@ -32,15 +32,15 @@ UPSTREAM_REPO = getenv( "UPSTREAM_REPO", - "https://github.com/TeamEspro/EsproMusicBot", + "https://github.com/WEREWOLF-DEMON/EsproMusicBotDemon", ) UPSTREAM_BRANCH = getenv("UPSTREAM_BRANCH", "master") GIT_TOKEN = getenv( "GIT_TOKEN", None ) # Fill this variable if your upstream repository is private -SUPPORT_CHANNEL = getenv("SUPPORT_CHANNEL", "https://t.me/EsproUpdate") -SUPPORT_CHAT = getenv("SUPPORT_CHAT", "https://t.me/EsproSupport") +SUPPORT_CHANNEL = getenv("SUPPORT_CHANNEL", "https://t.me/INNOCENT_SONGS") +SUPPORT_CHAT = getenv("SUPPORT_CHAT", "https://t.me/INNOCENT_SONGS") # Set this to True if you want the assistant to automatically leave chats after an interval AUTO_LEAVING_ASSISTANT = bool(getenv("AUTO_LEAVING_ASSISTANT", False)) diff --git a/cookies/cookies.txt b/cookies/cookies.txt new file mode 100644 index 00000000..730caf26 --- /dev/null +++ b/cookies/cookies.txt @@ -0,0 +1,21 @@ +# Netscape HTTP Cookie File +# http://curl.haxx.se/rfc/cookie_spec.html +# This is a generated file! Do not edit. + +.youtube.com TRUE / TRUE 1786200101 __Secure-1PSIDTS sidts-CjUB5H03Pw_RWoY8RtGnzKTAQaPoY8jhMYjYza8P7vYZHgUqSIoxSw1ZIHBj3Wby4wCwginOyhAA +.youtube.com TRUE / TRUE 1786200101 __Secure-3PSIDTS sidts-CjUB5H03Pw_RWoY8RtGnzKTAQaPoY8jhMYjYza8P7vYZHgUqSIoxSw1ZIHBj3Wby4wCwginOyhAA +.youtube.com TRUE / FALSE 1789224101 HSID ApGeHGxg5LG-w_pDp +.youtube.com TRUE / TRUE 1789224101 SSID AUbNyeGMkBCSj8H1H +.youtube.com TRUE / FALSE 1789224101 APISID 1Py_iTZooI-IUAfH/A9T2RnfBo5MrBej6O +.youtube.com TRUE / TRUE 1789224101 SAPISID PZktH4_MDGQgSNCr/A5_vS3UsFvahIk5NP +.youtube.com TRUE / TRUE 1789224101 __Secure-1PAPISID PZktH4_MDGQgSNCr/A5_vS3UsFvahIk5NP +.youtube.com TRUE / TRUE 1789224101 __Secure-3PAPISID PZktH4_MDGQgSNCr/A5_vS3UsFvahIk5NP +.youtube.com TRUE / FALSE 1789224101 SID g.a0000Aiva8PRIfHWYY9hf_1p3tklGO_99kqzrdXAgBJaSggsRoOZeCYxuoCuiH1yWpy6zndeqAACgYKAYISARESFQHGX2MiqolHa9CrXOhr2XNWnaxJGhoVAUF8yKrLP6bDXU_4_yXrR7DfteSC0076 +.youtube.com TRUE / TRUE 1789224101 __Secure-1PSID g.a0000Aiva8PRIfHWYY9hf_1p3tklGO_99kqzrdXAgBJaSggsRoOZaPbSJoyXhhyumEjeOB_r5gACgYKAVwSARESFQHGX2Miw52EMs8Bt6CeCDZ-VdMj8hoVAUF8yKqVv2NqAcinqp5mK62ed-5Z0076 +.youtube.com TRUE / TRUE 1789224101 __Secure-3PSID g.a0000Aiva8PRIfHWYY9hf_1p3tklGO_99kqzrdXAgBJaSggsRoOZfZulv12qainasQ1NszGpdgACgYKAXUSARESFQHGX2MiXXpmirGR1xHiy4eIFQHgbxoVAUF8yKreDlkCJi54LdurgpuI8b6-0076 +.youtube.com TRUE / TRUE 1789224102 LOGIN_INFO AFmmF2swRAIgT6sgihLX-PUkhu4V6k2XkyQsz8MTjQz4QmuF5pPlZ44CIEtJTxY-7yNzHQvQnuA7ZdmHXcduJ8U5k0jU2Jddl18t:QUQ3MjNmemw5SHlmRXF5UktWM2dXRERXN2pUNTJZUWk5UVRCbUE2eFB4U2lSZ190dmNPYnNMYW05aXZHX25qSW0xM0FxODlVQWk2bXl2SGZvUm1EZFhmbGxaSkpkeXVxQ1pHdldHWFVOeXgwYzB0cTh4dUpObWxNTmZWc3JOc0l1b1cxY1dob1hiYW9CUTNJX1djcEhta2ctQmFWV0Q4OU9B +.youtube.com TRUE / FALSE 1788122161 SIDCC AKEyXzV-mPRk8VtfTspNXg3SEhDHkoh16goIePOmGLzjhKeKiXJpFpGFett0vlX_GPUcf9Xf +.youtube.com TRUE / TRUE 1788122161 __Secure-1PSIDCC AKEyXzVyXMNg1s_Xyh8DtYDk4DdwMbnu8aQ6nOnrQNAcTawD1rA3ZjLEXCCJAnUVc6bhXRoc9g +.youtube.com TRUE / TRUE 1788122161 __Secure-3PSIDCC AKEyXzVkkOhuj2xmNl3DSnGrV82TJ0zNGWjQWGILQSvnSEx9aEIOuvIjsXp0H62gUZO5NGXV +.youtube.com TRUE / TRUE 1791146167 PREF f6=40000000&f7=100&tz=Asia.Calcutta&f5=20000 +.youtube.com TRUE / TRUE 1756586766 CONSISTENCY AKreu9s_qdEpDwbw9Y-NDqUUDo0DnrFpq516kEPibzyONCbeV1JNh50NLxzZH3yJvcEe9eyrIiPjfLub9H379neXkP-fw3DcjembBhqkSCVG5Ys-GN6rGgo2FYFb5EblWKxF75p85bHcPeQ diff --git a/cookies/example.txt b/cookies/example.txt deleted file mode 100644 index 9e8138c7..00000000 --- a/cookies/example.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Netscape HTTP Cookie File -# http://curl.haxx.se/rfc/cookie_spec.html -# This is a generated file! Do not edit. - -.youtube.com TRUE / TRUE 1773154907 PREF f6=40000000&tz=Asia.Calcutta&f7=100 -.youtube.com TRUE / TRUE 1738596562 GPS 1 -.youtube.com TRUE / TRUE 1770130906 __Secure-1PSIDTS sidts-CjEBmiPuTYpD03ZatyctWky0rpxIPNIS17eDuYs93AsXCNgy9njB9ialRM3QpBELUhMsEAA -.youtube.com TRUE / TRUE 1770130906 __Secure-3PSIDTS sidts-CjEBmiPuTYpD03ZatyctWky0rpxIPNIS17eDuYs93AsXCNgy9njB9ialRM3QpBELUhMsEAA -.youtube.com TRUE / FALSE 0 HSID AM8QI0wd2H1HcvM7m -.youtube.com TRUE / TRUE 0 SSID AiLOXCyd1E5ewNgwB -.youtube.com TRUE / FALSE 0 APISID ykvMFyuv2qVTlxq3/ACcHjP1NB5g9KiZG0 -.youtube.com TRUE / TRUE 0 SAPISID 8c-XLqnNNr9-vQyb/ARwlF1Jg9kACsA5U2 -.youtube.com TRUE / TRUE 0 __Secure-1PAPISID 8c-XLqnNNr9-vQyb/ARwlF1Jg9kACsA5U2 -.youtube.com TRUE / TRUE 0 __Secure-3PAPISID 8c-XLqnNNr9-vQyb/ARwlF1Jg9kACsA5U2 -.youtube.com TRUE / FALSE 0 SID g.a000tAiEzx_MqSuMIdetdY1gfhloDw-Ghqv04yWe7nCzQwPG0QYQgyCukgaG4XxsfkPePWQ3kwACgYKATISARQSFQHGX2MiEJu-cMIZ6jpylX32UD5SJBoVAUF8yKq7ZU0jHG_9JUeT3n1fC1_w0076 -.youtube.com TRUE / TRUE 0 __Secure-1PSID g.a000tAiEzx_MqSuMIdetdY1gfhloDw-Ghqv04yWe7nCzQwPG0QYQV5hk2DcRbQZF-4ro4cVliwACgYKAaoSARQSFQHGX2Mij196ZRX79DLX9W2aO0QIaBoVAUF8yKqLvfwFb_TYfsSKJF2_QuHi0076 -.youtube.com TRUE / TRUE 0 __Secure-3PSID g.a000tAiEzx_MqSuMIdetdY1gfhloDw-Ghqv04yWe7nCzQwPG0QYQjaFTUSLDcJPCgk8lMD-bsgACgYKAQMSARQSFQHGX2MiGKLf3_b3v26i8VVFAOGRehoVAUF8yKpZRfhYedwjnPcQWBvmliOS0076 -.youtube.com TRUE / TRUE 1773154907 LOGIN_INFO AFmmF2swRAIgCpG6pr_S3_4mZ86CR0oPptF3B6VNvEsaP76n3jFwmy4CIDh53-attvWgBLip6IptETIBePAVtwY-5h6QaEY84g7-:QUQ3MjNmeE1NczN0d2k1OWYxSTRqSVMtdG5BbkRiODZXV1M2VmdMSFZjeE1HNVFkTnFZYkw1OC1wTWVWOF96N2dJWlV1VDRVNlA3OEhZMFhYaDE2VnJhREF0SXphUjFhUVV5T3l5UVZWc3JoRlhBR1NCbTAxT1JfcTlTWlNOT3JvMmtfSDlRZlppY21sczdtSEFSV0lNUjhWal9mWk5seWln -.youtube.com TRUE / TRUE 1738595518 CONSISTENCY AKreu9t-Mo-DVlzgIMAIvyFar449GCldnermLQS7n3vehw8k3sdkQrri05-GwUhHppYmU4GZgJkxyaPfLkvVF9mVNzhgzf-aBKfKn8WefI2oL0Xv_GUy1sEBYTc -.youtube.com TRUE / FALSE 1770131029 SIDCC AKEyXzVBcpDgsv3ti9b0p4zEePuJC3BfTjcn_FKxrK6rGA8BLs493ROZHe2-koTsW6UZlkGEmg -.youtube.com TRUE / TRUE 1770131029 __Secure-1PSIDCC AKEyXzVhrxlpEFQHYhfW6lbPgsYTWWj_liv4nvpMUlMd_9OvChvzJ4H9GoqTz5xJQElXhBHt -.youtube.com TRUE / TRUE 1770131029 __Secure-3PSIDCC AKEyXzXvon0VE4RQzzPNpXSvHh5i_vMqWyaPCuiNCZx-jNYHf0P3AmuPPLslRuLCURm5Xs0icA diff --git a/requirements.txt b/requirements.txt index 69c1900a..685f4e87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ speedtest-cli spotipy tgcrypto unidecode -yt-dlp +yt-dlp[default] youtube-search youtube-search-python