diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh index ee0a74d..da54968 100755 --- a/zen/gchange_IPFS_swarm.sh +++ b/zen/gchange_IPFS_swarm.sh @@ -86,7 +86,7 @@ do [[ "${ipfsnodeid:0:2}" != "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) [[ ! $whoisg1 ]] && continue - # KEEPING LAST ipfstryme MESSAGES only + # KEEPING LAST ipfstryme MESSAGES only (CAN BE REMOVED SOON WHEN FULL IPFS) nbmessage=0 for messageid in $(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id') do @@ -97,6 +97,17 @@ do [[ $nbmessage == 0 ]] && echo "NO ipfstryme MESSAGE from $whoisg1" && echo "$ipfsnodeid" >> ~/.zen/A_dead_swarm.txt && continue # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $whoisg1 -t 'Astroport' -m 'Aucun message de ta part https://copylaradio.com'" + ## CHECKING VALUE CAPSULE + starsin=$(ipfs --timeout=10s cat /ipns/$ipfsnodeid/.$ipfsnodeid/FRIENDS/$G1PUB/stars.level) + starsout=$(ipfs --timeout=10s cat /ipns/$IPFSNODEID/.$IPFSNODEID/FRIENDS/$whoisg1/stars.level) + Addr=$(echo "$peerline" | rev | cut -d '/' -f 2- | rev ) +## Prepare +[[ $starsin && $starsout ]] && echo '{ + "ID": "'$ipfsnodeid'", + "Addrs": ["'$Addr'"] +},' >> ~/.zen/A_peering_peers.txt + + # 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 @@ -113,8 +124,16 @@ do # COUNT UNIQ FRIENDS friend_of_mine_count=$((friend_of_mine_count+1)) echo "$peerline" >> ~/.zen/A_my_swarm.txt - ipfs bootstrap add "$peerline" - ## NOW USING Peers.Peering config + # ipfs bootstrap add "$peerline" + + ## NOW WILL BE USING Peering.Peers config + Addr=$(echo "$peerline" | rev | cut -d '/' -f 2- | rev ) + ## Prepare # https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#peering +[[ $starsin && $starsout ]] && echo '{ + "ID": "'$ipfsnodeid'", + "Addrs": ["'$Addr'"] +},' >> ~/.zen/A_peering_peers.txt +# jq '.Peering.Peers += [{"ID": "'$ipfsnodeid'", "Addrs": "["'$Addr'"]"}]' else echo "ALREADY RECORDED FRIEND"