From 88b8094acd5f298f247e5f54105e5a10e8c81150 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 1 Feb 2021 04:00:38 +0100
Subject: [PATCH] ~/.zen/ipfs/.${IPFSNODEID}/_timestamp

---
 ajouter_video.sh          | 2 +-
 zen/ipfs_SWARM_refresh.sh | 9 +++++++--
 zen/mint_youtube.sh       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ajouter_video.sh b/ajouter_video.sh
index b66764b..b0a40ca 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -189,7 +189,7 @@ then
 
 	echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
 	echo "-----------------------------------------------------------------"
-	echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/_timestamp
+	echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
 	MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 	echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
 	NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index c8dc614..ece3820 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -56,7 +56,10 @@ do
 		[[ ! $(ipfs swarm peers | grep $ipfsnodeid) ]] && ipfs swarm connect "$peerline" && ipfs bootstrap add "$peerline"
 		echo "OK Friend REFRESH /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/"
 		$MY_PATH/tools/timeout.sh -t 12 ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
-		if [ $? != 0 ]; then echo "TIMEOUT REACHED ___ REMOVE $ipfsnodeid FROM ~/.zen/A_my_swarm.txt"; fi
+		if [ $? != 0 ]; then
+			echo "TIMEOUT REACHED ___ REMOVE $ipfsnodeid FROM ~/.zen/A_my_swarm.txt";
+			grep -vEi $ip ~/.zen/A_my_swarm.txt
+		fi
 	else
 		DEFCON=$(cat ~/.zen/astrXbian/DEFCON)
 		echo "!!! NOT MY FRIEND !!! ___________________ # DEFCON : $DEFCON "
@@ -74,6 +77,8 @@ do
 		# INFORM _FAIL2BAN STATUS in ipfs_swarm/.$ipfsnodeid
 		mkdir -p ~/.zen/ipfs_swarm/.$ipfsnodeid
 		echo "$ip" > ~/.zen/ipfs_swarm/.$ipfsnodeid/_FAIL2BAN
+		# REMOVE IT (TODO)
+		rm ~/.zen/ipfs_swarm/.$ipfsnodeid/_FAIL2BAN
 	fi
 done
 
@@ -99,7 +104,7 @@ cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${P
 
 ########################################################################
 echo "PUBLISHING ~/.zen/ipfs SELF /ipns/$IPFSNODEID"
-echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/_timestamp
+echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh
index 69dbbc2..8607cb8 100755
--- a/zen/mint_youtube.sh
+++ b/zen/mint_youtube.sh
@@ -88,7 +88,7 @@ cat ~/.zen/ipfs*/xbian/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${P
 ########################################################################
 echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
 echo "-----------------------------------------------------------------"
-echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/_timestamp
+echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/_timestamp
 MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/_chain ## THIS SIMPLE LINE IS BLOCKCHAIN POWERING ANY DATA PUBLISHED TO IPFS !!!
 NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)