From eca57a149fa11e69b1678c0ac41f155a249b5738 Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 14 Mar 2024 17:43:31 +0100 Subject: [PATCH] "tags": "load-external" filtering. Silent RSS YOUSER=$($MY_PATH/../tools/clyuseryomail.sh "${PLAYER}") gives 1 Zen to UMAP --- RUNTIME/PLAYER.refresh.sh | 9 +++++++-- RUNTIME/UPlanetKEYS_refresh.sh | 4 ++++ RUNTIME/VOEUX.refresh.sh | 7 ++----- templates/data/ALLO.json | 2 +- templates/data/CESIUM.json | 2 +- templates/data/GPS.json | 13 ++++++++++++- templates/data/MadeInZion.json | 20 +++++++++++++++++++- 7 files changed, 46 insertions(+), 11 deletions(-) diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index fedafed3..61dc5274 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -483,7 +483,7 @@ for PLAYER in ${PLAYERONE[@]}; do ## CREATING 30 DAYS JSON RSS STREAM tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \ --output ~/.zen/game/players/${PLAYER}/ipfs \ - --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]!is[system]!tag[G1Voeu]]' + --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]!is[system]!tag[G1Voeu]!tag[load-external]]' [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json ]] \ && echo "NO ${PLAYER} RSS - BAD " @@ -558,9 +558,14 @@ for PLAYER in ${PLAYERONE[@]}; do echo "${TODATE}:${PLAYER}" \ > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER}/index.html ## IPNS UMAP _index.html ## - echo "_${LAT}_${LON}" \ + echo "${TODATE}:_${LAT}_${LON}" \ > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/_index.html + ## IF PLAYER INACTIVE PAY 1 ZEN TO UMAPG1PUB + [[ $(cat ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json) == "[]" ]] \ + && UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}") \ + && YOUSER=$($MY_PATH/../tools/clyuseryomail.sh "${PLAYER}") \ + && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "0.1" "${UMAPG1PUB}" "UPLANET:TW:${YOUSER}:/ipfs/${TW}" fi diff --git a/RUNTIME/UPlanetKEYS_refresh.sh b/RUNTIME/UPlanetKEYS_refresh.sh index 155f8aa2..32c35748 100755 --- a/RUNTIME/UPlanetKEYS_refresh.sh +++ b/RUNTIME/UPlanetKEYS_refresh.sh @@ -64,6 +64,10 @@ for key in ${UKEYS[@]}; do && medo=$((medo +1)) && floop=$((floop -1)) \ || rm -Rf ~/.zen/tmp/flashmem/$key # GOT IT or NOT ? + ## TODO search for TW /ipfs/ and refresh + #~ TWS=($(cat ~/.zen/tmp/flashmem/$key/TW/*/index.html)) + + [ $floop -gt 33 ] && break done diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index 2879cc5e..998c1fc1 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -317,12 +317,9 @@ if [[ ${wishnumbers} -gt 0 ]]; then echo "GRATITUDE ${GRATITUDE} ZEN (${G1AMOUNT} G1) to UMAP_${LAT}_${LON} WALLET ${UMAPG1PUB}" echo "************************************************************" - YUSER=$(echo ${PLAYER} | 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 ${PLAYER} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com + YOUSER=$($MY_PATH/../tools/clyuseryomail.sh "${PLAYER}") MYWISHFLUX=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/* | tail -n 1) # ADDING JSONS TO IPFS - ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${G1AMOUNT}" "${UMAPG1PUB}" "UPLANET:UWISH:$CLYUSER$YOMAIN:/ipfs/${MYWISHFLUX}" + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${G1AMOUNT}" "${UMAPG1PUB}" "UPLANET:UWISH:$YOUSER:/ipfs/${MYWISHFLUX}" fi ################################################ ################################################ GRATITUDE SENT TO SECTOR diff --git a/templates/data/ALLO.json b/templates/data/ALLO.json index 10ffb291..2ceea3f8 100644 --- a/templates/data/ALLO.json +++ b/templates/data/ALLO.json @@ -3,7 +3,7 @@ "created": "_MOATS_", "title": "VISIO", "text": "", - "tags": "_PLAYER_ $:/tags/SideBar", + "tags": "load-external _PLAYER_ $:/tags/SideBar", "type": "text/vnd.tiddlywiki", "caption": " 📲 " } diff --git a/templates/data/CESIUM.json b/templates/data/CESIUM.json index 0c15591f..25061899 100644 --- a/templates/data/CESIUM.json +++ b/templates/data/CESIUM.json @@ -3,7 +3,7 @@ "created": "_MOATS_", "title": "CESIUM", "text": "", - "tags": "_PLAYER_ $:/tags/SideBar", + "tags": "load-external _PLAYER_ $:/tags/SideBar", "type": "text/vnd.tiddlywiki" } ] diff --git a/templates/data/GPS.json b/templates/data/GPS.json index 07c7c616..98a4ba87 100644 --- a/templates/data/GPS.json +++ b/templates/data/GPS.json @@ -1 +1,12 @@ -[{"created":"20231007123717877","text":"<$leafmap\ntileControl\ntile='sat'\nzoom='12'\nplaces='{\"point\":\"44.2301, 1.6518\"}'\n/>\n\n! Visit UMap_44.2301_1.6518\n\n!! UPlanet moves your data with you\n<<<\n''DO NOT CHANGE MANUALY''\n\n* \"PLUG/UNPLUG\" using ''AstroID''\n<<<\n","tags":"_PLAYER_","title":"GPS","modified":"20231207180819081","lat":"44.2301","lon":"1.6518","umap":"/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu"}] \ No newline at end of file +[ + { + "created": "20231007123717877", + "text": "<$leafmap\ntileControl\ntile='sat'\nzoom='12'\nplaces='{\"point\":\"44.2301, 1.6518\"}'\n/>\n\n! Visit UMap_44.2301_1.6518\n\n!! UPlanet moves your data with you\n<<<\n''DO NOT CHANGE MANUALY''\n\n* \"PLUG/UNPLUG\" using ''AstroID''\n<<<\n", + "tags": "_PLAYER_", + "title": "GPS", + "modified": "20231207180819081", + "lat": "44.2301", + "lon": "1.6518", + "umap": "/ipns/k51qzi5uqu5djg1gqzujq5p60w25mi235gdg0lgkk5qztkfrpi5c22oolrriyu" + } +] diff --git a/templates/data/MadeInZion.json b/templates/data/MadeInZion.json index 4a31bfbf..c2f98612 100644 --- a/templates/data/MadeInZion.json +++ b/templates/data/MadeInZion.json @@ -1 +1,19 @@ -[{"created":"20220626175330872","text":"! ''MadeInZion is a worldwide community of people maintaining peace and restoring harmony''\n\n!! UPlanet community can share, fork, merge and sign Tiddlers giving birth to a Dynamic Trustfull Common Information System\n\n> DO NOT DELETE THIS \"TIDDLER\" {{{ [{$:/info/url/protocol}match[http:]then[ipfs]else[online]] }}}","creator":"_PSEUDO_","title":"MadeInZion","modified":"20240306133009618","tags":"_PLAYER_","player":"_PLAYER_","astroport":"_ASTROPORT_","number":"_NUMBER_","secret":"_SECRET_","wishkey":"_WISHKEY_","modifier":"_PSEUDO_","sector":"_SECTOR_","root":"_ROOT_","dao":"_DAO_"}] \ No newline at end of file +[ + { + "created": "20220626175330872", + "text": "! ''MadeInZion is a worldwide community of people maintaining peace and restoring harmony''\n\n!! UPlanet community can share, fork, merge and sign Tiddlers giving birth to a Dynamic Trustfull Common Information System\n\n> DO NOT DELETE THIS \"TIDDLER\" {{{ [{$:/info/url/protocol}match[http:]then[ipfs]else[online]] }}}", + "creator": "_PSEUDO_", + "title": "MadeInZion", + "modified": "20240306133009618", + "tags": "_PLAYER_", + "player": "_PLAYER_", + "astroport": "_ASTROPORT_", + "number": "_NUMBER_", + "secret": "_SECRET_", + "wishkey": "_WISHKEY_", + "modifier": "_PSEUDO_", + "sector": "_SECTOR_", + "root": "_ROOT_", + "dao": "_DAO_" + } +]