diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index def70485..37390a9f 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -146,8 +146,8 @@ while read LINE; do fi [[ ! ${ASTROG1} ]] \ - && echo "SORRY ${EMAIL} MISSING ASTROG1" \ - && echo " BRO. $PLAYER VEUX VOUS OFFRIR ${SHARE} G1 \n Inscrivez-vous sur UPlanet https://qo-op.com/" > ~/.zen/tmp/palpay.bro \ + && 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 \ && continue @@ -181,6 +181,7 @@ echo "=========== %%%%% (°▃▃°) %%%%%%% ==============" ######################################################################################## ## SEARCH FOR TODAY MODIFIED TIDDLERS WITH MULTIPLE EMAILS IN TAG +# This can could happen in case Tiddler is copied OR PLAYER manualy adds an email tag to Tiddler to share with someone... ################################################################# echo "# EXTRACT TODAY TIDDLERS" tiddlywiki --load ${INDEX} \ @@ -197,28 +198,33 @@ cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/today.${PLAYER}.tiddl # LOG cat ~/.zen/tmp/${MOATS}/@tags.json - echo "******************TIDDLERS with EMAIL in TAGS treatment" #~ cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/${PLAYER}.tiddlers.json | sed "s~${PLAYER}~ ~g" | jq -rc '.[] | select(.tags | contains("@"))' > ~/.zen/tmp/${MOATS}/@tags.json ## EXTRACT NOT MY EMAIL while read LINE; do - echo "---------------------------------- PalPé mec" + echo "---------------------------------- Sava PalPé mec" echo "${LINE}" echo "---------------------------------- PalPAY for Tiddler" TCREATED=$(echo ${LINE} | jq -r .created) TTITLE=$(echo ${LINE} | jq -r .title) TTAGS=$(echo ${LINE} | jq -r .tags) + + ## PREPARE PINNING - TOPIN=$(echo ${LINE} | jq -r .ipfs) ## Tiddler produced by "Astroport Desktop" [[ -z ${TOPIN} ]] && TOPIN=$(echo ${LINE} | jq -r ._canonical_uri) ## Tiddler is exported to IPFS + [[ ! $(echo ${TOPIN} | grep '/ipfs') ]] \ + && [[ ! -z ${TOPIN} ]] \ + && echo "EXTERNAL ${TOPIN}" \ + && TOPIN="" echo "$TTITLE" ## Count emails found emails=($(echo "$TTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) nb=${#emails[@]} - zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10 + zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10, 1 zen each ## Get first zmail ZMAIL="${emails}" @@ -252,9 +258,16 @@ while read LINE; do else - echo "ERREUR PalPay : ${TTITLE} : IMPOSSIBLE DE TROUVER ${emails[@]}" > ~/.zen/tmp/${MOATS}/g1message - ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/g1message - echo "NO ACCOUNT FOUND" + ## SEND MESSAGE TO INFORM ${ZMAIL} OF THIS EXISTING TIDDLER + echo " +

BRO.

+
+ ${PLAYER} HAS SHARED A TIDDLER WITH YOU. +
${TTITLE}
+ ... Join UPlanet open a TW ! + " > ~/.zen/tmp/palpay.bro + + ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro fi diff --git a/tools/mailjet.sh b/tools/mailjet.sh index 13776102..c6923ffe 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -21,13 +21,18 @@ echo ' mail="$1" # EMAIL DESTINATAIRE [[ ! $1 ]] && mail="support@qo-op.com" -pseudo=$(echo $mail | cut -d '@' -f 1) +# mail=geg-la_debrouille@super.chez-moi.com +YUSER=$(echo ${mail} | cut -d '@' -f1) # YUSER=geg-la_debrouille +LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille) +CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg. +YOMAIN=$(echo ${mail} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com +pseudo="${CLYUSER}_${YOMAIN}" messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP SUBJECT="[UPlanet] $pseudo : $(myHostName)" -MESSAGESIGN="---
Astroport $(myHostName)" +MESSAGESIGN="---
this message is relayed to you by $(myHostName) ♥BOX Astroport.ONE Station" echo " ######################################################################## @@ -86,7 +91,7 @@ json_payload='{ ], "Subject": "'${SUBJECT}'", "TextPart": "'$(myIpfsGw)/ipfs/${EMAILZ}'", - "HTMLPart": "

You have a
MESSAGE!


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

Bro

You have a
MESSAGE!

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