diff --git a/API/SALT.sh b/API/SALT.sh index 592aeba6..179f517c 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -414,7 +414,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh ############################################## if [[ $APPNAME == "getipns" ]]; then ( echo "$HTTPCORS - url=${ASTRONAUTENS}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) & + url='"${ASTRONAUTENS}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) & end=`date +%s` echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. exit 0 @@ -425,7 +425,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh ############################################## if [[ $APPNAME == "getg1pub" ]]; then ( echo "$HTTPCORS - url=${G1PUB}"| nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}" ) & + url='"${G1PUB}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}" ) & end=`date +%s` echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. exit 0 diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index cecb8470..3c475b08 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -184,8 +184,12 @@ if [[ ! ${TIDDLER} ]]; then PLAYLIST=$(yt-dlp $BROWSER --print "%(playlist)s" "${ZYURL}" | sed -r 's/\<./\U&/g' | sed 's/ //g') EXTRATAG="$CHANNEL $PLAYLIST" ## PREPARE VIDEO HTML5 CODE - TEXT=" -
{{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}})
+ TEXT=" +
+ {{!!filesize}} - {{!!duration}} sec. - vtratio(dur) = {{!!vtratio}} ({{!!dur}}) +

"${TITLE}"

" end=`date +%s` diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index c4ffcebe..df16c868 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -40,19 +40,19 @@ MOATS="$4" mkdir -p ~/.zen/tmp/$MOATS ##################################################### -# CREATION DU TW G1VOEU +# CREATION DE LA CLEF DERIVEE "G1VOEU" ##################################################### - source ~/.zen/game/players/$PLAYER/secret.june ## CLEF DERIVEE ET MEMORISABLE + source ~/.zen/game/players/$PLAYER/secret.june ## LE PEPPER DU PLAYER DEVIENT LE SALT DU G1VOEU [[ $PEPPER ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SALT=$PEPPER ## [[ ! $SALT ]] && SALT=$(${MY_PATH}/../tools/diceware.sh 3 | xargs) echo "$SALT" echo "## TITRE DU G1VOEU ? CapitalGluedWords please" [[ ! $TITRE ]] && read TITRE - PEPPER=$(echo "$TITRE" | sed -r 's/\<./\U&/g' | sed 's/ //g') # CapitalGluedWords + PEPPER=$(echo "$TITRE" | sed -r 's/\<./\U&/g' | sed 's/ //g') # PEPPER EST LE TITRE DU VOEU : CapitalGluedWords echo "$PEPPER" && [[ ! $PEPPER ]] && echo "EMPTY PEPPER - ERROR" && exit 1 - echo "## keygen CLEF DE VOEUX from PLAYER : pepper + G1WishName derivation" + echo "## keygen PLAYER DERIVATE WISH KEY" ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/qrtw.dunikey "$SALT" "$PEPPER" WISHKEY=$(cat ~/.zen/tmp/qrtw.dunikey | grep "pub:" | cut -d ' ' -f 2) echo "WISHKEY (G1PUB) = $WISHKEY" @@ -71,10 +71,10 @@ mkdir -p ~/.zen/tmp/$MOATS echo $ENCODING ## TEST IPFS - ipfs --timeout=30s cat /ipns/$VOEUNS > ~/.zen/tmp/$VOEUNS.json - [[ -s ~/.zen/tmp/$VOEUNS.json ]] \ - && echo "HEY !!! UN CHANNEL EXISTE DEJA POUR CE VOEU ! ~/.zen/tmp/$VOEUNS.json - EXIT -" \ - && exit 1 + #~ ipfs --timeout=30s cat /ipns/$VOEUNS > ~/.zen/tmp/$VOEUNS.json + #~ [[ -s ~/.zen/tmp/$VOEUNS.json ]] \ + #~ && echo "HEY !!! UN CHANNEL EXISTE DEJA POUR CE VOEU ! ~/.zen/tmp/$VOEUNS.json - EXIT -" \ + #~ && exit 1 echo "# UPGRADING WORLD WHISHKEY DATABASE" @@ -125,7 +125,7 @@ composite -compose Over -gravity NorthWest -geometry +350+10 ~/.zen/tmp/ASTROLOG composite -compose Over -gravity NorthWest -geometry +0+0 ~/.zen/tmp/QRWISHLINK.png ~/.zen/tmp/astroport.png ~/.zen/tmp/one.png convert -gravity northwest -pointsize 20 -fill black -draw "text 320,250 \"$PLAYER\"" ~/.zen/tmp/one.png ~/.zen/tmp/hop.png convert -gravity northwest -pointsize 30 -fill black -draw "text 20,320 \"$PEPPER\"" ~/.zen/tmp/hop.png ~/.zen/tmp/pseudo.png -convert -gravity northwest -pointsize 30 -fill black -draw "text 320,300 \"$SALT\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/salt.png +convert -gravity northwest -pointsize 30 -fill black -draw "text 320,300 \"*****\"" ~/.zen/tmp/pseudo.png ~/.zen/tmp/salt.png convert -gravity northwest -pointsize 33 -fill black -draw "text 320,350 \"$PEPPER\"" ~/.zen/tmp/salt.png ~/.zen/tmp/player.png ################################# diff --git a/images/g1magicien.png b/images/g1magicien.png index 8ecd8ee8..ff1cb70f 100644 Binary files a/images/g1magicien.png and b/images/g1magicien.png differ diff --git a/images/g1ticket.png b/images/g1ticket.png index 4e8073c8..6f122154 100644 Binary files a/images/g1ticket.png and b/images/g1ticket.png differ diff --git a/templates/register.html b/templates/register.html index 57d2f41d..6a1b6825 100644 --- a/templates/register.html +++ b/templates/register.html @@ -154,11 +154,11 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable diff --git a/www/PasseportTerre/index_fichiers/demo.js b/www/PasseportTerre/index_fichiers/demo.js index eed0c283..a9a34cd3 100644 --- a/www/PasseportTerre/index_fichiers/demo.js +++ b/www/PasseportTerre/index_fichiers/demo.js @@ -60,6 +60,7 @@ examples['locations'] = function() { link: 'https://oasis.astroport.com#europe' } }; + $('#sphere').earth3d({ locationsElement: $('#locations'), dragElement: $('#locations'), // where do we catch the mouse drag