diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 321b809a..abedbaed 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -308,7 +308,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then echo "KeyName=$keyname" ISTHERE=$(ipfs key list -l | grep -w ${player} | cut -d ' ' -f1) - echo "G1MISSIVE : $ISTHERE" >> ~/.zen/tmp/${MOATS}/disco + echo "

$player G1MISSIVE

$ISTHERE" >> ~/.zen/tmp/${MOATS}/disco # Recreate G1 KEY ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper" @@ -316,7 +316,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then ## CHECK ORIG1 amount echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${ORIG1}" MCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${ORIG1} | tail -n 1) - echo "MISSIVE : $MCOINS G1" >> ~/.zen/tmp/${MOATS}/disco + echo "
$MCOINS G1" >> ~/.zen/tmp/${MOATS}/disco #CONVERT TO IPNS KEY QNS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${G1PUB}) diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index 7695951e..013399e0 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -36,7 +36,7 @@ UPASS=$(date '+%Y%m') # YYYYMM UPEPPER=$(echo "${SECRET2}" | jq -Rr @uri) DISCO="/?salt=${USALT}&pepper=${UPEPPER}" echo "${DISCO}" > ~/.zen/tmp/${MOATS}/topgp - + rm -f ~/.zen/tmp/${MOATS}/gpg.asc cat ~/.zen/tmp/${MOATS}/topgp | gpg --symmetric --armor --batch --passphrase "$UPASS" -o ~/.zen/tmp/${MOATS}/gpg.asc cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png @@ -52,6 +52,11 @@ UPASS=$(date '+%Y%m') # YYYYMM IMAGIC=$(ipfs add -Hq ~/.zen/tmp/${MOATS}/START.png | tail -n 1) echo ${IMAGIC} + + ## SENDING EMAIL ############# + echo "(•‿‿•) SCAN https://astroport.com/scan" > ~/.zen/tmp/${MOATS}/intro.txt + mpack -a -s "♥Box : ${UPASS} Missive ... (•‿‿•)" -d ~/.zen/tmp/${MOATS}/intro.txt ~/.zen/tmp/${MOATS}/START.png ${PLAYER} & + exit 0 fi @@ -131,7 +136,7 @@ select zwish in "${vlist[@]}"; do # cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.${VoeuName}.json | jq -r '.[].text' | html2text > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt ## COULD USE TEXT FROM TIDDLER (TODO) - echo "POUVEZ-VOUS REALISER CE SOUHAIT? Sinon relayez cette missive. SVP." > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt + echo "SVP. Passez le message un ami de confiance." > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt MILGRAM=$(ipfs add -q ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt) xdg-open http://ipfs.localhost:8080/ipfs/${IMAGIC} @@ -144,11 +149,6 @@ select zwish in "${vlist[@]}"; do xdg-open http://ipfs.localhost:8080/ipfs/${MILGRAM} - echo "$GW" > ~/.zen/tmp/${MOATS}/intro.txt - - ## SEND BY EMAIL ############# - mpack -a -s "♥Box : ${UPASS} Missive ... (•‿‿•)" -d ~/.zen/tmp/${MOATS}/intro.txt ~/.zen/tmp/${MOATS}/START.png ${PLAYER} & - ( ipfs name publish -k ${PLAYER}_${VoeuName} /ipfs/${MILGRAM} echo "${VoeuName} ${UPASS} G1Milgram emitted ${PLAYER}" diff --git a/www/G1Milgram/index.html b/www/G1Milgram/index.html index 8a8347e2..f795911b 100644 --- a/www/G1Milgram/index.html +++ b/www/G1Milgram/index.html @@ -17,7 +17,7 @@