From 748f56f4628613f0d0b4335d9287e7a18c41128e Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sun, 31 Jan 2021 17:34:46 +0100
Subject: [PATCH] BETTER SWARM CONTROL

---
 zen/gchange_IPFS_swarm.sh | 14 +++++++++++---
 zen/ipfs_SWARM_refresh.sh |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh
index b71b317..0d93135 100755
--- a/zen/gchange_IPFS_swarm.sh
+++ b/zen/gchange_IPFS_swarm.sh
@@ -41,6 +41,7 @@ do
 	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 ""
 			echo "PEERLINE: $peerline"
 			# REFERSH A_swarm_map.txt
 			echo $peerline >> ~/.zen/A_swarm_map.txt
@@ -54,10 +55,13 @@ do
             echo "AM I FRIEND WITH MY FRIEND FRIEND $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" != "null" ]]; then
-				friend_of_mine_count=$((friend_of_mine_count+1))
 				echo "YEAH IT IS ALSO MY FRIEND !!!"
-				# TODO: SHOULD CHECK ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$whoisg1/tryme.addr
-				echo $peerline >> ~/.zen/A_my_swarm.txt
+
+				# SHOULD WE CHECK ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$whoisg1/tryme.addr ?
+
+				# COUNT UNIQ FRIENDS
+				[[ ! $(grep "$peerline" ~/.zen/A_my_swarm.txt) ]] && friend_of_mine_count=$((friend_of_mine_count+1)) && echo "$peerline" >> ~/.zen/A_my_swarm.txt
+
 				# REMOVING OLD ipfstryme MESSAGES
 				nbmessage=0
 				for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id')
@@ -66,6 +70,10 @@ do
 					[ $nbmessage -gt 1 ] && echo "Delete $nbmessage OLD 'ipfstryme' messages from $whoisg1" && ~/.zen/astrXbian/zen/jaklis/jaklis.py delete -i $messageid
 					sleep 0.5
 				done				
+				[[ $nbmessage == 0 ]] && echo "NO MESSAGE FROM THIS FRIEND $whoisg1"
+			else
+				echo "NOT MY FRIEND $ipfsnodeid / $whoisg1"
+				# SEND ME A MESSAGE TO DECIDE WHAT TO DO ?
 			fi
         done;
         
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index 3025204..9626cf7 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -60,7 +60,7 @@ do
 	else
 		DEFCON=$(cat ~/.zen/astrXbian/DEFCON)
 		echo "!!! NOT MY FRIEND !!! ___________________ # DEFCON : $DEFCON "
-		if [[ $DEFCON < 5 ]]
+		if [[ ( $DEFCON < 5 ) && ! $isLAN ]]
 		then
 			fail2ban-client add recidive 2>/dev/null 1>&2
 			fail2ban-client start recidive