working better

API/QRCODE.sh

@@ -81,12 +81,30 @@ fi
 if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then
     APPNAME="G1Voeu"
     VOEU=${QRCODE}
-    ASTROPATH=$(grep ${THIS} ~/.zen/game/players/*/.playerns | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev  2>/dev/null)
+    ASTROPATH=$(grep -r ${THIS} ~/.zen/game/players/*/ipfs/moa | grep ${QRCODE} | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev  2>/dev/null)
     echo $ASTROPATH
 
+    INDEX=$ASTROPATH/index.html
+    echo $INDEX
+    if [[ -s  ${INDEX} ]]; then
+        tiddlywiki --load ${INDEX} --output ~/.zen/tmp --render '.' "${MOATS}.g1voeu.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1Voeu]]'
+        cat ~/.zen/tmp/${MOATS}.g1voeu.json | jq -r '.[].wish' > ~/.zen/tmp/${MOATS}.g1wishes.txt
+        while read WISH
+        do
+            [[ ${WISH} == "" || ${WISH} == "null" ]] && echo "BLURP. EMPTY WISH" && continue
+            WISHNAME=$(cat ~/.zen/tmp/${MOATS}.g1voeu.json | jq .[] | jq -r 'select(.wish=="'${WISH}'") | .title')
+            WISHNS=$(cat ~/.zen/tmp/${MOATS}.g1voeu.json | jq .[] | jq -r 'select(.wish=="'${WISH}'") | .wishns')
+            echo "${WISHNAME} : ${WISHNS} "
+            [[ "G1${WISHNAME}" == "$VOEU" ]] \
+            && echo "FOUND" \
+            && LINK=${myIPFS}${WISHNS} \
+            && break
+
+        done < ~/.zen/tmp/${MOATS}.g1wishes.txt
+    fi
+
     ## REDIRECT TO G1VOEU IPNS ADDRESS
-    LINK=$(cat $ASTROPATH/voeux/${QRCODE:2}/*/.link)
-    [[ $LINK == "" ]] && $LINK="$myIPFS/ipfs/QmWUZr62SpriLPuqauMbMxvw971qnu741hV8EhrHmKF2Y4" ## 404 LOST IN CYBERSPACE
+    [[ $LINK == "" ]] && LINK="$myIPFS/ipfs/QmWUZr62SpriLPuqauMbMxvw971qnu741hV8EhrHmKF2Y4" ## 404 LOST IN CYBERSPACE
     echo "#>>> DISPLAY WISHNS >>>> # $VOEU : $LINK"
     sed "s~_TWLINK_~${LINK}~g" ~/.zen/Astroport.ONE/templates/index.302  > ~/.zen/tmp/${MOATS}/index.redirect
     echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/index.redirect

ASTROBOT/VOEUX.refresh.sh

@@ -207,7 +207,9 @@ do
 
         WISHFLUX=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/* | tail -n 1)  # ADDING JSONS TO IPFS
         ipfs name publish -k $VOEUKEY /ipfs/$WISHFLUX   # PUBLISH $VOEUKEY
-        ipfs ls ${VOEUNS} # READ IPNS PUBLISHING
+
+        echo "## ASK ${myTUBE} GATEWAY TO REFRESH"
+        curl -m 120 -so ~/.zen/tmp/${WISHNAME}.astroindex.html "${myTUBE}${VOEUNS}" &
 
         ## MOVE INTO PLAYER AREA
         echo ">>> ${PLAYER} G1${WISHNAME} Ŋ1 FLUX $(myIpfsGw)${VOEUNS}"

tools/my.sh

@@ -401,5 +401,5 @@ myASTROTUBE="https://$(myAstroTube)"
  && myAPI="https://ipfs.$(myHostName)" \
  && myIPFS="https://ipfs.$(myDomainName)" \
  && myHOST="astroport.$(myHostName)" \
- && myG1BILLET="http://$(myIP):33101" \
+ && myG1BILLET="http://${myIP}:33101" \
  || true