From 1c4ced0b80934b301b1c70eb6480c3e5fc86149e Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 30 Dec 2023 20:16:39 +0100
Subject: [PATCH] myIpfsGw is a my.sh function

---
 API/ZONE.sh               | 5 ++++-
 RUNTIME/PLAYER.refresh.sh | 2 +-
 tools/PLAYER.unplug.sh    | 2 +-
 tools/RSS2UPlanetTW.sh    | 6 ++++--
 tools/mailjet.sh          | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/API/ZONE.sh b/API/ZONE.sh
index 59bb33ca..c80fb14f 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -65,7 +65,10 @@ if [[ $DEG == "0.1" ||  $DEG == "1" ]]; then
     LAT=$(echo ${LAT} | cut -d '.' -f 1)
     LON=$(echo ${LON} | cut -d '.' -f 1)
     ZONE="_${LAT}_${LON}"
-    echo "ZONE = ${REGION}"
+    echo "ZONE = ${ZONE}"
+    ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}")
+    ZONETW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}")
+
 fi
 
 ## SECTOR LEVEL
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index 76048b11..7638dae6 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -325,7 +325,7 @@ for PLAYER in ${PLAYERONE[@]}; do
         && SNOW=$(${MY_PATH}/../tools/MOATS2seconds.sh ${MOATS}) \
         && [[ $(( SNOW - SBIRTH )) -gt $(( 27 * 24 * 60 * 60 ))  ]] \
         && echo "WARNNG. Your TW will be UNPLUGGED in 3 days" > ~/.zen/tmp/alert \
-        && echo "${myIpfsGw}/ipfs/${CURCHAIN}" >> ~/.zen/tmp/alert \
+        && echo "$(myIpfsGw)/ipfs/${CURCHAIN}" >> ~/.zen/tmp/alert \
         && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert \
         && [[ $(( SNOW - SBIRTH )) > $(( 30 * 24 * 60 * 60 ))  ]] \
         && echo ">>>> PLAYER UNPLUG >>>>> BYE BYE ${PLAYER}" \
diff --git a/tools/PLAYER.unplug.sh b/tools/PLAYER.unplug.sh
index 27a79d2e..79afdd56 100755
--- a/tools/PLAYER.unplug.sh
+++ b/tools/PLAYER.unplug.sh
@@ -49,7 +49,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
     SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
     ##############################################################
 
-        [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating UMAP WALLET ${UPLANETNAME}${LAT}/${UPLANETNAME}${LON}" && exit 1
+        [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating UMAP WALLET ${UPLANETNAME}${SECTOR}/${UPLANETNAME}${SECTOR}" && exit 1
         COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1)
         echo "SECTOR WALLET = ${COINS} G1 : ${SECTORG1PUB}"
 
diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh
index ef7b01ab..329ad398 100755
--- a/tools/RSS2UPlanetTW.sh
+++ b/tools/RSS2UPlanetTW.sh
@@ -69,6 +69,8 @@ while read title; do
         fi
         floop=1
 
+        ## TODO EXTEND CONTROL TO text AND ipfs _canonical_url
+
         ## CHECK FOR EMAIL SIGNATURES DIFFERENCE
         NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
         NEMAILS=($(echo "$NTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
@@ -123,10 +125,10 @@ Tiddler with same title is existing in ${unique_combined[*]} TW(s)
 
 $title
 
-* ACTUAL : ${myIpfsGw}/ipfs/${INSIDETID}
+* ACTUAL : $(myIpfsGw)/ipfs/${INSIDETID}
 Email addresses unique in ACTUAL Tiddler : ${IUNIQUE[*]}
 
-* NEW : ${myIpfsGw}/ipfs/${NEWTID}
+* NEW : $(myIpfsGw)/ipfs/${NEWTID}
 Email addresses unique in NEW Tiddler : ${NUNIQUE[*]}
 
 Make common email addresses : ${COMMON[*]}
diff --git a/tools/mailjet.sh b/tools/mailjet.sh
index 99af7138..15bfa0d9 100755
--- a/tools/mailjet.sh
+++ b/tools/mailjet.sh
@@ -88,8 +88,8 @@ json_payload='{
                 }
             ],
             "Subject": "'${SUBJECT}'",
-            "TextPart": "'${myIpfsGw}/ipfs/${EMAILZ}'",
-            "HTMLPart": "<h3>You have a message <br><a href=\"'${myIpfsGw}'/ipfs/'${EMAILZ}'\">READ ME</a>!</h3><br />May the good vibes be with you!<br>Astroport Station "
+            "TextPart": "'$(myIpfsGw)/ipfs/${EMAILZ}'",
+            "HTMLPart": "<h3>You have a message <br><a href=\"'$(myIpfsGw)'/ipfs/'${EMAILZ}'\">READ ME</a>!</h3><br />May the good vibes be with you!<br>Astroport Station "
         }
     ]
 }'