From ac61753e768745452fe2b8a7eb466a8e3bc9238c Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Wed, 16 Sep 2020 17:26:43 +0100
Subject: [PATCH] updates

---
 komrade/backend/komrades.py     | 10 +++++++---
 komrade/backend/the_operator.py |  4 ++--
 komrade/cli/cli.py              |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py
index 09e50fc..44c582e 100644
--- a/komrade/backend/komrades.py
+++ b/komrade/backend/komrades.py
@@ -137,10 +137,13 @@ class KomradeX(Caller):
             logfunc('Cancelling registration.',pause=True,clear=True)
             return
 
-        clear_screen()
+        # clear_screen()
+        logfunc('Great. Komrade @Operator knows who you are now, because they have your name and public key on file (and nothing else!).',pause=True,clear=True)
 
-        logfunc(f"(2) Your PRIVATE key will be stored only on your device hardware.\n\nAnd only after we encrypt it with a memorable password:")
+        logfunc(f"(2) Your PRIVATE key, on the other hand, will be stored only on your device hardware.",pause=True)
+        logfunc('''But your private key is so sensitive we'll even encrypt it before storing it.''',pause=True,use_prefix=False)
 
+        
 
         ## 3) Have passphrase?
         if SHOW_STATUS and not passphrase:
@@ -148,7 +151,8 @@ class KomradeX(Caller):
         else:
             if not passphrase: passphrase = DEBUG_DEFAULT_PASSPHRASE
             while not passphrase:
-                logfunc('Now please enter a memorable password to encrypt your private key with:')
+                # logfunc('Please type a password:',use_prefix=False)
+                logfunc('''Please enter a memorable password to generate a (symmetric AES) encryption key with:''',use_prefix=True)
                 passphrase=getpass(f'\nKomrade @{self.name}: ')
                 clear_screen()
         ## 4) Get hashed password
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index 25b41f2..09b6241 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -261,7 +261,7 @@ class TheOperator(Operator):
         if self.has_user(name=name,pubkey=pubkey):
             return {
                 'success':False,
-                'status': f"{OPERATOR_INTRO}I'm sorry, but I can't register the name of {name}. This user already exists."
+                'status': f"{OPERATOR_INTRO}I'm sorry, but I can't register the name of {name}. This komrade already exists."
             }
         
         # generate shared secret
@@ -290,7 +290,7 @@ class TheOperator(Operator):
             'pubkey':pubkey_b,
             'secret_login':shared_secret,
             'name':name,
-            'status':f'Name @{name} was successfully registered with the public key {uri_id}.'
+            'status':f'Name @{name} was successfully registered with the public key {uri_id.decode()}.'
         }
         # res_safe = {
         #     **res, 
diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py
index 191786d..3117eb5 100644
--- a/komrade/cli/cli.py
+++ b/komrade/cli/cli.py
@@ -310,7 +310,7 @@ class CLI(Logger):
             do_pause()
             clear_screen()
         
-        self.stat('Send this user your public key as well?')
+        self.stat('Send this komrade your public key as well?')
         do_senduser = input(f'''\n{self.komrade} [y/N]: ''')
 
         if do_senduser.strip().lower()=='y':