diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 74c44a35..92d2da5a 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -19,7 +19,7 @@ ME="${0##*/}" CESIUM=${myCESIUM} GCHANGE=${myGCHANGE} -echo "$ME RUNNING" +echo "$ME RUNNING (•‿‿•)" ######################################################################## # PALPAY SERVICE : MONITOR INCOMING TX & NEW TIDDLERS @@ -47,16 +47,15 @@ MOATS="$3" ################################################################### ## CREATE APP NODE PLAYER PUBLICATION DIRECTORY ################################################################### -mkdir -p $HOME/.zen/tmp/${IPFSNODEID}/G1PalPay/${PLAYER}/ mkdir -p $HOME/.zen/game/players/${PLAYER}/G1PalPay/ mkdir -p $HOME/.zen/tmp/${MOATS} -echo "=========== ( ◕‿◕) (◕‿◕ ) ============== ${PLAYER} +echo "=====(•‿‿•)====== ( ◕‿◕) (◕‿◕ ) =======(•‿‿•)======= ${PLAYER} ${INDEX}" -echo "(✜‿‿✜) G1PalPay : CHECK LAST 10 TX comment" +echo "(✜‿‿✜) G1PalPay : CHECK LAST 15 TX comment" -# CHECK LAST 10 INCOMING PAYMENTS +# CHECK LAST 15 INCOMING PAYMENTS ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ -${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 10 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json +${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 15 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json [[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json ]] \ && echo "NO PAYMENT HISTORY.......................... EXIT" \ @@ -64,14 +63,13 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun ############################## ########################################################## ############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT -# TODO check amout > 0 ################################################################# # LOG / cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] -## TREAT ANY COMMENT STARTING WITH N1: +## TREAT ANY COMMENT STARTING WITH N1: exemple : N1Kodi.sh ## EXTRACT /ASTROBOT/N1ProgramNames ls ${MY_PATH}/../ASTROBOT/ | grep "N1" | cut -d "." -f 1 > ~/.zen/tmp/${MOATS}/N1PROG - while read prog; do + echo "# SCAN FOR N1 COMMAND : $prog" cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] | grep "$prog" >> ~/.zen/tmp/${MOATS}/myN1.json done < ~/.zen/tmp/${MOATS}/N1PROG @@ -108,13 +106,14 @@ while read NLINE; do done < ~/.zen/tmp/${MOATS}/myN1.json ######################################################################################## -############# CHECK FOR EMAILs IN PAYMENT COMMENT +echo "# CHECK FOR EMAILs IN PAYMENT COMMENT" ## DEBUG ## cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -r ################################################################# cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] | grep '@' > ~/.zen/tmp/${MOATS}/myPalPay.json # IF COMMENT CONTAINS EMAIL ADDRESSES -# SPREAD & TRANSFER AMOUNT TO NEXT (REMOVING IT FROM LIST)... Other G1PalPay will continue the transmission... +# SPREAD & TRANSFER AMOUNT TO NEXT (REMOVING IT FROM LIST)... +## Other G1PalPay will continue the transmission... ######################################################################## ## GET @ in JSON INLINE while read LINE; do @@ -134,18 +133,21 @@ while read LINE; do ## GET EMAILS FROM COMMENT TXIMAILS=($(echo "$COMMENT" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) - echo "$TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS % $SHARE %" [[ $(echo "$TXIAMOUNT < 0" | bc) ]] \ - && echo "TX-OUT" \ + && echo "TX-OUT $TXIDATE" \ && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate \ && continue ## DIVIDE INCOMING AMOUNT TO SHARE echo "N=${#TXIMAILS[@]}" N=${#TXIMAILS[@]} + REDIS=0 + REDISMAILS="" + SHAREE=$(echo "scale=2; $TXIAMOUNT / $N" | bc) SHARE=$(makecoord ${SHAREE}) ## SHARE is received AMOUT divided by numbers of EMAILS in comment + echo "% ${#TXIMAILS[@]} % $SHARE % $TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS" # let's loop over TXIMAILS for EMAIL in "${TXIMAILS[@]}"; do @@ -156,6 +158,7 @@ while read LINE; do && continue echo "EMAIL : ${EMAIL}" + ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" # RESET VAR $($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" @@ -168,40 +171,34 @@ while read LINE; do fi [[ ! ${ASTROG1} ]] \ - && echo "

SORRY ${EMAIL} YOUR ACCOUNT IS MISSING

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

(♥‿‿♥)... Join UPlanet to receive it" > ~/.zen/tmp/palpay.bro \ - && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/palpay.bro "MISSING ACCOUNT" \ + && echo "

${EMAIL} YOUR ACCOUNT IS MISSING

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

(♥‿‿♥)... Join UPlanet to receive it" > ~/.zen/tmp/palpay.bro \ + && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/palpay.bro "INVITATION" \ && continue ## MAKE FRIENDS & SEND G1 - echo "NEW PalPay Friend $ASTROMAIL + echo "PalPay Friend $ASTROMAIL TW : $ASTROTW G1 : ${ASTROG1} ASTROIPFS : $ASTROIPFS RSS : $ASTROFEED" - - if [[ ${ASTROG1} != ${G1PUB} ]]; then - - ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${SHARE}" "${ASTROG1}" "G1PalPay:$N:$TXIPUBKEY" - STAMP=$? - - else - - STAMP=0 - - fi - - ## DONE STAMP IT - [[ $STAMP == 0 ]] \ - && echo "STAMP DONE" \ - && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate ## MEMORIZE LAST TXIDATE + REDIS=$(( REDIS + 1 )) + REDISMAILS+=" ${EMAIL}" done + COMMENTTAIL=$(echo $COMMENT | rev | cut -d '/' -f 1 | rev) + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${REDIS}" "${ASTROG1}" "$REDISMAILS /ipfs/$COMMENTTAIL" + STAMP=$? + ## DONE STAMP IT + [[ $STAMP == 0 ]] \ + && echo "REDISTRIBUTION DONE" \ + && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate + done < ~/.zen/tmp/${MOATS}/myPalPay.json -echo "=========== %%%%% (°▃▃°) %%%%%%% ==============" +echo "====(•‿‿•)======= %%%%% (°▃▃°) %%%%%%% ======(•‿‿•)========" ######################################################################################## ## SEARCH FOR TODAY MODIFIED TIDDLERS WITH MULTIPLE EMAILS IN TAG @@ -251,12 +248,12 @@ while read LINE; do ## 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 = 1 ♥ each + #~ zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10 = 1 ♥ each ## Get first zmail ZMAIL="${emails}" - MSG="SEND + $zen ♥ TO BROs : ${emails[@]}" + MSG="SEND + $nb JUNE TO BROs : ${emails[@]}" echo $MSG ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" @@ -265,16 +262,12 @@ while read LINE; do echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" [[ ${ASTROTW} == "" ]] && ASTROTW=${ASTRONAUTENS} - if [[ ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then - - ## SEND zen ♥ (G1 dice JUNE) TO ALL ## MAKE ONE EACH AFTER ALL EMAIL CONSUMED ## - #~ ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - #~ ${MY_PATH}/../tools/PAY4SURE.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${zen} -p ${ASTROG1} -c "${emails[@]} $TTITLE" -m > /dev/null 2>&1 + if [[ ${TOPIN} && ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then ############################## ### GET PAID & GET PINNED !! ############################## - ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${zen}" "${ASTROG1}" "${emails[@]} /ipfs/${TOPIN}" + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${nb}" "${ASTROG1}" "${emails[@]} /ipfs/${TOPIN}" echo "

BRO ${PLAYER}

: $MSG" > ~/.zen/tmp/${MOATS}/g1message ## PINNING IPFS MEDIA - PROOF OF COPY SYSTEM - @@ -283,7 +276,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 "PIN TIDDLER" + ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/g1message "TW5 PIN" else @@ -291,19 +284,19 @@ while read LINE; do echo "

BRO.


- ${PLAYER} HAS SHARED A TIDDLER WITH YOU. + ${PLAYER} has a shared Tiddler with you.
${TTITLE}
(✜‿‿✜) - ... Join UPlanet get TW5 ! + ... Join UPlanet link your TW5 ! " > ~/.zen/tmp/palpay.bro - ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro "HELLO BRO" + ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro "TW5 LINK" fi done < ~/.zen/tmp/${MOATS}/@tags.json -echo "=========== ( ◕‿◕) (◕‿◕ ) ==============" +echo "=====(•‿‿•)====== ( ◕‿◕) (◕‿◕ ) =======(•‿‿•)=======" rm -Rf $HOME/.zen/tmp/${MOATS}