From df22d98e26ce882afb353c5549012ffe724cc003 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Fri, 2 Apr 2021 19:48:16 +0200
Subject: [PATCH] peerline error now correct

---
 zen/ipfs_SWARM_refresh.sh | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index d7cbb83..4f7726d 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -39,7 +39,7 @@ count=1
 for ipfsnodeid in $(ipfs swarm peers | grep -o '[^/]*$' && cat ~/.zen/A_swarm_map.txt | grep -o '[^/]*$' | sort | uniq);
 do
     ## $ipfsnodeid already Treated ?
-	[[ $(cat /tmp/treated.ipfs.swarm | grep $ipfsnodeid ) ]] && continue
+	[[ $(cat /tmp/treated.ipfs.swarm | grep "$ipfsnodeid") ]] && continue
 	[[ $(cat ~/.zen/A_dead_swarm.txt | grep "$ipfsnodeid") ]] && continue
 
     # Convert ipfsnodeid into g1pub
@@ -47,13 +47,15 @@ do
     
 	# control ip isLAN?
 	peerline=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | head -n 1)
-	[[ ! $peerline ]] && peerline=$(ipfs swarm peers | grep "$ipfsnodeid")
+	[[ ! $peerline ]] && peerline=$(ipfs swarm peers | grep "$ipfsnodeid" | head -n 1)
     ip=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | awk -F '/' '{print $3}' | head -n 1)
     isLAN=$(echo $ip | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
 
     nowdate=$(date)
 
+	echo "#############################################################"
     echo "### ANALYZING $whoisg1 = $ipfsnodeid ($ip) ###"
+    echo "$peerline"
 	myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid )
 	if [[ "$myfriendpeer" != "" ]]; then
 		[[ ! $(ipfs swarm peers | grep $ipfsnodeid) ]] && ipfs swarm connect "$peerline" && ipfs bootstrap add "$peerline"
@@ -65,14 +67,13 @@ do
 			echo $ipfsnodeid > ~/.zen/A_dead_swarm.txt
 			## SEND MESSAGE ABOUT UNREACHABLE FRIEND
 			[[ "$IPFSNODEID" != "$ipfsnodeid" ]] && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $G1PUB -t "ALERT" -m "Impossible de se synchroniser avec $whoisg1"	
-				# KEEPING LAST 10 ALERT MESSAGES
-				nbmessage=0
-				for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey read -n300 -j | jq -r --arg friendKEY "$G1PUB" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ALERT")' | jq -r '.id')
-				do
-					nbmessage=$((nbmessage+1))
-					[ $nbmessage -gt 10 ] && echo "Delete $nbmessage OLD 'ALERT' messages from $G1PUB" && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey delete -i $messageid && sleep 0.5
-				done				
-
+			# KEEPING LAST 10 ALERT MESSAGES
+			nbmessage=0
+			for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey read -n300 -j | jq -r --arg friendKEY "$G1PUB" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ALERT")' | jq -r '.id')
+			do
+				nbmessage=$((nbmessage+1))
+				[ $nbmessage -gt 10 ] && echo "Delete $nbmessage OLD 'ALERT' messages from $G1PUB" && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey delete -i $messageid && sleep 0.5
+			done
 		fi
 	else
 		[[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat ~/.zen/astrXbian/DEFCON) # like in crom_MINUTE.sh
@@ -88,12 +89,16 @@ do
 			sudo fail2ban-client set recidive banip $ip
 			# Show ALL banned IP 
 			sudo fail2ban-client status recidive
+			
 			## DEFCON 3
-			# Ban all known ipfsnodeid ip 
+			# Ban all known ipfsnodeid ip
+			
 			## DEFCON 2
 			# nmap NOT FRIEND
+			
 			## DEFCON 1
 			# DDOS NOT FRIEND
+			
 		fi
 		if [[ ! $isLAN ]]; then
 			ipfs swarm disconnect "$peerline"
@@ -107,18 +112,14 @@ done
 # REFRESH Film Serie Anime Youtube ${PREFIX}ASTRXBIAN index
 ########################################################################
 mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
+AXID=$(cat ~/.zen/ipfs/.$IPFSNODEID/_xbian.zuid);
 
-for PREFIX in F S A
+for PREFIX in F S A Y
 do
 	echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 	cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sed "s/anime;/film;/g" | sed '/^[[:space:]]*$/d' | grep -Ev "CAT;TMDB" | sort | uniq >> ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 done
 
-## YOUTUBE
-AXID=$(cat ~/.zen/ipfs/.$IPFSNODEID/_xbian.zuid);
-echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/YASTRXBIAN
-cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/YASTRXBIAN | sed "s/\[Youtube\]/\[\"$AXID\"\]/g" | sed '/^[[:space:]]*$/d' | grep -Ev "CAT;TMDB" | sort | uniq >> ~/.zen/ipfs/.${IPFSNODEID}/YASTRXBIAN
-
 ########################################################################
 # TODO PUBLISH tiddlywiki WALL OF FRIENDS 
 ########################################################################