From f7002dce99ed1750d2bd6d6b409cd09ec8c86a41 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 2 Dec 2023 22:26:31 +0100
Subject: [PATCH] this is hot

---
 RUNTIME/VISA.new.sh    | 14 +++++++++++---
 tools/PLAYER.unplug.sh |  4 +++-
 tools/RSS2UPlanetTW.sh |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh
index cc8604165..9825c9132 100755
--- a/RUNTIME/VISA.new.sh
+++ b/RUNTIME/VISA.new.sh
@@ -271,9 +271,16 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
 
         sed -i "s~_ASTRONAUTENS_~/ipns/${ASTRONAUTENS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
 
-        ## AstroID ASTROID Update
-        [[ ! ${AstroID} ]] && AstroID="/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i"
-        sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
+        ## AstroID Tiddler UPGRADE
+        cat ${MY_PATH}/../templates/data/AstroID.json \
+            | sed -e "s~/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i~${ASTROQR}~g" \
+                    -e "s~_PLAYER_~${PLAYER}~g" \
+                    -e "s~_G1PUB_~${G1PUB}~g" \
+                    -e "s~_ASTRONAUTENS_~${ASTRONAUTENS}~g" \
+                    -e "s~_HPASS_~${HPASS}~g" \
+                > ~/.zen/tmp/${MOATS}/AstroID.json
+
+        sed -i "s~${AstroID}~${ASTROQR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ## NOT CYPHERED AstroID
 
         sed -i "s~tube.copylaradio.com~$myTUBE~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
         sed -i "s~ipfs.copylaradio.com~$myTUBE~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
@@ -367,6 +374,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
                             --import ~/.zen/tmp/${MOATS}/local.api.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/local.gw.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/GPS.json "application/json" \
+                            --import ~/.zen/tmp/${MOATS}/AstroID.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/MadeInZion.json "application/json" \
     --import "${MY_PATH}/../templates/tw/\$ _ipfs_saver_api.json" "application/json" \
     --import "${MY_PATH}/../templates/tw/\$ _ipfs_saver_gateway.json" "application/json" \
diff --git a/tools/PLAYER.unplug.sh b/tools/PLAYER.unplug.sh
index 84989e19e..116631170 100755
--- a/tools/PLAYER.unplug.sh
+++ b/tools/PLAYER.unplug.sh
@@ -40,11 +40,13 @@ mkdir -p ~/.zen/tmp/${MOATS}
     [[ ! -z ${SWARMG1PUB} ]] \
     && ALL="ALL" \
     && [[ $ONE == "ONE" ]] && ALL=1 \
+    && echo "ZEN:${ALL} WALLET MOVE" \
     && ./PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SWARMG1PUB}" "ZEN:${ALL}"
 
 ## REMOVING PLAYER from ASTROPORT
     ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
-    for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do
+    for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* 2>/dev/null | rev | cut -d / -f 1 | rev); do
+        echo "removing wish ${vk}"
         ipfs key rm ${vk}
     done
 
diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh
index b85380163..ca48a679a 100755
--- a/tools/RSS2UPlanetTW.sh
+++ b/tools/RSS2UPlanetTW.sh
@@ -26,8 +26,8 @@ echo "SECTOR TW INSERTING" ${RSS}
 cat "${RSS}" | jq -r '.[] | .title' > ~/.zen/tmp/${MOATS}/titles.list
 
 while read title; do
-
-    [[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
+    # FILTER Astroport and les than 3 characters title Tiddlers (ex: GPS, ...)
+    [[ ${title} == "GettingStarted" || ${title::3} == ${title} || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
         && echo "FILTERED TITLE ${title}" && continue
 
     ## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW