diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 2c38b22d..746cf135 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -48,53 +48,23 @@ ASTRONAUTENS=$(~/.zen/Astroport.ONE/tools/g1_to_ipfs.py ${QRCODE}) && (echo "$HTTPCORS ERROR - ASTRONAUTENS !!" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \ && exit 1 +echo ">>> ${QRCODE} g1_to_ipfs $ASTRONAUTENS" + ## SEND MESSAGE TO CESIUM+ ACCOUNT (ME or .current) MYPLAYERKEY=$(grep ${QRCODE} ~/.zen/game/players/*/secret.dunikey | cut -d ':' -f 1) [[ ! $MYPLAYERKEY ]] && MYPLAYERKEY="$HOME/.zen/game/players/.current/secret.dunikey" +## COUCOU MSG ## CCHANGE + -$MY_PATH/../tools/jaklis/jaklis.py -n $myGCHANGE -k $MYPLAYERKEY send -d "${QRCODE}" -t "CONTACT" -m "Rendez vous -sur https://astroport.copylaradio.com/ -Saisissez votre URL Youtube Favorite et un email -Activez votre Capsule IPFS - -/ipns/$ASTRONAUTENS" +$MY_PATH/../tools/jaklis/jaklis.py -n $myGCHANGE -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "Rendez vous sur https://astroport.copylaradio.com/" ## CESIUM + -$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCODE}" -t "CONTACT" -m "Rendez vous -sur https://astroport.copylaradio.com/ -Saisissez votre URL Youtube Favorite et un email -Activez votre Capsule IPFS - -/ipns/$ASTRONAUTENS" -#~ echo "ipfs --timeout 120s cat /ipns/$ASTRONAUTENS > ~/.zen/tmp/${MOATS}/index.html" -#~ ipfs --timeout 120s cat /ipns/$ASTRONAUTENS > ~/.zen/tmp/${MOATS}/index.html - -#~ if [[ -s ~/.zen/tmp/${MOATS}/index.html ]]; then - - #~ tiddlywiki --load ~/.zen/tmp/${MOATS}/index.html --output ~/.zen/tmp/${MOATS} --render '.' "MadeInZion.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - - #~ [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] \ - #~ && ( echo "~~~ NO /ipns/$ASTRONAUTENS (☓‿‿☓) CREATE A TW ~~~" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & ) \ - #~ && exit 1 - - #~ GPLAYER=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player) - - - #~ REPLACE="https://$myTUBE/ipns/${ASTRONAUTENS}" \ - - #~ ## REDIRECT TO TW OR GCHANGE PROFILE - #~ sed "s~_TWLINK_~${REPLACE}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect - #~ echo "url='"${REPLACE}"'" >> ~/.zen/tmp/${MOATS}/index.redirect - - #~ ( - #~ cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - #~ ) & - - #~ exit 0 - -#~ fi +$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "Rendez vous sur https://astroport.copylaradio.com/" ################################################################################################### +### amzqr "$myASTROPORT/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ +### amzqr "$myASTROPORT/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ + +## TODO MAGIC QRCODE RX / TX ################################################################################################### # API TWO : ?qrcode=G1PUB&url=____&type=____ diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 14dcad17..818977b3 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -100,7 +100,7 @@ mkdir -p ~/.zen/tmp/$MOATS qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec ## MAKE amzqr WITH astro:// LINK - amzqr "$myASTROPORT/?astro=$WISHKEY&sslpassdunikeysec=$PASsec&hashpass=$HPass&player=$PLAYER&tw=/ipns/$ASTRONAUTENS&g1pub=$G1PUB&flux=/ipns/$VOEUNS" \ + amzqr "$myASTROPORT/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ -d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \ -l H \ -p ${MY_PATH}/../images/g1magicien.png -c diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index edde2bec..132aa14f 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -195,7 +195,7 @@ DISCO="https://astroport.$(myHostName)/?salt=${SALT}&pepper=${PEPPER}&logout=${P qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec ## MAKE amzqr WITH astro:// LINK - amzqr "$myASTROPORT/?astro=$G1PUB/?sslpassdunikeysec=$PASsec&hashpass=$HPass&player=$PLAYER&tw=/ipns/$ASTRONAUTENS&g1pub=$G1PUB" \ + amzqr "$myASTROPORT/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ -d $HOME/.zen/game/players/${PLAYER} \ -l H \ -p ${MY_PATH}/../images/G1WorldMap.png diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html index c0a97a8d..af521440 100644 --- a/www/PasseportTerre/index.html +++ b/www/PasseportTerre/index.html @@ -108,12 +108,7 @@

Install Cesium !

-

-
- -

/ LaSTI is made by YOU hosting La♥BOX, -
IPFS DATA STORAGE 👍

-

Powered by Astroport.ONE

+
@@ -217,6 +212,12 @@ }); +

+
+ +
👍 IPFS DATA STORAGE 👍

+

Powered by Astroport.ONE

+

/ LaSTI / La♥BOX /