From 6ee6c9a9af7d1372d3c6f961ce768935b862cde2 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Fri, 25 Dec 2020 18:10:39 +0100
Subject: [PATCH] create swarm_map and my_swam files

---
 zen/gchange_IPFS_swarm.sh | 96 +++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 55 deletions(-)

diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh
index 5a855b0..0b4c292 100755
--- a/zen/gchange_IPFS_swarm.sh
+++ b/zen/gchange_IPFS_swarm.sh
@@ -32,9 +32,8 @@ isIPFSRunning=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|gr
 
 # Force Strict #swarm0 !!?
 # ipfs bootstrap rm --all
-echo "" > ~/.zen/A_allow_ip.txt
-echo "" > ~/.zen/A_allow_ipfsid.txt
-echo "" > ~/.zen/A_liking_me_NO_ipfstryme.txt # contains "friends" with no "ipfstryme" incoming message
+echo "" > ~/.zen/A_my_swarm.txt
+echo "" > ~/.zen/A_swram_map.txt
 liking_me_count=0
 friend_of_mine_count=0
 
@@ -44,66 +43,53 @@ friend_of_mine_count=0
 # 1. Get Gchange "liking_me" people list
 for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py like | jq -r '.likes[].issuer');
 do
+	[[  "$liking_me" == "" ]] && continue
+	# DE TOUS CEUX QUI M'AIMENT JE VAIS LIRE LES MESSAGES pour collecter les ipfstryme vers ~/.zen/A_swram_map.txt
+	# SI JE SUIS LEUR AMI EN RETOUR, je conserve leur ID dans ~/.zen/A_my_swarm.txt
 	# Check if my like is reverse 
-    friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py like -p $liking_me | jq -r '.yours.pseudo'); # contains my XZUID
-
-    [[ $friend_of_mine != null ]] && echo "Connect to my friend $liking_me"  && friend_of_mine_count=$((friend_of_mine_count+1)) && ipfsadd=0 \
-    &&  for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content');
-		# 2. Searching "ipfstryme" message from friend_of_mine
-        do
-            ip=$(echo "$peerline" | awk -F '/' '{print $3}') && [[ $ip == "" ]] && continue || echo "Adding $ip to ~/.zen/A_allow_ip.txt"
-            # Fill a file with friend of mine ip 
-			echo $ip >> ~/.zen/A_allow_ip.txt
-			# Get its ipfsnodeid
-            ipfsnodeid=$(echo "$peerline" | awk -F '/' '{print $7}')
-			echo $ipfsnodeid >> ~/.zen/A_allow_ipfsid.txt
-			
-			g1id=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py "$ipfsnodeid")
-			if [[ "$g1id" == "$friend_of_mine" ]]; then
-				# 3. ADD liking_me friend_of_mine to my swarm & bootstrap
-				ipfs swarm connect $peerline;
-				ipfs bootstrap add $peerline;
-            
-				ipfsadd=$((ipfsadd+1))
-			else
-				echo "ALERT!!! $friend_of_mine spoofing is happening"
-            fi
-        done;
-
-
-	if [[ $friend_of_mine != null ]]; then
-		if [[ $ipfsadd == 0 ]]; then
-			# Friend of mine with no ipfstryme message (did not install astroport)
-			echo "No 'ipfstryme' message... from $liking_me" 
-			echo "$liking_me" >> ~/.zen/A_liking_me_NO_ipfstryme.txt
-
-		else	
-			# REMOVING DUPLICATES OLD ipfstryme MESSAGES
-			nbmessage=0
-			for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id')
-			do
-				nbmessage=$((nbmessage+1))
-				[ $nbmessage -gt 1 ] && echo "Delete OLD 'ipfstryme' messages from $liking_me" && ~/.zen/astrXbian/zen/jaklis/jaklis.py delete -i $messageid
-			done
-		fi
-
-	fi
-	echo "__________________________________________"
 	liking_me_count=$((liking_me_count+1))
+	echo ">>>>>> CHECKING my friend n° $liking_me_count"
+	echo "READING 'ipfstryme' message from $liking_me"
+	for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content');
+        do
+			echo "$peerline"
+			# A_swarm_map.txt
+            cat ~/.zen/A_swarm_map.txt | grep -v -E "$peerline" > ~/.zen/A_swarm_map.txt
+            # Fill a file with friend of mine ip 
+			echo $peerline >> ~/.zen/A_swarm_map.txt
+			# Get its ipfsnodeid
+			
+            ipfsnodeid=$(echo "$peerline" | awk -F '/' '{print $7}')
+            whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
+            echo "Am I friend whith $whoisg1 ?"
+			friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py like -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID
+			if [[ "$friend_of_mine" != "" ]]; then
+				friend_of_mine_count=$((friend_of_mine_count+1))
+				echo "YEAH FRIEND !!!"
+				echo $peerline >> ~/.zen/A_my_swarm.txt
+				# REMOVING DUPLICATES OLD ipfstryme MESSAGES
+				nbmessage=0
+				for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id')
+				do
+					nbmessage=$((nbmessage+1))
+					[ $nbmessage -gt 1 ] && echo "Delete OLD 'ipfstryme' messages from $liking_me" && ~/.zen/astrXbian/zen/jaklis/jaklis.py delete -i $messageid
+					sleep 0.5
+				done				
+			fi
+        done;
+        
+	echo "__________________________________________"
+
 done
 
+cat ~/.zen/A_my_swarm.txt
 
 echo "####################################################
 I have $friend_of_mine_count friends amoung $liking_me_count liking me people
 __________________________________________
 My actual #SWARM0"
 ipfs swarm peers
-echo "__________________________________________"
-echo
-## Could send message to friends with 'ipfstryme' message
-for line in $(cat ~/.zen/A_liking_me_NO_ipfstryme.txt | uniq); do
-	echo "Liking each other, but no ipfstryme received..."
-	echo "cd ~/.zen/astrXbian/zen/jaklis"
-    echo "./jaklis.py send -d $line -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'"
-done
+
+# HONTO SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $line -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'"
+