diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh index aa29e5e..1fb65bf 100755 --- a/zen/gchange_IPFS_swarm.sh +++ b/zen/gchange_IPFS_swarm.sh @@ -42,16 +42,12 @@ do for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey read -n300 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content'); do echo "======================================================" - # REFERSH A_swarm_map.txt - echo $peerline >> ~/.zen/A_swarm_map.txt - cat ~/.zen/A_swarm_map.txt | sort | uniq > /tmp/A_swarm_map.txt - cp -f /tmp/A_swarm_map.txt ~/.zen/A_swarm_map.txt - - # GET $ipfsnodeid AND $whoisg1 FROM $peerline + # GET $ipfsnodeid FROM $peerline + echo "PEERLINE: $peerline" ipfsnodeid=${peerline##*/} # http://mywiki.wooledge.org/BashFAQ/100 [[ "$ipfsnodeid" == "" ]] && continue [[ $(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid ) ]] && continue # ALREADY in my SWARM - echo "PEERLINE: $peerline" + # GET $whoisg1 FROM $peerline whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) # KEEPING LAST ipfstryme MESSAGES only @@ -65,6 +61,12 @@ do [[ $nbmessage == 0 ]] && echo "NO ipfstryme MESSAGE from $whoisg1" && continue # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $whoisg1 -t 'Astroport' -m 'Aucun message de ta part https://copylaradio.com'" + # REFRESH A_swarm_map.txt + echo $peerline >> ~/.zen/A_swarm_map.txt + cat ~/.zen/A_swarm_map.txt | sort | uniq > /tmp/A_swarm_map.txt + cp -f /tmp/A_swarm_map.txt ~/.zen/A_swarm_map.txt + + # FRIEND ADDRESS DISCOVERY echo "Am I friend with my FRIEND friend $whoisg1 ?" friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID if [[ "$friend_of_mine" != "null" ]]; then