From b8c2a2a91fd500ee32956ff1a737eac0743a676c Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Thu, 20 May 2021 15:55:45 +0200
Subject: [PATCH] ipfs_to_g1.py Qm protection

---
 zen/gchange_IPFS_swarm.sh |  6 +++++-
 zen/ipfs_SWARM_refresh.sh | 11 ++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh
index 443859d..bd75d1e 100755
--- a/zen/gchange_IPFS_swarm.sh
+++ b/zen/gchange_IPFS_swarm.sh
@@ -42,7 +42,8 @@ do
             [[ "$ipfsnodeid" == "" ]] && continue
             [[ $(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid ) ]] && continue # ALREADY in my SWARM
 			# GET $whoisg1 FROM $peerline
-            whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
+			## Remove Qm ipfs nodes
+            [[ ! "${ipfsnodeid:0:2}" == "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) || && echo "$ipfsnodeid" >> ~/.zen/A_Qm_swarm.txt && continue
 
 			# KEEPING LAST ipfstryme MESSAGES only
 			nbmessage=0
@@ -90,6 +91,9 @@ done
 cat ~/.zen/A_my_swarm.txt | sort | uniq > /tmp/A_my_swarm.txt
 cp -f /tmp/A_my_swarm.txt ~/.zen/A_my_swarm.txt
 
+cat ~/.zen/A_Qm_swarm.txt | sort | uniq > /tmp/A_Qm_swarm.txt
+cp -f /tmp/A_Qm_swarm.txt ~/.zen/A_Qm_swarm.txt
+
 echo "####################################################
 I have $friend_of_mine_count friends amoung $liking_me_count liking me people
 __________________________________________
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index 4929687..79ea3e6 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -49,15 +49,13 @@ ipfs swarm peers > /tmp/ipfs_swarm_peers
 for ipfsnodeid in $( (cat /tmp/ipfs_swarm_peers | grep -o '[^/]*$' && cat /tmp/A_swarm | grep -o '[^/]*$' ) | sort | uniq);
 do
     ## $ipfsnodeid already Treated ?
+	[[ "$ipfsnodeid" == "$IPFSNODEID" ]] && continue
 	[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && XID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid) || XID=''
 	[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title) || XZUID=''
 	[[ "$XID" == "" ]] && ipfs swarm disconnect /ipfs/$ipfsnodeid ## NOT COMPLIANT STATION
 	# [[ $(cat /tmp/treated.ipfs.swarm | grep "$ipfsnodeid") ]] && continue
 	[[ $(cat ~/.zen/A_dead_swarm.txt | grep "$ipfsnodeid") ]] && continue
-	[[ "$ipfsnodeid" == "$IPFSNODEID" ]] && continue
-	
-    # Convert ipfsnodeid into g1pub
-    whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
+
     
 	# control ip isLAN?
 	peerline=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | head -n 1)
@@ -66,9 +64,12 @@ do
     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)
+
+    # Convert ipfsnodeid into g1pub
+    [[ ! "${ipfsnodeid:0:2}" == "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) || echo "$ipfsnodeid" >> ~/.zen/A_dead_swarm.txt
     
 	echo "#############################################################"
-    echo "### ANALYZING $whoisg1 = $ipfsnodeid ($ip) $XID $XZUID ###"
+    echo "### ANALYZING $ipfsnodeid ($ip) $XID $XZUID ###"
     echo "$peerline"
 	myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid )
 	if [[ "$myfriendpeer" != "" ]]; then