From 1572d3a458839fc9c3bb5e63b99dd0cb1731916f Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Fri, 27 Mar 2020 04:15:32 +0100
Subject: [PATCH] SURVEY_swarmkey

---
 iptubes                    |  2 +-
 zen/ssb_SURVEY_swarmkey.sh | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/iptubes b/iptubes
index 9bb0292..2484707 160000
--- a/iptubes
+++ b/iptubes
@@ -1 +1 @@
-Subproject commit 9bb02920fda14aa064f49a243369cd7a4acb61f4
+Subproject commit 24847070307a3342d5d3237aedfe118fc3bc2284
diff --git a/zen/ssb_SURVEY_swarmkey.sh b/zen/ssb_SURVEY_swarmkey.sh
index 19528b6..76e2fa3 100755
--- a/zen/ssb_SURVEY_swarmkey.sh
+++ b/zen/ssb_SURVEY_swarmkey.sh
@@ -16,10 +16,11 @@ echo '
 # ex: ./'$ME'
 # SURVEY received #astroport-swarmkey ipfs_swarm.key.crypt for IPFS
 ######################################################################## _            _ _        _   _             
-___ _  _ __                         
- | |_)|_(_   _     _.._._ _ |  _    
-_|_|  | __) _>\/\/(_|| | | ||<(/_\/ 
-                                 /  
+ __ __ _                  _        
+(_ (_ |_)  _   ._  _    _|_o| _  _ 
+__)__)|_) _>|_||\/(/_\/  | ||(/__> 
+                     /             
+
 USED ONLY ONCE... Next swarm.key change will accurs in ~/.zen/ipfs-swarm
 
 {
@@ -46,16 +47,14 @@ USED ONLY ONCE... Next swarm.key change will accurs in ~/.zen/ipfs-swarm
   },
   "timestamp": 1585194822367
 }
-
-
 '
-
+[[ -f ~/.ipfs/ipfs_swarm.key ]] && echo  "SWARM KEY ~/.ipfs/ipfs_swarm.key OK !!!" && exit 0
 self=$(sbotc whoami | jq -r .id) || exit 1
 g1self=$(echo $self | cut -d '@' -f 2 | cut -d '.' -f 1 | base64 -d | base58)
 self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"'", "content":{"type":"about", "about": "'"$self"'"}}}}]}' | jq -r .value?.content?.name | grep -v null | tail -n 1)
 ipfsnodeid=$(ipfs id -f='<id>\n')
 
-[[ -f ~/.ipfs/ipfs_swarm.key ]] && echo  "SWARM KEY OK" && exit 1
+
 
 # SEARCH "#astroport-swarmkey" CMD in message text
 # Not working without patchwork (TODO: find bug. installation ok!? activate? ssb-server ssb-backlinks node_modules. HELP !! )
@@ -78,8 +77,8 @@ sbotc messagesByType "post"
 messages=$(sbotc messagesByType '{"type":"post"}')
 while read -r msg
 do
-    
-    attached_file=$(printf %s "$msg" | jq -r .value.content.mentions.link 2>/dev/null)
+    author=$(printf %s "$msg" | jq -r .value.author)
+    attached_file=$(printf %s "$msg" | jq -r .value.content.mentions[].name 2>/dev/null)
 
     if [[ $attached_file == "ipfs_swarm.key.crypt" ]]; then
 
@@ -92,9 +91,9 @@ to ~/.ipfs/ipfs_swarm.key
 '
         mytmp=$(mktemp -d "${TMPDIR:-/tmp}/ssb-npm.XXXXXXXXX")
         curl -s "http://localhost:8989/blobs/get/$attached_file" > $mytmp/ipfs_swarm.key.crypt
-        $MY_PATH/tools/natools.py decrypt -k ~/.ssb/secret.dunikey -i $mytmp/ipfs_swarm.key.crypt -o ~/.ipfs/ipfs_swarm.key
-
-
+        $MY_PATH/tools/natools.py decrypt -k ~/.ssb/secret.dunikey -i $mytmp/ipfs_swarm.key.crypt -o ~/.ipfs/ipfs_swarm.key && \
+        echo  "IPFS SWARM KEY ~/.ipfs/ipfs_swarm.key received from SSB $author ... OK !"
+        
 echo '
 ___ _  _ __                      
  | |_)|_(_   _| _. _ ._ _  _ ._