diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 3bbe69d..5957bf9 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -50,7 +50,7 @@ title=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.title') # Put in .$IPFSNODEID INDEX: _g1.uidna & _g1.cesium_name (used by Minetest flavour and others) [[ $uidna ]] && echo "$uidna" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.uidna -[[ $title ]] && echo "$title" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.cesium_name +[[ $title ]] && echo "$title" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_name [[ $uidna ]] && [[ "$title" == "null" ]] && title="Station $uidna" [[ "$title" == "null" ]] && title="Station $USER@$(cat /etc/hostname)" @@ -62,21 +62,20 @@ city=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.city') # ADD "cesium_geoPoint.lat" AND "cesium_geoPoint.lon" messages in SSB feed # This way any SSB account is connected to its Cesium+ Geolocalisation. geopointlat=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq '._source.geoPoint.lat') -[[ $geopointlat != null ]] && sbotc publish '{"type":"cesium_geoPoint.lat","text":"'"$geopointlat"'"}' geopointlon=$(curl -s ${GCHANGE}/user/profile/${G1PUB} | jq '._source.geoPoint.lon') -[[ $geopointlon != null ]] && sbotc publish '{"type":"cesium_geoPoint.lon","text":"'"$geopointlon"'"}' # REFRESH Cesium+ Avatar image -curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.avatar._content' | base64 -d > "/tmp/_g1.avatar.png" +curl -s ${GCHANGE}/user/profile/${G1PUB} | jq -r '._source.avatar._content' | base64 -d > "/tmp/_gchange.avatar.png" # Get nodename -nodename=$(cat /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename) +[[ -f /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename ]] && nodename=$(cat /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename) if [[ $nodename == "" ]]; then nodename=$(cat /etc/hostname) extension=$(echo $nodename | cut -d '.' -f 2) if [[ $extension == $nodename ]]; then nodename=$nodename.home fi + echo "$nodename" > /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename fi ######################################################################## # DUNITER G1 Wallet balance @@ -105,10 +104,12 @@ NODEIPNS=$(ipfs name publish --allow-offline --quieter /ipfs/$IWALLETS) cd ~/.zen/astroport/zen/cesium-messaging # GET LIST of issuer(s) who likes me -for friend in $(./jaklis.py like | jq -r '.likes[].issuer') +for liking_me in $(./jaklis.py like | jq -r '.likes[].issuer'); do + # CHECk if I am liking him either + friend_of_mine=$(./jaklis.py like -p $liking_me | jq -r '.yours'); echo "Sending IPFSTRYME message to $friend" - ./jaklis.py send -d $friend -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + [[ $friend_of_mine != null ]] && ./jaklis.py send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr done cd - # TODO: This message should be regularly deleted by receiver and sent again to refresh changing IP diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh index 8c383ff..616eec7 100755 --- a/zen/gchange_IPFS_swarm.sh +++ b/zen/gchange_IPFS_swarm.sh @@ -49,7 +49,7 @@ for liking_me in $(./jaklis.py like | jq -r '.likes[].issuer'); do friend_of_mine=$(./jaklis.py like -p $liking_me | jq -r '.yours'); # 2. Searching "ipfstryme" message from friend_of_mine - [[ $friend_of_mine != null ]] && echo "Try to connect to my friend $liking_me" && friend_of_mine_count=$((friend_of_mine_count+1)) && ipfsadd=0 \ + [[ $friend_of_mine != null ]] && echo "Connect to my friend $liking_me" && friend_of_mine_count=$((friend_of_mine_count+1)) && ipfsadd=0 \ && for adresse in $(./jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content'); do # 3. liking_me friend_of_mine can join my swarm & bootstrap