diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 49d2d69d..294a6bd1 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -188,13 +188,6 @@ for PLAYER in ${PLAYERONE[@]}; do continue fi - # (RE)MAKE "CESIUM" TIDDLER - cat ${MY_PATH}/../templates/data/CESIUM.json \ - | sed -e "s~_G1PUB_~${G1PUB}~g" \ - -e "s~_CESIUMIPFS_~${CESIUMIPFS}~g" \ - -e "s~_PLAYER_~${PLAYER}~g" \ - > ~/.zen/tmp/${MOATS}/CESIUM.json - ###################################### #### UPLANET GEO COORD EXTRACTION ## GET "GPS" TIDDLER - 0.00 0.00 (if empty: null) @@ -280,6 +273,13 @@ for PLAYER in ${PLAYERONE[@]}; do echo "> ZenCard not activated ($ZEN)" fi + # (RE)MAKE "CESIUM" TIDDLER + cat ${MY_PATH}/../templates/data/CESIUM.json \ + | sed -e "s~_G1PUB_~${G1PUB}~g" \ + -e "s~_CESIUMIPFS_~${CESIUMIPFS}~g" \ + -e "s~_PLAYER_~${PLAYER}~g" \ + > ~/.zen/tmp/${MOATS}/CESIUM.json + ##################################################################### ## GET $:/moa Tiddlers ####################################### ###################################################### [tag[$:/moa]] @@ -287,22 +287,36 @@ for PLAYER in ${PLAYERONE[@]}; do --output ~/.zen/tmp/${MOATS} \ --render '.' 'FRIENDS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[$:/moa]]' ## $:/moa EMAIL Tiddlers ##################################################################### - fplayers=($(cat ~/.zen/tmp/FRIENDS.json | jq -rc .[].title)) + fplayers=($(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq -rc .[].title)) echo "FOUND : ${fplayers[@]}" + INPUTPLAYERS=() for fp in ${fplayers[@]}; do [[ "${fp}" == "${PLAYER}" ]] && echo "moa" && continue - FPLAYER=$(cat ~/.zen/tmp/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .president') + FPLAYER=$(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .president') [[ $FPLAYER == 'null' ]] && echo "null" && continue echo "$FPLAYER coucou" - FTW=$(cat ~/.zen/tmp/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .tw') + FTW=$(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .tw') echo "TW: $FTW" - FG1PUB=$(cat ~/.zen/tmp/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .g1pub') + FG1PUB=$(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq .[] | jq -r 'select(.title=="'${fp}'") | .g1pub') echo "G1: $FG1PUB" + if [[ ${FTW} != "/ipns/" && ${FTW} != "null" && ${FTW} != "" ]]; then + cat ${MY_PATH}/../templates/data/_UPPERFPLAYER_.json \ + | sed -e "s~_UPPERFPLAYER_~${FPLAYER^^}~g" \ + -e "s~_FPLAYER_~${FPLAYER}~g" \ + -e "s~_FRIENDTW_~${FTW}~g" \ + -e "s~_PLAYER_~${PLAYER}~g" \ + > ~/.zen/tmp/${MOATS}/${FPLAYER}.json + + INPUTPLAYERS+=(" --import ${HOME}/.zen/tmp/${MOATS}/${FPLAYER}.json 'application/json' ") # Append to the array + fi done + echo "${INPUTPLAYERS[@]}" + + ################### # REFRESH PLAYER_feed # (could be deprecated) ################################## @@ -338,6 +352,7 @@ for PLAYER in ${PLAYERONE[@]}; do --import ~/.zen/tmp/${MOATS}/GPS.json "application/json" \ --import ~/.zen/tmp/${MOATS}/CESIUM.json "application/json" \ --import ~/.zen/tmp/${MOATS}/SECTORTW_NEWS.json "application/json" \ + "${INPUTPLAYERS[@]}" \ --import ~/.zen/tmp/${MOATS}/lightbeam-name.json "application/json" \ --import ~/.zen/tmp/${MOATS}/lightbeam-key.json "application/json" \ --output ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER} --render "$:/core/save/all" "newindex.html" "text/plain" diff --git a/templates/data/_UPPERFPLAYER_.json b/templates/data/_UPPERFPLAYER_.json index 6070ebf0..a2bd68b8 100644 --- a/templates/data/_UPPERFPLAYER_.json +++ b/templates/data/_UPPERFPLAYER_.json @@ -4,7 +4,7 @@ "text": "\\procedure loadMyWiki()\n\\import [[$:/plugins/sq/ExternalContent/loadWikiActions]]\n<$transclude\n $variable=\"loadWikiActions\"\n wikiURL={{!!wikiURL}}\n contentFilter={{!!filter}}\n deseralizer=\"text/html\"\n />\n\\end\n\n
\n _UPPERFPLAYER_ TW:\n
\n\n<$edit size=60 field=\"wikiURL\"/> ⬅︎ TW
\n<$edit size=50 field=\"filter\"/> ⬅︎ Filtration\n\n<><$button actions=<> > _UPPERFPLAYER_ TW \n\n
\n
\n\n[[EXTERNAL|EXTERNAL]]\n \n", "tags": "_PLAYER_ $:/tags/load-external-content", "filter": "[days[-1]!is[system]!tag[G1Voeu]]", - "wikiURL": "_FRIENDTW_" + "wikiURL": "_FRIENDTW_", "friend": "_FPLAYER_" }