From 1fa2d182114c721d0be042f5a39cc2d8d6d7fde9 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 4 May 2020 22:22:30 +0200
Subject: [PATCH] timestamp ALREADY on NODE ~/.zen/ipfs_swarm/~$CHECKSWARM

---
 zen/ssb_GET_zenyta.sh | 10 +++++++---
 zen/ssb_GET_zenytv.sh | 12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/zen/ssb_GET_zenyta.sh b/zen/ssb_GET_zenyta.sh
index fe9692c..4b8e948 100755
--- a/zen/ssb_GET_zenyta.sh
+++ b/zen/ssb_GET_zenyta.sh
@@ -33,8 +33,8 @@ self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"
 ipfsnodeid=$(ipfs id -f='<id>\n')
 
 current_ts=$(date -u +%s%N | cut -b1-13)
-[ -s ~/.zen/zenyta.last.ts ] && last_ts=$(cat ~/.zen/zenyta.last.ts) || last_ts=$((current_ts - 24*3600*1000 + 1)) # 24h ago
-
+[ -s ~/.zen/zenyta.last.ts ] && last_ts=$(cat ~/.zen/zenyta.last.ts) || last_ts=$((current_ts - 24*3600*1000)) # 24h ago
+last_ts=$((last_ts + 1))
 echo "Hi, i am [$self_name]($self)
 last timestamp: $last_ts"
 echo '
@@ -67,7 +67,11 @@ do
     # TEST if SWARM already made it.
     $MY_PATH/ipfs_SWARM_refresh.sh
    	CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
-	[[ $CHECKSWARM ]] && echo "$timestamp ALREADY on NODE $CHECKSWARM. CONTINUE" && continue
+
+	[[ $CHECKSWARM ]] \
+    && echo "$timestamp ALREADY on NODE ~/.zen/ipfs_swarm/~$CHECKSWARM CONTINUE" \
+    && [[ $timestamp ]] && echo "$((timestamp))" > ~/.zen/zenyta.last.ts \
+    && continue
     
     msg_root=$(printf %s "$msg" | jq -r .value.content.root)
 #    echo $msg_root
diff --git a/zen/ssb_GET_zenytv.sh b/zen/ssb_GET_zenytv.sh
index a536819..51d07fa 100755
--- a/zen/ssb_GET_zenytv.sh
+++ b/zen/ssb_GET_zenytv.sh
@@ -32,8 +32,8 @@ self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"
 ipfsnodeid=$(ipfs id -f='<id>\n')
 
 current_ts=$(date -u +%s%N | cut -b1-13)
-[ -s ~/.zen/zenytv.last.ts ] && last_ts=$(cat ~/.zen/zenytv.last.ts) || last_ts=$((current_ts - 24*3600*1000 + 1)) # 24h ago
-
+[ -s ~/.zen/zenytv.last.ts ] && last_ts=$(cat ~/.zen/zenytv.last.ts) || last_ts=$((current_ts - 24*3600*1000)) # 24h ago
+last_ts=$((last_ts + 1))
 echo "Hi, i am [$self_name]($self)
 last timestamp: $last_ts"
 echo '
@@ -65,7 +65,11 @@ do
     # TEST if SWARM already made it.
     $MY_PATH/ipfs_SWARM_refresh.sh
    	CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
-	[[ $CHECKSWARM ]] && echo "$timestamp ALREADY on NODE $CHECKSWARM. CONTINUE" && continue
+
+	[[ $CHECKSWARM ]] \
+    && echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \
+    && [[ $timestamp ]] && echo "$((timestamp))" > ~/.zen/zenytv.last.ts \
+    && continue
 
     msg_root=$(printf %s "$msg" | jq -r .value.content.root)
 #    echo $msg_root
@@ -85,7 +89,7 @@ do
 --no-mtime -o "~/.zen/miam/$timestamp/%(id)s.%(ext)s" $msg_ytdlurl
 
     # REFERENCE msg_key AND timestamp
-    [[ $timestamp ]] && echo "$((timestamp + 1))" > ~/.zen/zenytv.last.ts
+    [[ $timestamp ]] && echo "$((timestamp))" > ~/.zen/zenytv.last.ts
     [[ $msg_key ]] && echo "$msg_key" >  ~/.zen/miam/$timestamp/msg_key
     
     $MY_PATH/miam_miam.sh "$timestamp"