From da34b0f529717fcda8b6a94290102f39707fd2a8 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sat, 22 Aug 2020 22:33:58 +0100 Subject: [PATCH] ?? --- app/screens/post/post.py | 9 +++++++-- p2p/api.py | 8 ++++++-- p2p/kademlia/network.py | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/screens/post/post.py b/app/screens/post/post.py index 2e7a231..f3e2e7f 100644 --- a/app/screens/post/post.py +++ b/app/screens/post/post.py @@ -108,8 +108,13 @@ class PostScreen(ProtectedScreen): if hasattr(self,'post_textfield'): self.post_textfield.text='' post_json = {'author':self.app.username, 'timestamp':time.time()} - key=list(self.app.keys.keys())[0] - post_json['to_name']='...?' + keys=[k for k in self.app.keys if k!=self.app.username] + if keys: + key=keys[0] + post_json['to_name']=key + self.recipient=key + else: + post_json['to_name']='...' self.post_card = post = PostCard(post_json) self.post_card.add_widget(get_separator('15sp'),1) diff --git a/p2p/api.py b/p2p/api.py index 1b26a33..823adb2 100644 --- a/p2p/api.py +++ b/p2p/api.py @@ -458,8 +458,12 @@ class Api(object): if not res0: return None if type(res0)==list: for d in res0: - if 'val' in d and d['val']: - d['val']=jsonize_dat(d['val']) + try: + if 'val' in d and d['val']: + d['val']=jsonize_dat(d['val']) + except (TypeError,ValueError) as e: + self.log('!!!!',e) + pass return res0 else: return json.loads(base64.b64decode(res0).decode('utf-8')) diff --git a/p2p/kademlia/network.py b/p2p/kademlia/network.py index e5cdc0d..e75d611 100644 --- a/p2p/kademlia/network.py +++ b/p2p/kademlia/network.py @@ -1,7 +1,7 @@ """ Package for interacting on the network at a high level. """ -STORE_ANYWHERE=True +STORE_ANYWHERE=False import random