diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index 1c0e8291..893ccf23 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -145,7 +145,8 @@ for PLAYER in ${PLAYERONE[@]}; do
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
--output ~/.zen/tmp/${MOATS} \
--render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
- [[ ! -s ~/.zen/tmp/${MOATS}/GPS.json ]] && echo "${PLAYER} GPS : BAD TW (☓‿‿☓) " && continue
+ [[ ! -s ~/.zen/tmp/${MOATS}/GPS.json || $(cat ~/.zen/tmp/${MOATS}/GPS.json) == "[]" ]] \
+ && echo "${PLAYER} GPS : BAD TW (☓‿‿☓) " && continue
#############################################################
## CHECK MadeInZion
@@ -153,7 +154,8 @@ for PLAYER in ${PLAYERONE[@]}; do
--output ~/.zen/tmp/${MOATS} \
--render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' ## MadeInZion Tiddler
- [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json ]] && echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue
+ [[ ! -s ~/.zen/tmp/${MOATS}/MadeInZion.json || $(cat ~/.zen/tmp/${MOATS}/MadeInZion.json) == "[]" ]] \
+ && echo "${PLAYER} MadeInZion : BAD TW (☓‿‿☓) " && continue
player=$(cat ~/.zen/tmp/${MOATS}/MadeInZion.json | jq -r .[].player)
#############################################################
@@ -181,6 +183,9 @@ for PLAYER in ${PLAYERONE[@]}; do
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
--output ~/.zen/tmp/${MOATS} \
--render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' ## Astroport Tiddler
+ [[ ! -s ~/.zen/tmp/${MOATS}/Astroport.json || $(cat ~/.zen/tmp/${MOATS}/Astroport.json) == "[]" ]] \
+ && echo "${PLAYER} Astroport : BAD TW (☓‿‿☓) " && continue
+
BIRTHDATE=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].birthdate)
ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) ## ZenStation IPNS address
CURCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain | rev | cut -f 1 -d '/' | rev) # Remove "/ipfs/" part
@@ -217,38 +222,36 @@ for PLAYER in ${PLAYERONE[@]}; do
#### UPLANET GEO COORD EXTRACTION
## GET "GPS" TIDDLER - 0.00 0.00 (if empty: null)
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
- [[ $LAT == "null" || $LAT == "" ]] && LAT="0.00"
+ [[ $LAT == "null" || $LAT == "" ]] && LAT="0.00"
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
- [[ $LON == "null" || $LON == "" ]] && LON="0.00"
+ [[ $LON == "null" || $LON == "" ]] && LON="0.00"
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
- SECTOR="_${LAT::-1}_${LON::-1}"
## CALCULATE UMAP TODATENS ################
######################################
ipfs key rm "temp" >/dev/null 2>&1
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
- cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"umap": "/ipns/_UMAPNS_"}' \
- > ~/.zen/tmp/${MOATS}/GPStw.json \
- && mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
- sed -i "s~_UMAPNS_~${UMAPNS}~g" ~/.zen/tmp/${MOATS}/GPS.json
- ###################################### INJECT JSON
-
- #~ cat ~/.zen/tmp/${MOATS}/GPS.json
echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}"
+ SECTOR="_${LAT::-1}_${LON::-1}"
## CALCULATE SECTOR TODATENS ################
ipfs key rm "temp" >/dev/null 2>&1
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
-
- cat ~/.zen/tmp/${MOATS}/GPS.json | jq '. + {"sectortw": "_SECTORTW_"}' \
- > ~/.zen/tmp/${MOATS}/GPSsec.json \
- && mv ~/.zen/tmp/${MOATS}/GPSsec.json ~/.zen/tmp/${MOATS}/GPS.json
- sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json
- ###################################### INJECT JSON
+ ipfs key rm "temp" >/dev/null 2>&1
+ #############################################
+ # MAKE TODATE "GPS" TIDDLER
+ cat ${MY_PATH}/../templates/data/GPS.json \
+ | sed -e "s~_MOATS_~${MOATS}~g" \
+ -e "s~_PLAYER_~${PLAYER}~g" \
+ -e "s~_LAT_~${LAT}~g" \
+ -e "s~_LON_~${LON}~g" \
+ -e "s~_UMAPNS_~${UMAPNS}~g" \
+ -e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \
+ > ~/.zen/tmp/${MOATS}/GPS.json
################# PERSONAL VDO.NINJA ADDRESS)
PHONEBOOTH=${PLAYER/@/_}
@@ -263,8 +266,6 @@ for PLAYER in ${PLAYERONE[@]}; do
-e "s~_PHONEBOOTH_~${PHONEBOOTH}~g" \
> ~/.zen/tmp/${MOATS}/VISIO.json
- ipfs key rm "temp" >/dev/null 2>&1
-
## UPDATE PLAYER CACHE
echo "_${LAT}_${LON}" > ~/.zen/game/players/${PLAYER}/.umap
cp ~/.zen/tmp/${MOATS}/GPS.json ~/.zen/game/players/${PLAYER}/
diff --git a/templates/data/GPS.json b/templates/data/GPS.json
index 98a4ba87..ab052c8e 100644
--- a/templates/data/GPS.json
+++ b/templates/data/GPS.json
@@ -1,12 +1,13 @@
[
{
- "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"
+ "created": "_MOATS_",
+ "modified": "_MOATS_",
+ "text": "<$leafmap\ntileControl\ntile='sat'\nzoom='12'\nplaces='{\"point\":\"_LAT_, _LON_\"}'\n/>\n\n! Visit UMap__LAT___LON_\n\n!! UPlanet moves your data with you\n<<<\n''DO NOT CHANGE MANUALY''\n<<<\n",
+ "tags": "_PLAYER_",
+ "lat": "_LAT_",
+ "lon": "_LON_",
+ "umap": "/ipns/_UMAPNS_",
+ "sectortw": "_SECTORTW_"
}
]
diff --git a/templates/data/SECTORTW_NEWS.json b/templates/data/SECTORTW_NEWS.json
index 3469e777..67172769 100644
--- a/templates/data/SECTORTW_NEWS.json
+++ b/templates/data/SECTORTW_NEWS.json
@@ -3,7 +3,7 @@
"created": "_MOATS_",
"modified": "_MOATS_",
"title": "_SECTOR_.NEWS",
- "text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n\n [[_SECTOR_.NEWS|_SECTOR_.NEWS]]
\n \n\n<$edit size=60 field=\"wikiURL\"/> ⬅︎ TW
\n<$edit size=50 field=\"filter\"/> ⬅︎ Filtration\n\n
\n \n<$button actions=<> > _SECTOR_ (⌐■_■) (TW) \n<>\n\n_UPLAYERSTIDS_ \n\n<>\n\n (☓‿‿☓)
\n\n <>\n
\n (✜‿‿✜)
\n\n <>\n
",
+ "text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n[[GPS|GPS]]\n\n\n [[_SECTOR_.NEWS|_SECTOR_.NEWS]]
\n \n\n<$edit size=60 field=\"wikiURL\"/> ⬅︎ TW
\n<$edit size=50 field=\"filter\"/> ⬅︎ Filtration\n\n
\n \n<$button actions=<> > (⌐■_■) (TW) \n<>\n\n_UPLAYERSTIDS_ \n\n<>\n\n (☓‿‿☓)
\n\n <>\n
\n (✜‿‿✜)
\n\n <>\n
",
"tags": "load-external _SECTOR_ $:/tags/SideBar",
"filter": "[days[-7]!is[system]!tag[G1Voeu]]",
"caption": "_SECTOR_",
diff --git a/templates/data/_UPPERFPLAYER_.json b/templates/data/_UPPERFPLAYER_.json
index b4915fd4..2f2e704b 100644
--- a/templates/data/_UPPERFPLAYER_.json
+++ b/templates/data/_UPPERFPLAYER_.json
@@ -3,7 +3,7 @@
"created": "_MOATS_",
"modified": "_MOATS_",
"title": "_UPPERFPLAYER_",
- "text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deserializer=\"text/html\"\n />\n\\end\n\n\n [[_UPPERFPLAYER_|_UPPERFPLAYER_]]
\n\n\n<$edit size=56 field=\"wikiURL\"/> ⬅︎ TW
\n<$edit size=42 field=\"filter\"/> ⬅︎ Filtration\n\n<>\n\n
\n \n\n<$button actions=<> > _UPPERFPLAYER_ (⌐■_■) \n\n (☓‿‿☓)
\n\n<>\n
\n (✜‿‿✜)
\n\n<>\n
\n\n [[_UPPERFPLAYER_|_UPPERFPLAYER_]]
\n\n\n<$edit size=56 field=\"wikiURL\"/> ⬅︎ TW
\n<$edit size=42 field=\"filter\"/> ⬅︎ Filtration\n\n<>\n\n
\n \n\n<$button actions=<> > (⌐■_■) \n\n (☓‿‿☓)
\n\n<>\n
\n (✜‿‿✜)
\n\n<>\n
\n