From d1e56500fbbaf9248460a729e319a5dff2bd7b91 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 4 Mar 2023 17:17:39 +0100
Subject: [PATCH] TW are like "small worlds" making "wishes" connected to same.
 ASTRO is putting wishes with same name together Each Station keeps record of
 visitor wishes in  ~/.zen/game/world/G1WishName/

---
 ASTROBOT/G1Voeu.sh |  3 ++-
 tools/VISA.new.sh  | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh
index ef5130b4..275b7d65 100755
--- a/ASTROBOT/G1Voeu.sh
+++ b/ASTROBOT/G1Voeu.sh
@@ -177,7 +177,8 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE
     "g1pub": "'${G1PUB}'",
     "text": "'${TEXT}'",
     "tags": "'G1Voeu G1${PEPPER} ${PLAYER}'",
-    "natoolskey" : "'${ENCODING}'"
+    "asksalt": "'${HPass}'",
+    "sslpassdunikeysec" : "'${ENCODING}'"
   }
 ]
 ' > ~/.zen/game/world/$PEPPER/$WISHKEY/${PEPPER}.voeu.json
diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh
index 3a209916..a664743e 100755
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@@ -162,11 +162,13 @@ NID="${myIPFS}"
 WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
 WID="https://ipfs.$(myHostName)/api"
 # WID="http://ipfs.$(myHostName):5001"
-DISCO="https://astroport.$(myHostName)/?salt=${SALT}&pepper=${PEPPER}&logout=${PLAYER}"
+USALT=$(echo "$SALT" | jq -Rr @uri)
+UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
+DISCO="https://astroport.$(myHostName)/?salt=${USALT}&pepper=${UPEPPER}&logout=${PLAYER}"
 
 [[ $isLAN ]] && NID="http://ipfs.localhost:8080" \
                         && WID="http://ipfs.localhost:5001" \
-                         && DISCO="http://ipfs.localhost:1234/?salt=${SALT}&pepper=${PEPPER}"
+                         && DISCO="http://ipfs.localhost:1234/?salt=${USALT}&pepper=${UPEPPER}"
 
 ####
 
@@ -226,6 +228,9 @@ DISCO="https://astroport.$(myHostName)/?salt=${SALT}&pepper=${PEPPER}&logout=${P
          sed -i "s~_PEPPER_~${PEPPER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
          sed -i "s~_PASS_~${PASS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
 
+        ## RESET WISHES TO DEPLOY DERIVATED KEYS ON HOST AGAIN
+        sed -i "s~G1Voeu~voeu~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
+
         ## Fill ♥BOX
          sed -i "s~_URL_~${URL}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
 
@@ -300,6 +305,7 @@ DISCO="https://astroport.$(myHostName)/?salt=${SALT}&pepper=${PEPPER}&logout=${P
         tiddlywiki  --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
                             --import ~/.zen/tmp/${MOATS}/lightbeam-name.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/lightbeam-key.json "application/json" \
+                            --import ~/.zen/tmp/${MOATS}/lightbeam-natools.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/local.api.json "application/json" \
                             --import ~/.zen/tmp/${MOATS}/local.gw.json "application/json" \
     --import "$HOME/.zen/Astroport.ONE/templates/tw/\$ _ipfs_saver_api.json" "application/json" \
@@ -416,6 +422,7 @@ echo "$(${MY_PATH}/face.sh cool)"
 echo " 'Astronaute'  $PSEUDO"
 echo
 echo "G1VISA : ${myIPFS}/ipfs/${IASTRO}"
+echo "ASTROQR : ${myIPFS}/ipfs/${ASTROQR}"
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 echo "${PLAYER}"
 echo "Portefeuille (ğ1) : $G1PUB"; sleep 1
@@ -435,9 +442,9 @@ echo
 echo "Explorateur du Web3 en Monde Libre et en Toile(s) de Confiance.
 BIENVENUE
 "
-echo "votre TW est là : ${myIPFS}/ipns/${ASTRONAUTENS}
-contactez support@qo-op.com pour obtenir une URL plus facile à retenir..."
-
+echo "G1FRAME : ${myIPFS}/ipns/${FEEDNS}"
+echo "TW : ${myIPFS}/ipns/${ASTRONAUTENS}"
+echo echo
 echo "$(${MY_PATH}/face.sh friendly)
 DISCONNECT : $DISCO&logout=${PLAYER}
 CONNECT : $DISCO&login=${PLAYER}"