From 2a29a9cdac02460715869c71d2a65bcf2a8ed48f Mon Sep 17 00:00:00 2001
From: Hafitz Setya <71178188+breakdowns@users.noreply.github.com>
Date: Fri, 9 Apr 2021 05:25:03 +0700
Subject: [PATCH] v4.6.2 (#46)

- Added guide deploy using heroku cli
- Fixed SpeedTest
- Make easy to cancel

Co-authored-by: Hikikomori San <H1kikomoR1@users.noreply.github.com>
Co-authored-by: ydner <ydner@users.noreply.github.com>
---
 README.md                         | 48 ++++++++++++++++++++++++++++++-
 bot/helper/ext_utils/bot_utils.py |  2 +-
 bot/modules/usage.py              |  2 +-
 requirements.txt                  |  2 +-
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9e2c817b93b..ddeb06892b3 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This is a telegram bot writen in python for mirroring files on the internet to o
 
 - Mirroring direct download links to Google Drive
 - Mirroring Mega.nz links to Google Drive (In development stage)
-- Mirroring Uptobox.com links to Google Drive (Uptobox account must be premium)
+- Mirroring Uptobox.com links to Google Drive (**NOTE**: Uptobox account must be premium)
 - Copy files from someone's drive to your drive (Using Autorclone)
 - Download/upload progress, speeds and ETAs
 - Docker support
@@ -144,6 +144,52 @@ Give Star & Fork this repo, then upload **token.pickle** to your forks
 
 <p><a href="https://heroku.com/deploy"> <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy to Heroku" /></a></p>
 
+## Deploying on Heroku using heroku-cli
+
+<details>
+    <summary><b>Click here for more details</b></summary>
+
+- Install [Heroku cli](https://devcenter.heroku.com/articles/heroku-cli)
+- Login into your heroku account with command:
+```
+heroku login
+```
+- Create a new heroku app:
+```
+heroku create <appname>
+```
+- Select This App in your Heroku-cli: 
+```
+heroku git:remote -a <appname>
+```
+- Change Dyno Stack to a Docker Container:
+```
+heroku stack:set container -a <appname>
+```
+- Add Private Credentials and Config Stuff:
+```
+git add -f credentials.json token.pickle config.env heroku.yml
+```
+- Commit new changes:
+```
+git commit -m "Added Creds."
+```
+- Push Code to Heroku:
+```
+git push heroku master --force
+```
+- Restart Worker by these commands,You can Do it manually too in heroku.
+- For Turning off the Bot:
+```
+heroku ps:scale worker=0 -a <appname>
+```
+- For Turning on the Bot:
+```
+heroku ps:scale worker=1 -a <appname>	 	
+```
+
+</details>
+
 ## Bot commands to be set in [@BotFather](https://t.me/BotFather)
 
 ```
diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py
index 2714d2a9bb1..84716a70159 100644
--- a/bot/helper/ext_utils/bot_utils.py
+++ b/bot/helper/ext_utils/bot_utils.py
@@ -109,7 +109,7 @@ def get_readable_message():
                 except:
                     pass
             if download.status() == MirrorStatus.STATUS_DOWNLOADING:
-                msg += f"\n<b>GID:</b> <code>{download.gid()}</code>"
+                msg += f"\n<b>To Stop:</b> <code>/{BotCommands.CancelMirror} {download.gid()}</code>"
             msg += "\n\n"
         return msg
 
diff --git a/bot/modules/usage.py b/bot/modules/usage.py
index b5790f7e65c..301013ddf60 100644
--- a/bot/modules/usage.py
+++ b/bot/modules/usage.py
@@ -19,7 +19,7 @@ def dyno_usage(update, context):
         app = Heroku.app(HEROKU_APP_NAME)
     else:
         sendMessage(
-            "Please insert your Heroku App Name and API Key in Vars",
+            "Please insert your HEROKU_APP_NAME and HEROKU_API_KEY",
             context.bot,
             update
         )
diff --git a/requirements.txt b/requirements.txt
index 267a98232f9..06a72d5410e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ feedparser
 natsort
 heroku3
 aiohttp
-speedtest-cli>=2.1.2
+speedtest-cli
 messages
 lxml
 telegraph