From bb96c7ca3b75e109ee60d6fac372c27db6a52337 Mon Sep 17 00:00:00 2001
From: hikariatama <elusloodus@mail.ru>
Date: Mon, 30 May 2022 17:25:03 +0000
Subject: [PATCH] Do not ask user to enter Telegram credintials locally when
 installing to heroku

---
 hikka/main.py | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/hikka/main.py b/hikka/main.py
index f086e4e..0dafeca 100755
--- a/hikka/main.py
+++ b/hikka/main.py
@@ -474,7 +474,7 @@ class Hikka:
                     MemorySession(),
                     self.api_token.ID,
                     self.api_token.HASH,
-                    connection=self.connection,
+                    connection=self.conn,
                     proxy=self.proxy,
                     connection_retries=None,
                     device_model="Hikka",
@@ -671,6 +671,36 @@ class Hikka:
 
     def main(self):
         """Main entrypoint"""
+        if self.arguments.heroku:
+            if isinstance(self.arguments.heroku, str):
+                key = self.arguments.heroku
+            else:
+                print(
+                    "\033[0;35m- Heroku installation -\033[0m\n"
+                    "*If you are from Russia, enable VPN and use it throughout the process\n\n"
+                    "1. Register account at https://heroku.com\n"
+                    "2. Go to https://dashboard.heroku.com/account\n"
+                    "3. Next to API Key click `Reveal` and copy it\n"
+                    "4. Enter it below:"
+                )
+                key = input("♓️ \033[1;37mHeroku API key:\033[0m ").strip()
+
+            print(
+                "⏱ Installing to Heroku...\n"
+                "This process might take several minutes, be patient."
+            )
+
+            app = heroku.publish(self.clients, key, self.api_token)
+            print(
+                "Installed to heroku successfully!\n"
+                "🎉 App URL: {}".format(app.web_url)
+            )
+
+            # On this point our work is done
+            # everything else will be run on Heroku, including
+            # authentication
+            return
+
         self._init_web()
         save_config_key("port", self.arguments.port)
         self._get_token()
@@ -682,23 +712,6 @@ class Hikka:
         ) and not self._initial_setup():  # Otherwise attempt to run setup
             return
 
-        if self.arguments.heroku:
-            if isinstance(self.arguments.heroku, str):
-                key = self.arguments.heroku
-            else:
-                key = input(
-                    "Please enter your Heroku API key (from https://dashboard.heroku.com/account): "
-                ).strip()
-
-            app = heroku.publish(self.clients, key, self.api_token)
-            print("Installed to heroku successfully!\n" "🎉 {}".format(app.web_url))
-
-            if self.web:
-                self.web.redirect_url = app.web_url
-                self.web.ready.set()
-                self.loop.run_until_complete(self.web.root_redirected.wait())
-            return
-
         self.loop.set_exception_handler(
             lambda _, x: logging.error(
                 f"Exception on event loop! {x['message']}",