From 3e684587df8823f3b15f1970dce94667fa259260 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 1 Apr 2024 01:27:41 +0200 Subject: [PATCH] EXTRACT [days:modified[-1]] TIDDLERS --- RUNTIME/G1PalPay.sh | 21 +++++++++++---------- RUNTIME/PLAYER.refresh.sh | 5 ++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 18ae00cb..74c44a35 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -207,14 +207,14 @@ 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 2 DAYS TIDDLERS" +echo "# EXTRACT [days:modified[-1]] DAYS TIDDLERS" tiddlywiki --load ${INDEX} \ --output ~/.zen/tmp/${MOATS} \ - --render '.' "today.${PLAYER}.tiddlers.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-2]]' + --render '.' "today.${PLAYER}.tiddlers.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:modified[-1]]' -## FILTER MY OWN EMAIL # cat ~/.zen/tmp/${MOATS}/today.${PLAYER}.tiddlers.json | jq -rc # LOG +## FILTER MY OWN EMAIL cat ~/.zen/tmp/${MOATS}/today.${PLAYER}.tiddlers.json \ | sed "s~${PLAYER}~ ~g" | jq -rc '.[] | select(.tags | contains("@"))' \ > ~/.zen/tmp/${MOATS}/@tags.json 2>/dev/null ## Get tiddlers with not my email in it @@ -270,16 +270,17 @@ while read LINE; do ## 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 - ## Filling comment with email list will make players resend to all ## MAY BE A BAD IDEA ### - echo ${LINE} > ~/.zen/tmp/${MOATS}/line - LINEH=$(ipfs add -q ~/.zen/tmp/${MOATS}/line) - ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${zen}" "${ASTROG1}" "${emails[@]} /ipfs/$LINEH" + + ############################## + ### GET PAID & GET PINNED !! + ############################## + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${zen}" "${ASTROG1}" "${emails[@]} /ipfs/${TOPIN}" echo "

BRO ${PLAYER}

: $MSG" > ~/.zen/tmp/${MOATS}/g1message ## PINNING IPFS MEDIA - PROOF OF COPY SYSTEM - [[ ! -z $TOPIN ]] \ && ipfs pin add $TOPIN \ - && echo "

PINNING $TOPIN

(☼‿‿☼)" >> ~/.zen/tmp/${MOATS}/g1message + && 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" @@ -292,10 +293,10 @@ while read LINE; do
${PLAYER} HAS SHARED A TIDDLER WITH YOU.
${TTITLE}
(✜‿‿✜) - ... Join UPlanet open a TW ! + ... Join UPlanet get TW5 ! " > ~/.zen/tmp/palpay.bro - ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro "TIDDLER TW SHARING" + ${MY_PATH}/../tools/mailjet.sh "${ZMAIL}" ~/.zen/tmp/palpay.bro "HELLO BRO" fi diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 6a3a5bfa..86b43ef9 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -306,7 +306,10 @@ for PLAYER in ${PLAYERONE[@]}; do [[ "${fp}" == "${PLAYER}" ]] && echo "IT'S ME - CONTINUE" && continue FPLAYER=$(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .player') - [[ $FPLAYER == 'null' || $FPLAYER == '' ]] && echo "FPLAYER null - CONTINUE" && continue + [[ $FPLAYER == 'null' || $FPLAYER == '' ]] \ + && echo "FPLAYER null - NOGOOD${fp} -" \ + && continue + # AUTO CORRECT : sed -i "s~${fp}~NOGOOD${fp}~g" ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ FTW=$(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .tw') [[ ${FTW} == "/ipns/" || ${FTW} == "null" || ${FTW} == "" ]] && echo "WEIRD FTW ${FTW} - CONTINUE" && continue