From 6f5b33099c91e518b6aca787f5acbb18f6996bfe Mon Sep 17 00:00:00 2001 From: qo-op Date: Fri, 19 Mar 2021 20:22:24 +0100 Subject: [PATCH] getting clean FRIEND LIST with Gstars.json & stars.level --- zen/gchange_INIT.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 9b06fef..5e5e575 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -122,28 +122,36 @@ do fi fi -##### CHECKING IF WE LIKE EACH OTHER (AVOID LIKING MYSELF) - # publish star friends map - [[ -d ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/ ]] && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $liking_me > ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/Gstars.json - friend_of_mine=$(cat ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/Gstars.json | jq -r '.yours'); +##### CHECKING IF WE LIKE EACH OTHER (AVOID LIKING MYSELF) + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $liking_me > /tmp/Gstars.json + [[ ! -f /tmp/Gstars.json ]] && rm -Rf ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me && echo "$liking_me is a DEAD FRIEND !!!" && continue + + friend_of_mine=$(cat /tmp/Gstars.json | jq -r '.yours'); if [[ "$friend_of_mine" != "null" && "$liking_me" != "$G1PUB" ]] then # ADD $liking_me TO MY ipfs FRIENDS list + echo "$liking_me is my FRIEND" mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me + + # REFRESH & PUBLISH stars friends map + stars="$(cat /tmp/Gstars.json | jq -r '.yours.level')" + [[ "$stars" == "null" ]] && rm -Rf ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me && echo "$friend_of_mine NO STAR !! Removing $liking_me" && continue ## REMOVE NO GOOD FRIENDS (no star) + cp /tmp/Gstars.json ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/ + echo "$stars" > ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/stars.level && echo "***** $stars STARS *****" + # SEND jaklis message if tryme.addr is different from last one if [[ $(diff ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/tryme.addr 2>&1) ]] then echo "I AM $G1PUB" echo "Sending IPFSTRYME message to $liking_me" if [[ -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr ]]; then - ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr - echo $(cat ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/Gstars.json | jq -r '.yours.level') > ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/stars.level + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr else echo 'MISSING ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr' fi else - echo "tryme.addr MESSAGE ALREADY SEND TO $liking_me" + echo "tryme.addr MESSAGE ALREADY SENT TO $liking_me" fi # MEMORIZE actual tryme.addr cp -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/