diff --git a/API/PLAYER.sh b/API/PLAYER.sh index 7249aa4a..965dd743 100755 --- a/API/PLAYER.sh +++ b/API/PLAYER.sh @@ -87,6 +87,25 @@ PORT=$1 PLAYER=$2 APPNAME=$3 WHAT=$4 OBJ=$5 VAL=$6 fi + end=`date +%s` + echo "(TW) MOA Operation time was "`expr $end - $start` seconds. + exit 0 + fi + +############################################## +# YOUTUBE : /?player=PLAYER&youtube=_URL_ +############################################## + if [[ $APPNAME == "youtube" ]]; then + + [[ ! $WHAT ]] && WHAT="https://www.youtube.com/watch?v=BCl2-0HBJ2c" + echo "COPY YOUTUBE $PLAYER $WHAT" + + G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub) + [[ ! $G1PUB ]] && espeak "NOT A PLAYER" && echo "NOT A PLAYER" && exit 1 + + ## DECLENCHER ajouter_media.sh SANS PROMPT !! + + end=`date +%s` echo "(TW) MOA Operation time was "`expr $end - $start` seconds. exit 0 diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 8e666ed6..a4463d7b 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -39,7 +39,8 @@ echo ##################################################### # CREATION DU TW G1VOEU ##################################################### - SALT=$(${MY_PATH}/../tools/diceware.sh 3 | xargs) + source ~/.zen/game/players/$PLAYER/secret.june ## CLEF DERIVEE ET MEMORISABLE + [[ ! $SALT ]] && SALT=$(${MY_PATH}/../tools/diceware.sh 3 | xargs) echo "$SALT" echo "## TITRE DE VOTRE VOEU ? CapitalGluedWords" diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh index d20469fb..22934a68 100755 --- a/ASTROBOT/VOEUX.refresh.sh +++ b/ASTROBOT/VOEUX.refresh.sh @@ -100,12 +100,12 @@ do [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${APLAYER}.tiddlers.json) == "[]" ]] && echo "EMPTY ${WISHNAME} - CONTINUE -" && continue echo "## TIDDLERS FOUND ;) MIAM >>> (◕‿‿◕) <<<" - echo ">>> G1FRIEND § $myIPFS/ipns/$VOEUNS/${APLAYER}.tiddlers.json ${WISHNAME}" + echo ">>> G1FRIEND § $myIPFS/$VOEUNS/${APLAYER}.tiddlers.json ${WISHNAME}" done ################################## - echo ">>> MOA § $myIPFS/ipns/$VOEUNS/${PLAYER}.tiddlers.json" + echo ">>> MOA § $myIPFS/$VOEUNS/${PLAYER}.tiddlers.json" tiddlywiki --load $INDEX \ --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} \ --render '.' ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]'