From 1e3e419bd2a5df47b86a5ea1ffc7c53d55b8a22b Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 12 Jan 2024 16:40:39 +0100 Subject: [PATCH] maijet message title --- 20h12.process.sh | 2 +- API/SALT.sh | 2 +- API/UPLANET.sh | 2 +- RUNTIME/G1PalPay.sh | 6 +++--- RUNTIME/PLAYER.refresh.sh | 4 ++-- RUNTIME/VISA.new.sh | 4 ++-- tools/PAY4SURE.sh | 6 +++--- tools/PLAYER.unplug.sh | 2 +- tools/RSS2UPlanetTW.sh | 2 +- tools/mailjet.sh | 7 +++++-- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/20h12.process.sh b/20h12.process.sh index a2bffe3f..80d66cc6 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -81,7 +81,7 @@ echo "20H12 (♥‿‿♥) Execution time was $dur seconds." rm ~/.zen/game/players/localhost/latest ## MAIL LOG : support@qo-op.com ## -$MY_PATH/tools/mailjet.sh "support@qo-op.com" "/tmp/20h12.log" +$MY_PATH/tools/mailjet.sh "support@qo-op.com" "/tmp/20h12.log" "20H12" espeak "DURATION ${hours} hours ${minutes} minutes ${seconds} seconds" > /dev/null 2>&1 diff --git a/API/SALT.sh b/API/SALT.sh index 6738f060..e1db3ad9 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -168,7 +168,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/ #~ echo "VISA.new : \"$SALT\" \"$PEPPER\" \"${EMAIL}\" \"$PSEUDO\" \"${WHAT}\"" > ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ${MY_PATH}/../RUNTIME/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${WHAT}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt - ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL + ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt "LOG ZenCard creation" ## Send VISA.new log to EMAIL echo "Le code de votre ASTROID est ${PASS}, scannez-le sur La♥Box ẐenStation (demo : https://astroport.copylaradio.com)" > ~/.zen/tmp/${MOATS}/intro.txt diff --git a/API/UPLANET.sh b/API/UPLANET.sh index 8795c505..92858ba9 100755 --- a/API/UPLANET.sh +++ b/API/UPLANET.sh @@ -180,7 +180,7 @@ ${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMA # ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL ## TO REMOVE : MONITOR -${MY_PATH}/../tools/mailjet.sh "support@qo-op.com" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL +${MY_PATH}/../tools/mailjet.sh "support@qo-op.com" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt "LOG VISA.new $EMAIL" ## Send VISA.new log to EMAIL end=`date +%s` echo "(TW REGISTRATION) Operation time was "`expr $end - $start` seconds. diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index e8e653eb..c4a0b62d 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -145,7 +145,7 @@ while read LINE; do [[ ! ${ASTROG1} ]] \ && echo "

SORRY ${EMAIL} YOUR ACCOUNT IS MISSING

" \ && echo " BRO. $PLAYER WISH TO SEND YOU SOME ẐEN

(♥‿‿♥)... Join UPlanet and receive it" > ~/.zen/tmp/palpay.bro \ - && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/palpay.bro \ + && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/palpay.bro "NEED FOR ACCOUNT" \ && continue @@ -251,7 +251,7 @@ while read LINE; do && echo "

PINNING $TOPIN

(☼‿‿☼)" >> ~/.zen/tmp/${MOATS}/g1message ## lazy mode... NOT FINISHING HTML TAGGING... browser shoud display html page ;) - ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/g1message + ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/g1message "PIN TIDDLER" else @@ -264,7 +264,7 @@ while read LINE; do ... Join UPlanet open a TW ! " > ~/.zen/tmp/palpay.bro - ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro + ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro "TIDDLER TW SHARING" fi diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 7304183a..803cbda0 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -126,7 +126,7 @@ for PLAYER in ${PLAYERONE[@]}; do try=$((try-1)) echo "$try" > ~/.zen/game/players/${PLAYER}/ipfs/moa/.try echo " %%% WARNING %%% ${PLAYER} STATION UNPLUG IN $try DAY(S)." >> ~/.zen/tmp/result - $MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/result + $MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/result "UNPLUG WARNING" continue @@ -339,7 +339,7 @@ for PLAYER in ${PLAYERONE[@]}; do && [[ ${DIFF_SECONDS} -gt $(( 27 * 24 * 60 * 60 )) ]] \ && echo "

WARNING.

Your TW will be UNPLUGGED and stop being published..." > ~/.zen/tmp/alert \ && echo "

TW : ${PLAYER}

ZEN=$ZEN " >> ~/.zen/tmp/alert \ - && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert \ + && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert "TW ALERT" \ && echo "<<<< PLAYER TW WARNING <<<< ${DIFF_SECONDS} > ${days} days" \ && [[ ${DIFF_SECONDS} -gt $(( 30 * 24 * 60 * 60 )) ]] \ && echo ">>>> PLAYER TW UNPLUG >>>>> ${days} days => BYE BYE ${PLAYER} ZEN=$ZEN" \ diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 1445b370..4e98135f 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -553,7 +553,7 @@ echo "

UPlanet : ZenCard

Print your ZenCard : Public key (and echo "
It is your personal ZenCard. Use it to receive Zen." >> ~/.zen/tmp/${MOATS}/intro.txt echo "
ZenCard
" >> ~/.zen/tmp/${MOATS}/intro.txt -$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt +$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt "ZenCard" #~ mpack -a -s "✅ UPlanet : ZenCard" -d ~/.zen/tmp/${MOATS}/intro.txt \ #~ ~/.zen/tmp/${MOATS}/pseudo.png ${PLAYER} @@ -562,7 +562,7 @@ echo "

UPlanet : AstroID ($PASS)

Print your AstroID : Private echo "
Use it to send Zen to other Uplanet players" >> ~/.zen/tmp/${MOATS}/intro.txt echo "
AstroID
" >> ~/.zen/tmp/${MOATS}/intro.txt -$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt +$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt "AstroID" #~ mpack -a -s "✅ UPlanet : AstroID ($PASS)" -d ~/.zen/tmp/${MOATS}/intro.txt \ #~ $HOME/.zen/game/players/${PLAYER}/AstroID.png ${PLAYER} diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index 1a2e9142..57213b93 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -103,7 +103,7 @@ if [[ $? == 0 || $(echo "${CHK2}" | grep 'succès') || $(echo "${CHK1}" | grep
${ZENDES} + ${ZENAMOUNT}

OK

" > ${PENDINGDIR}/${MOATS}.result - $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result + $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "ZEN OPERATION" ## REMOVE IF YOU WANT TO MONITOR "SENT" WINDOW INCERTITUDE rm ${PENDINGDIR}/${MOATS}_replay.sh @@ -124,9 +124,9 @@ else [ $try -gt 2 ] \ && echo "${MOATS} TOO MANY TRY ( $try )" >> ${PENDINGDIR}/${MOATS}.result \ - && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result \ + && $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "PAYMENT CANCELED" \ && exit 1 \ - || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result + || $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result "PAYMENT REPLAY" ( ((try++)) && echo $try > ${PENDINGDIR}/${MOATS}.try diff --git a/tools/PLAYER.unplug.sh b/tools/PLAYER.unplug.sh index ed5e4934..27f2bdbe 100755 --- a/tools/PLAYER.unplug.sh +++ b/tools/PLAYER.unplug.sh @@ -67,7 +67,7 @@ mkdir -p ~/.zen/tmp/${MOATS} ## SEND PLAYER LAST KNOW TW TW=$(ipfs add -Hq ${INDEX} | tail -n 1) -${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "

Hello ${PLAYER},

Your TW is unplugged from Astroport : LAST TW STATE.

May the force be with you.

" +${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "

Hello ${PLAYER},

Your TW is unplugged from Astroport : LAST TW STATE.

May the force be with you.

" "LAST MESSAGE" echo "PLAYER IPNS KEYS UNPLUGED" echo "#######################" diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh index e693b7b1..495627c4 100755 --- a/tools/RSS2UPlanetTW.sh +++ b/tools/RSS2UPlanetTW.sh @@ -155,7 +155,7 @@ To Refuse

Actual TiddlerEngage discussion about it...

" > ~/.zen/tmp/${MOATS}/g1message - ${MY_PATH}/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message + ${MY_PATH}/mailjet.sh "$email" ~/.zen/tmp/${MOATS}/g1message "TIDDLER COLLISION" done diff --git a/tools/mailjet.sh b/tools/mailjet.sh index d8471afd..cf1dfd71 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -30,7 +30,10 @@ pseudo="${CLYUSER}_${YOMAIN}" messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP -SUBJECT="[UPlanet] $pseudo : $(myHostName)" +## add a tittle in message +title="$3" + +SUBJECT="[UPlanet] ${title} ${pseudo} : $(myHostName)" MESSAGESIGN="---
this message is relayed to you by $(myHostName) ♥BOX Astroport.ONE Station" @@ -91,7 +94,7 @@ json_payload='{ ], "Subject": "'${SUBJECT}'", "TextPart": "'$(myIpfsGw)/ipfs/${EMAILZ}'", - "HTMLPart": "

Bro

You have a
MESSAGE!

on UPlanet
May the good vibes be with you!
'${MESSAGESIGN}'" + "HTMLPart": "

Bro

You have a
'${title-MESSAGE}'!

on UPlanet
May the good vibes be with you!
'${MESSAGESIGN}'" } ] }'