From d03bcce34e0ec7993a651549be87ed0d48ccff49 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Wed, 16 Sep 2020 20:13:41 +0100
Subject: [PATCH] komrade update!

---
 bin/komrade-update           | 10 ++++++++++
 komrade/backend/komrades.py  |  6 +++---
 komrade/backend/messages.py  |  4 ++--
 komrade/backend/operators.py |  2 +-
 komrade/cli/cli.py           |  7 ++++---
 5 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100755 bin/komrade-update

diff --git a/bin/komrade-update b/bin/komrade-update
new file mode 100755
index 0000000..5dd2410
--- /dev/null
+++ b/bin/komrade-update
@@ -0,0 +1,10 @@
+SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+wd=`pwd`
+path=`realpath "$SCRIPTPATH/.."`
+cd $path
+git pull
+git add .
+git commit -m 'komrade update!'
+git push
+cd $wd
diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py
index 6424fb8..9f4732b 100644
--- a/komrade/backend/komrades.py
+++ b/komrade/backend/komrades.py
@@ -453,7 +453,7 @@ class KomradeX(Caller):
             #print(post_id,inbox_ids,post_id in inbox_ids,'???')
             # stop
             if post_id in inbox_ids:
-                print('removing from inbox...')
+                # print('removing from inbox...')
                 inbox_ids.remove(post_id)
         self.save_inbox(inbox_ids)
         #print(inbox_ids,'v2',len(inbox_ids))
@@ -466,9 +466,9 @@ class KomradeX(Caller):
         self.log('delete_msgs ->',res)
         return res
 
-    def inbox(self,topn=100,only_unread=False,delete_malformed=False):
+    def inbox(self,topn=100,only_unread=False,delete_malformed=False,check_msgs=False):
         # refreshing inbox
-        res = self.refresh()
+        res = self.refresh(check_msgs=check_msgs)
         print('got from refresh',res)
         if not res['success']: return res
         
diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py
index c782842..a6c61c2 100644
--- a/komrade/backend/messages.py
+++ b/komrade/backend/messages.py
@@ -72,8 +72,8 @@ class Message(Logger):
         hdr='#'*CLI_WIDTH
         return f"""
 {hdr}
-from: Komrade @{self.from_name if self.from_name else ''} 
-to:   Komrade @{self.to_name if self.to_name else ''}
+from: @{self.from_name if self.from_name else ''} 
+to:   @{self.to_name if self.to_name else ''}
 {hdr}
 
 {msg_s}
diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py
index 6a17ff6..b4d9098 100644
--- a/komrade/backend/operators.py
+++ b/komrade/backend/operators.py
@@ -152,7 +152,7 @@ class Operator(Keymaker):
     def __repr__(self):
         clsname=(type(self)).__name__
         #name = clsname+' '+
-        name = 'Komrade @'+ (self.name if self.name else '?') # if self.name!=clsname else clsname
+        name = '@'+ (self.name if self.name else '?') # if self.name!=clsname else clsname
         # try:
         #     keystr= 'on device: ' + ('+'.join(self.top_keys) if self.pubkey else '')
         # except TypeError:
diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py
index 4973711..151cadf 100644
--- a/komrade/cli/cli.py
+++ b/komrade/cli/cli.py
@@ -137,7 +137,7 @@ class CLI(Logger):
 """
 
         HELPSTR+=f"""
-/help             -->  seek help
+/help             -->   seek help
 """
         helpstr = tw.indent(HELPSTR.strip()+'\n\n',' '*13)
         self.print(helpstr)
@@ -277,7 +277,7 @@ class CLI(Logger):
                 msg_s
             )
             self.log(f'Sent msg obj to {name_or_pubkey}: {msg_obj}')
-            self.stat(f'Message successfully sent to @{name_or_pubkey}.')
+            self.stat(f'Message successfully sent to @{name_or_pubkey}.',komrade_name='Operator',pause=True)
 
     def check(self,dat=None,res=None,statd={}):
         self.log(f'<-- dat={dat}, res={res}')
@@ -346,7 +346,8 @@ class CLI(Logger):
                 self.stat('Could not delete message.')
             do_pause()
         elif do=='r':
-            self.print('@todo: replying...')
+            # self.print('@todo: replying...')
+            return self.msg(msg.from_name)
         else:
             pass