From a33e8b7093b3d8860dbb1220288c0ca8695beb35 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 07:41:38 +0530 Subject: [PATCH 01/12] Update config_sample.env --- config_sample.env | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/config_sample.env b/config_sample.env index a4962b77c..943ea8e50 100644 --- a/config_sample.env +++ b/config_sample.env @@ -1,34 +1,31 @@ -#Remove this line before deploying -_____REMOVE_THIS_LINE_____=True - # ENTER BOT TOKEN (Get your BOT_TOKEN by talking to @botfather) -BOT_TOKEN = "" -GDRIVE_FOLDER_ID = "" -OWNER_ID = +BOT_TOKEN = "2047618127:AAFCdJoQltjx1Um4xYEGaJEYF41OIR34vJ8" +GDRIVE_FOLDER_ID = "0AAtTpmxf5AxuUk9PVA" +OWNER_ID = 586922543 DOWNLOAD_DIR = "/home/username/mirror-bot/downloads" DOWNLOAD_STATUS_UPDATE_INTERVAL = 5 AUTO_DELETE_MESSAGE_DURATION = 20 -IS_TEAM_DRIVE = "" -TELEGRAM_API = -TELEGRAM_HASH = "" +IS_TEAM_DRIVE = "True" +TELEGRAM_API = 2125668 +TELEGRAM_HASH = "d6a8a3601ef71a1e379fa554c3098bf2" USE_SERVICE_ACCOUNTS = "" # Optional config -AUTHORIZED_CHATS = "" #Separated by space +AUTHORIZED_CHATS = "-1001526523796" #Separated by space IGNORE_PENDING_REQUESTS = "" -INDEX_URL = "" -MEGA_KEY = "" -MEGA_USERNAME = "" -MEGA_PASSWORD = "" +INDEX_URL = "https://gdrive.moviesempire.workers.dev/0:" +MEGA_KEY = "NAgWwAIJ" +MEGA_USERNAME = "meherpatil84@gmail.com" +MEGA_PASSWORD = "patil1235" BLOCK_MEGA_LINKS = "" SHORTENER = "" SHORTENER_API = "" # Add more buttons (two buttons are already added of file link and index link, you can add extra buttons too, these are optional) # If you don't know what are below entries, simply leave them, Don't fill anything in them. -BUTTON_THREE_NAME = "" -BUTTON_THREE_URL = "" -BUTTON_FOUR_NAME = "" -BUTTON_FOUR_URL = "" +BUTTON_THREE_NAME = "Get Access" +BUTTON_THREE_URL = "https://groups.google.com/g/MoviesEmpire-td" +BUTTON_FOUR_NAME = "Channels" +BUTTON_FOUR_URL = "t.me/TheEmpireGroup" BUTTON_FIVE_NAME = "" BUTTON_FIVE_URL = "" From a8cadd1f047591d3a1ce25a821cc28f24d643ca8 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 07:43:17 +0530 Subject: [PATCH 02/12] Create main.yml --- .github/workflows/main.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..b2a57364e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,19 @@ +name: deploy + +on: workflow_dispatch + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: akhileshns/heroku-deploy@v3.12.12 + with: + region: "us" + branch: "master" + usedocker: true + stack: "container" + heroku_app_name: "meher-mankar-bot" + docker_heroku_process_type: worker + heroku_email: mehermankar3@gmail.com"" + heroku_api_key: "3700f3aa-d27c-429c-817f-e19f659466ab" From d0e4c4042e3beef1bbc2b0d4790a81063ad45055 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 07:49:26 +0530 Subject: [PATCH 03/12] Update main.yml --- .github/workflows/main.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2a57364e..d5bfcf70f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,19 +1,20 @@ -name: deploy +name: Manually Deploy to Heroku on: workflow_dispatch jobs: - build: + deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: akhileshns/heroku-deploy@v3.12.12 + - uses: akhileshns/heroku-deploy@v3.12.12 with: - region: "us" - branch: "master" + heroku_api_key: ${{secrets.HEROKU_API_KEY}} + heroku_app_name: ${{secrets.HEROKU_APP_NAME}} + heroku_email: ${{secrets.HEROKU_EMAIL}} usedocker: true + docker_heroku_process_type: web stack: "container" - heroku_app_name: "meher-mankar-bot" - docker_heroku_process_type: worker - heroku_email: mehermankar3@gmail.com"" - heroku_api_key: "3700f3aa-d27c-429c-817f-e19f659466ab" + region: "eu" + env: + HD_CONFIG_FILE_URL: ${{secrets.CONFIG_FILE_URL}} From 18ffd5a688f63f9573b4319d7d75e8c228f18a22 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:38:38 +0530 Subject: [PATCH 04/12] Rename config_sample.env to config.env --- config_sample.env => config.env | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config_sample.env => config.env (100%) diff --git a/config_sample.env b/config.env similarity index 100% rename from config_sample.env rename to config.env From a4ba74e2052d17eed34e7bb3ec6c7ac979264e2f Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:39:22 +0530 Subject: [PATCH 05/12] Update main.yml --- .github/workflows/main.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5bfcf70f..5bb1082e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,20 +1,19 @@ -name: Manually Deploy to Heroku +name: deploy on: workflow_dispatch jobs: - deploy: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: akhileshns/heroku-deploy@v3.12.12 + - uses: akhileshns/heroku-deploy@v3.12.12 with: - heroku_api_key: ${{secrets.HEROKU_API_KEY}} - heroku_app_name: ${{secrets.HEROKU_APP_NAME}} - heroku_email: ${{secrets.HEROKU_EMAIL}} + region: "us" + branch: "master" usedocker: true - docker_heroku_process_type: web stack: "container" - region: "eu" - env: - HD_CONFIG_FILE_URL: ${{secrets.CONFIG_FILE_URL}} + heroku_app_name: "" + docker_heroku_process_type: worker + heroku_email: "" + heroku_api_key: "" From 1bad2cd17505a2a9d8a10882865d487211c2b2cb Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:41:30 +0530 Subject: [PATCH 06/12] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5bb1082e3..f4f841c8b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: branch: "master" usedocker: true stack: "container" - heroku_app_name: "" + heroku_app_name: "nehakutti" docker_heroku_process_type: worker - heroku_email: "" - heroku_api_key: "" + heroku_email: "mehermankar3@gmail.com" + heroku_api_key: "3700f3aa-d27c-429c-817f-e19f659466ab" From 66354c8e3a4b945c0d4bbdc4167ccbf2d46f3025 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 15 Oct 2021 11:09:13 +0530 Subject: [PATCH 07/12] Add files via upload --- token.pickle | Bin 0 -> 682 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 token.pickle diff --git a/token.pickle b/token.pickle new file mode 100644 index 0000000000000000000000000000000000000000..49412f94d53132383f0188f6f833d35f4e9b6693 GIT binary patch literal 682 zcmZ9KO>fgc5QY(IDGdUtH#k>FaHwO)j_q)B-6VC|IIZ*5RzlXs-uNS%th2kW?Mg^+ z;I_9eXAb-}{s$=yQpKERE;H}@%=>lc$Is`_{uX~1VH_bSVUV-9Aq516aK#dUsNk>c zC)2(7_)UBfANVfA3%C;eR|Og^3CNa5LeTe*k*ymybUu;ClVS#CPq{fUn036Ko*Qv* zz3ltAHH|4uN3akh54K$xOC#M#R&&!C$~KOGqX7 z%MdWgk|liF-V3|7_j~_f_i*R6wie%oC-{NC&M^aiMsNxP<|mbls1)F3{efaVB*`rlfWPqxoD)c6e~TUBBnHy9d5?F+f8?C9FD zJj?1@^3W|hN9Qev1eOeD?CjPpy;B6odH{zc*T_I?DC0@HM`FdMm24XsF@>9~ dF~Q$<7LHn!HawaXAfzjl_CtMqhlt2$(jT17^#uR` literal 0 HcmV?d00001 From 6acaf91c3b6f4e503964e1b662a198ed8e450e9a Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:54:41 +0530 Subject: [PATCH 08/12] Update config.env --- config.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.env b/config.env index 943ea8e50..c5b3079be 100644 --- a/config.env +++ b/config.env @@ -1,5 +1,5 @@ # ENTER BOT TOKEN (Get your BOT_TOKEN by talking to @botfather) -BOT_TOKEN = "2047618127:AAFCdJoQltjx1Um4xYEGaJEYF41OIR34vJ8" +BOT_TOKEN = "2044015755:AAEQrWi2S4jVkEebP-Y1f3k4pxNBkjfYGNQ" GDRIVE_FOLDER_ID = "0AAtTpmxf5AxuUk9PVA" OWNER_ID = 586922543 DOWNLOAD_DIR = "/home/username/mirror-bot/downloads" From 5f2aa88f328b6e741cf62eb19068bf404e402b84 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:58:02 +0530 Subject: [PATCH 09/12] Update config.env --- config.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.env b/config.env index c5b3079be..493825013 100644 --- a/config.env +++ b/config.env @@ -1,6 +1,6 @@ # ENTER BOT TOKEN (Get your BOT_TOKEN by talking to @botfather) BOT_TOKEN = "2044015755:AAEQrWi2S4jVkEebP-Y1f3k4pxNBkjfYGNQ" -GDRIVE_FOLDER_ID = "0AAtTpmxf5AxuUk9PVA" +GDRIVE_FOLDER_ID = "0AL4fGCoF7hCaUk9PVA" OWNER_ID = 586922543 DOWNLOAD_DIR = "/home/username/mirror-bot/downloads" DOWNLOAD_STATUS_UPDATE_INTERVAL = 5 From fcc655a82c915a44144930bed276809884e1f3b8 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:03:33 +0530 Subject: [PATCH 10/12] Update config.env --- config.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.env b/config.env index 493825013..66162c2f4 100644 --- a/config.env +++ b/config.env @@ -1,5 +1,5 @@ # ENTER BOT TOKEN (Get your BOT_TOKEN by talking to @botfather) -BOT_TOKEN = "2044015755:AAEQrWi2S4jVkEebP-Y1f3k4pxNBkjfYGNQ" +BOT_TOKEN = "2044015755:AAHYwLfgy2ItCiNpUlEb1JSQHYND8rBC2to" GDRIVE_FOLDER_ID = "0AL4fGCoF7hCaUk9PVA" OWNER_ID = 586922543 DOWNLOAD_DIR = "/home/username/mirror-bot/downloads" From 16500a764d7b8c071e6cf9bcc666fec5b4700048 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:09:14 +0530 Subject: [PATCH 11/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f4f841c8b..0d4d17ce7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: branch: "master" usedocker: true stack: "container" - heroku_app_name: "nehakutti" + heroku_app_name: "missne" docker_heroku_process_type: worker heroku_email: "mehermankar3@gmail.com" heroku_api_key: "3700f3aa-d27c-429c-817f-e19f659466ab" From b11a2df27c6a96ee9037d71a3a0dbcc21a402f14 Mon Sep 17 00:00:00 2001 From: Meher Mankar <84778567+gigameher473@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:24:10 +0530 Subject: [PATCH 12/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d4d17ce7..f4f841c8b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: branch: "master" usedocker: true stack: "container" - heroku_app_name: "missne" + heroku_app_name: "nehakutti" docker_heroku_process_type: worker heroku_email: "mehermankar3@gmail.com" heroku_api_key: "3700f3aa-d27c-429c-817f-e19f659466ab"