work on pm and fixed broken pex when none

onionr/api.py

@@ -155,9 +155,10 @@ class API:
                     response = 'none'
                 resp = Response(response)
             elif action == 'kex':
+                peers = self._core.listPeers()
+                response = ''
+                if type(peers) != None:
                     response = ','.join(self._core.listPeers())
-                if len(response) == 0:
-                    response = 'none'
                 resp = Response(response)
             else:
                 resp = Response("")

onionr/core.py

@@ -137,7 +137,8 @@ class Core:
             forwardKey text,
             dateSeen not null,
             bytesStored int,
-            trust int);
+            trust int,
+            pubkeyExchanged int);
         ''')
         conn.commit()
         conn.close()
@@ -377,11 +378,12 @@ class Core:
             dateSeen not null,  5
             bytesStored int,    6
             trust int           7
+            pubkeyExchanged int 8
         '''
         conn = sqlite3.connect(self.peerDB)
         c = conn.cursor()
         command = (peer,)
-        infoNumbers = {'id': 0, 'name': 1, 'pubkey': 2, 'adders': 3, 'forwardKey': 4, 'dateSeen': 5, 'bytesStored': 6, 'trust': 7}
+        infoNumbers = {'id': 0, 'name': 1, 'pubkey': 2, 'adders': 3, 'forwardKey': 4, 'dateSeen': 5, 'bytesStored': 6, 'trust': 7, 'pubkeyExchanged': 8}
         info = infoNumbers[info]
         iterCount = 0
         retVal = ''

onionr/onionr.py

@@ -256,7 +256,7 @@ class Onionr:
             except KeyboardInterrupt:
                 break
             else:
-                if self.onionrUtils.validateID(peer):
+                if self.onionrUtils.validatePubKey(peer):
                     break
                 else:
                     logger.error('Invalid peer ID')

onionr/onionrutils.py

@@ -37,9 +37,17 @@ class OnionrUtils:
         self._core = coreInstance
         return
 
-    def sendPM(self, user, message):
+    def sendPM(self, pubkey, message):
         '''High level function to encrypt a message to a peer and insert it as a block'''
 
+        forwardKey = self._core.getPeerInfo(pubkey, 'forwardKey')
+        
+        if self._core.getPeerInfo(pubkey, 'pubkeyExchanged'):
+            pass
+
+        if len(forwardKey) > 0:
+            pass
+
         return
     
     def incrementAddressSuccess(self, address):