From 983ecb525117f2209ff17bdb9043c0b838aea201 Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:22:18 +0530 Subject: [PATCH 01/11] Basic changes --- info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/info.py b/info.py index d765fb2..1774742 100644 --- a/info.py +++ b/info.py @@ -36,7 +36,7 @@ def is_enabled(value, default): # MongoDB information DATABASE_URI = environ.get('DATABASE_URI', "") -DATABASE_NAME = environ.get('DATABASE_NAME', "Cluster0") +DATABASE_NAME = environ.get('DATABASE_NAME', "IMDB_OTT") COLLECTION_NAME = environ.get('COLLECTION_NAME', 'Telegram_files') # Others @@ -82,10 +82,10 @@ def is_enabled(value, default): # Download Tutorial Button # DOWNLOAD_TEXT_NAME = "📥 HOW TO DOWNLOAD 📥" -DOWNLOAD_TEXT_URL = "https://t.me/LazyDeveloper" +DOWNLOAD_TEXT_URL = "https://t.me/imdbott" # Custom Caption Under Button # CAPTION_BUTTON = "Get Updates" -CAPTION_BUTTON_URL = "https://t.me/LazyDeveloper" +CAPTION_BUTTON_URL = "https://t.me/imdbott" # Auto Delete For Bot Sending Files # From 0b4471b53c44c6af2411a7b150b5080710265916 Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:47:59 +0530 Subject: [PATCH 02/11] Update info.py --- info.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/info.py b/info.py index 1774742..8a35768 100644 --- a/info.py +++ b/info.py @@ -11,10 +11,10 @@ def is_enabled(value, default): return default # Bot information -SESSION = environ.get('SESSION', 'LazyPrincess') -API_ID = int(environ.get('API_ID', '13323016')) -API_HASH = environ.get('API_HASH', '68e791e616100248b0a53ae86a661a12') -BOT_TOKEN = environ.get('BOT_TOKEN', "") +SESSION = environ.get('SESSION', 'IMdB_OTT') +API_ID = int(environ.get('API_ID', '2517876')) +API_HASH = environ.get('API_HASH', 'b290584ca42f8a4e4c3687242a2ca13b') +BOT_TOKEN = environ.get('BOT_TOKEN', "5051127762:AAFgou81sUo3LaS5vYEiNv398uGMAEB8XWA") #Port PORT = environ.get("PORT", "8080") @@ -25,8 +25,8 @@ def is_enabled(value, default): PICS = (environ.get('PICS', 'https://telegra.ph/file/68d28011b2bc356b5db01.png')).split() # Admins, Channels & Users -ADMINS = [int(admin) if id_pattern.search(admin) else admin for admin in environ.get('ADMINS', '1484670284').split()] -CHANNELS = [int(ch) if id_pattern.search(ch) else ch for ch in environ.get('CHANNELS', '-1001620891165').split()] +ADMINS = [int(admin) if id_pattern.search(admin) else admin for admin in environ.get('ADMINS', '1079178574').split()] +CHANNELS = [int(ch) if id_pattern.search(ch) else ch for ch in environ.get('CHANNELS', '-1001797496668').split()] auth_users = [int(user) if id_pattern.search(user) else user for user in environ.get('AUTH_USERS', '1484670284').split()] AUTH_USERS = (auth_users + ADMINS) if auth_users else [] auth_channel = environ.get('AUTH_CHANNEL', '-1001765107260') @@ -35,13 +35,13 @@ def is_enabled(value, default): AUTH_GROUPS = [int(ch) for ch in auth_grp.split()] if auth_grp else None # MongoDB information -DATABASE_URI = environ.get('DATABASE_URI', "") -DATABASE_NAME = environ.get('DATABASE_NAME', "IMDB_OTT") +DATABASE_URI = environ.get('DATABASE_URI', "mongodb+srv://thunderflix:oxoo@cluster0.y1y7v.mongodb.net/myFirstDatabase?retryWrites=true&w=majority") +DATABASE_NAME = environ.get('DATABASE_NAME', "THUNDERFLIX") COLLECTION_NAME = environ.get('COLLECTION_NAME', 'Telegram_files') # Others LOG_CHANNEL = int(environ.get('LOG_CHANNEL', '-1001782419622')) -SUPPORT_CHAT = environ.get('SUPPORT_CHAT', 'LazyPrincessSupport') +SUPPORT_CHAT = environ.get('SUPPORT_CHAT', 'OxooFlix_Support') P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "True")), False) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), False) From 60852bf4fbfc32c085fd9b0e55f9afe5ae53f352 Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:49:50 +0530 Subject: [PATCH 03/11] Update info.py --- info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.py b/info.py index 8a35768..81a1b4b 100644 --- a/info.py +++ b/info.py @@ -27,7 +27,7 @@ def is_enabled(value, default): # Admins, Channels & Users ADMINS = [int(admin) if id_pattern.search(admin) else admin for admin in environ.get('ADMINS', '1079178574').split()] CHANNELS = [int(ch) if id_pattern.search(ch) else ch for ch in environ.get('CHANNELS', '-1001797496668').split()] -auth_users = [int(user) if id_pattern.search(user) else user for user in environ.get('AUTH_USERS', '1484670284').split()] +auth_users = [int(user) if id_pattern.search(user) else user for user in environ.get('AUTH_USERS', '1079178574').split()] AUTH_USERS = (auth_users + ADMINS) if auth_users else [] auth_channel = environ.get('AUTH_CHANNEL', '-1001765107260') auth_grp = environ.get('AUTH_GROUP') @@ -36,7 +36,7 @@ def is_enabled(value, default): # MongoDB information DATABASE_URI = environ.get('DATABASE_URI', "mongodb+srv://thunderflix:oxoo@cluster0.y1y7v.mongodb.net/myFirstDatabase?retryWrites=true&w=majority") -DATABASE_NAME = environ.get('DATABASE_NAME', "THUNDERFLIX") +DATABASE_NAME = environ.get('DATABASE_NAME', "ThunderFlix") COLLECTION_NAME = environ.get('COLLECTION_NAME', 'Telegram_files') # Others From 11a0c3fd27a95e37f7b4166c6530dc972961a1fb Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:51:08 +0530 Subject: [PATCH 04/11] Update info.py --- info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.py b/info.py index 81a1b4b..307780b 100644 --- a/info.py +++ b/info.py @@ -71,8 +71,8 @@ def is_enabled(value, default): # URL Shortener # -URL_SHORTENR_WEBSITE = environ.get('URL_SHORTENR_WEBSITE', 'api.shareus.in/shortLink') -URL_SHORTNER_WEBSITE_API = environ.get('URL_SHORTNER_WEBSITE_API', 'I3Khu0fwfbWpd1W2ofcyP2znDA12') +URL_SHORTENR_WEBSITE = environ.get('URL_SHORTENR_WEBSITE', 'shrinklo.com') +URL_SHORTNER_WEBSITE_API = environ.get('URL_SHORTNER_WEBSITE_API', 'da3f4cf5092cc6cae5768814be59a2045b573c3a') # Auto Delete For Group Message (Self Delete) # SELF_DELETE_SECONDS = int(environ.get('SELF_DELETE_SECONDS', 100)) From d13597d77ac8118d873dd91d6ba7a68442ebf952 Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Wed, 11 Jan 2023 23:52:31 +0530 Subject: [PATCH 05/11] Update start.sh --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 7263ff5..6df2657 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ if [ -z $UPSTREAM_REPO ] then echo "Cloning main Repository" - git clone https://github.com/LazyDeveloperr/LazyPrincessV2 /LazyPrincessV2 + git clone https://github.com/me-santu/LazyPrincessV2 /LazyPrincessV2 else echo "Cloning Custom Repo from $UPSTREAM_REPO " git clone $UPSTREAM_REPO /LazyPrincessV2 From e70d2f48dcd519715f4c68d987d14b454cde07da Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:07:59 +0530 Subject: [PATCH 06/11] Update start.sh --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 6df2657..0cab648 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ if [ -z $UPSTREAM_REPO ] then echo "Cloning main Repository" - git clone https://github.com/me-santu/LazyPrincessV2 /LazyPrincessV2 + git clone https://github.com/me-santu/LazyPrincessV2 else echo "Cloning Custom Repo from $UPSTREAM_REPO " git clone $UPSTREAM_REPO /LazyPrincessV2 From fd8883109245e3ac2fdecf7b29de609a40d7984f Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:21:16 +0530 Subject: [PATCH 07/11] Update start.sh --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 0cab648..7263ff5 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ if [ -z $UPSTREAM_REPO ] then echo "Cloning main Repository" - git clone https://github.com/me-santu/LazyPrincessV2 + git clone https://github.com/LazyDeveloperr/LazyPrincessV2 /LazyPrincessV2 else echo "Cloning Custom Repo from $UPSTREAM_REPO " git clone $UPSTREAM_REPO /LazyPrincessV2 From 7daa0b66b649a22d6413d5de49a585a9829ee4ec Mon Sep 17 00:00:00 2001 From: ananth-28 <106482929+ananth-28@users.noreply.github.com> Date: Thu, 12 Jan 2023 01:15:45 +0530 Subject: [PATCH 08/11] Update start.sh --- start.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/start.sh b/start.sh index 7263ff5..830d36f 100644 --- a/start.sh +++ b/start.sh @@ -1,11 +1,4 @@ -if [ -z $UPSTREAM_REPO ] -then - echo "Cloning main Repository" - git clone https://github.com/LazyDeveloperr/LazyPrincessV2 /LazyPrincessV2 -else - echo "Cloning Custom Repo from $UPSTREAM_REPO " - git clone $UPSTREAM_REPO /LazyPrincessV2 -fi +git clone https://github.com/LazyDeveloperr/LazyPrincessV2 /LazyPrincessV2 cd /LazyPrincessV2 pip3 install -U -r requirements.txt echo "Starting Bot...." From a3bb931220b61f41487c2ed6cb4d3cc6cbc2e1de Mon Sep 17 00:00:00 2001 From: ananth-28 <106482929+ananth-28@users.noreply.github.com> Date: Thu, 12 Jan 2023 01:30:37 +0530 Subject: [PATCH 09/11] Update Dockerfile --- Dockerfile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c66e4b..20b77c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,16 @@ FROM python:3.10-slim-buster -RUN apt update && apt upgrade -y -RUN apt install git -y -COPY requirements.txt /requirements.txt +#RUN apt update && apt upgrade -y +#RUN apt install git -y +#COPY requirements.txt /requirements.txt +WORKDIR . +COPY . . -RUN cd / -RUN pip3 install -U pip && pip3 install -U -r requirements.txt -RUN mkdir /LazyPrincessV2 -WORKDIR /LazyPrincessV2 -COPY start.sh /start.sh -CMD ["/bin/bash", "/start.sh"] +RUN pip3 install -r requirements.txt + +#RUN cd / +#RUN pip3 install -U pip && pip3 install -U -r requirements.txt +#RUN mkdir /LazyPrincessV2 +#WORKDIR /LazyPrincessV2 +#COPY start.sh /start.sh +CMD ["python3", "bot.py"] From 9ccc69072b6a854846c221f756525802074c98b2 Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Tue, 17 Jan 2023 02:07:02 +0530 Subject: [PATCH 10/11] Update info.py --- info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.py b/info.py index 307780b..0f9968c 100644 --- a/info.py +++ b/info.py @@ -71,8 +71,8 @@ def is_enabled(value, default): # URL Shortener # -URL_SHORTENR_WEBSITE = environ.get('URL_SHORTENR_WEBSITE', 'shrinklo.com') -URL_SHORTNER_WEBSITE_API = environ.get('URL_SHORTNER_WEBSITE_API', 'da3f4cf5092cc6cae5768814be59a2045b573c3a') +URL_SHORTENR_WEBSITE = environ.get('URL_SHORTENR_WEBSITE', 'api.shareus.in/shortLink') +URL_SHORTNER_WEBSITE_API = environ.get('URL_SHORTNER_WEBSITE_API', '5O9Ghn3VFPZrlA1mctUclo5amDE2') # Auto Delete For Group Message (Self Delete) # SELF_DELETE_SECONDS = int(environ.get('SELF_DELETE_SECONDS', 100)) From d7a978d25d62897581297743b7ccdfa52361bcde Mon Sep 17 00:00:00 2001 From: Santu Ghosh <69458659+me-santu@users.noreply.github.com> Date: Tue, 17 Jan 2023 02:08:46 +0530 Subject: [PATCH 11/11] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 0f9968c..0873fe2 100644 --- a/info.py +++ b/info.py @@ -43,7 +43,7 @@ def is_enabled(value, default): LOG_CHANNEL = int(environ.get('LOG_CHANNEL', '-1001782419622')) SUPPORT_CHAT = environ.get('SUPPORT_CHAT', 'OxooFlix_Support') P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) -IMDB = is_enabled((environ.get('IMDB', "True")), False) +IMDB = is_enabled((environ.get('IMDB', "False")), False) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), False) CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "⚡File uploaded by [Movies Adaa™](https://t.me/real_MoviesAdda1)⚡\n\nName: {file_caption} \n\n⚙️ Size: {file_size}🔥 ↭ Join Now [MoviesAdda™](https://t.me/real_MoviesAdda1) ↭ 🔥") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", "⚡File uploaded by [Movies Adaa™](https://t.me/real_MoviesAdda1)⚡\n\nName: {file_caption} \n\n⚙️ Size: {file_size}🔥 ↭ Join Now [MoviesAdda™](https://t.me/real_MoviesAdda1) ↭ 🔥")