From 4ddc088fd83e776a37679d41607ef1de9bc08eda Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Wed, 11 Jan 2023 01:25:02 +0100
Subject: [PATCH] MOATS=$9

---
 12345.sh                           |  6 +++---
 API/PLAYER.sh                      |  3 ++-
 API/QRCODE.sh                      | 11 +++++++++--
 API/SALT.sh                        |  2 +-
 tools/Connect_PLAYER_To_Gchange.sh |  1 -
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/12345.sh b/12345.sh
index 2cdc17a1..46c566c1 100755
--- a/12345.sh
+++ b/12345.sh
@@ -182,15 +182,15 @@ while true; do
 
     case $CMD in
         "salt")
-            exec ${MY_PATH}/API/SALT.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" &
+            exec ${MY_PATH}/API/SALT.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" "${MOATS}" &
         ;;
 
         "player")
-            exec ${MY_PATH}/API/PLAYER.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" &
+            exec ${MY_PATH}/API/PLAYER.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" "${MOATS}" &
         ;;
 
         "qrcode")
-            exec ${MY_PATH}/API/QRCODE.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" &
+            exec ${MY_PATH}/API/QRCODE.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" "${MOATS}" &
         ;;
 
         "")
diff --git a/API/PLAYER.sh b/API/PLAYER.sh
index 7fa3ce82..714fb0bd 100755
--- a/API/PLAYER.sh
+++ b/API/PLAYER.sh
@@ -21,7 +21,8 @@ Content-Type: text/html; charset=UTF-8
 
 start=`date +%s`
 
-# PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8
+PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9
+
 PORT=$1 PLAYER=$2 APPNAME=$3 WHAT=$4  OBJ=$5 VAL=$6
 
         echo "- $PLAYER - $APPNAME : $WHAT $OBJ $VAL"
diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index b1e910d9..c3d36dfa 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -21,11 +21,16 @@ Content-Type: text/html; charset=UTF-8
 
 start=`date +%s`
 
-PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8
+PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9
+
 QRCODE=$THAT
 URL=$THIS
 TYPE=$WHAT
 
+
+ASTRONAUTENS=$(~/.zen/Astroport.ONE/tools/g1_to_ipfs.py ${QRCODE})
+echo "ipfs --timeout 120s cat  /ipns/$ASTRONAUTENS > ~/.zen/tmp/${MOATS}/index.html" \
+        && ipfs --timeout 120s cat  /ipns/$ASTRONAUTENS > ~/.zen/tmp/${MOATS}/index.html
 ###################################################################################################
 ###################################################################################################
 # API TWO : ?qrcode=G1PUB&url=____&type=____
@@ -36,7 +41,9 @@ TYPE=$WHAT
         PLAYER=$(echo "$g1pubpath" | rev | cut -d '/' -f 2 | rev 2>/dev/null)
 
         ## FORCE LOCAL USE ONLY. Remove to open 1234 API
-        [[ ! -d ~/.zen/game/players/${PLAYER} || ${PLAYER} == "" ]] && (echo "$HTTPCORS ERROR - QRCODE - NO ${PLAYER} ON BOARD !!"  | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
+        [[ ! -d ~/.zen/game/players/${PLAYER} || ${PLAYER} == "" ]] \
+        && (echo "$HTTPCORS ERROR - QRCODE - NO ${PLAYER} ON BOARD !!"  | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
+        && exit 1
 
         ## Demande de copie d'une URL reçue.
         if [[ $URL ]]; then
diff --git a/API/SALT.sh b/API/SALT.sh
index 815131fa..e3ba6b27 100755
--- a/API/SALT.sh
+++ b/API/SALT.sh
@@ -21,7 +21,7 @@ Content-Type: text/html; charset=UTF-8
 
 start=`date +%s`
 
-PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8
+PORT=$1 THAT=$2 AND=$3 THIS=$4  APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9
 SALT=$THAT
 PEPPER=$THIS
 
diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh
index 581fb3e5..b3f14a4a 100755
--- a/tools/Connect_PLAYER_To_Gchange.sh
+++ b/tools/Connect_PLAYER_To_Gchange.sh
@@ -107,7 +107,6 @@ do
     ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \
     ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py \
     -k ~/.zen/game/players/${PLAYER}/secret.dunikey \
-    \
     stars -p ${liking_me} > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json
 
     ## ZOMBIE PROTECTION - PURGE AFTER 60 DAYS