diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index ae7cc17d9..669c94b88 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -248,16 +248,6 @@ for PLAYER in ${PLAYERONE[@]}; do sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json ###################################### INJECT JSON - ###################################### - # (RE)MAKE "SECTORTW_NEWS" TIDDLER - cat ${MY_PATH}/../templates/data/SECTORTW_NEWS.json \ - | sed -e "s~_SECTOR_~${SECTOR}~g" \ - -e "s~_MOATS_~${MOATS}~g" \ - -e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \ - > ~/.zen/tmp/${MOATS}/SECTORTW_NEWS.json - - echo "SECTOR $SECTOR SECTORTW=/ipns/${TODATESECTORNS}/TW" - ################# PERSONAL VDO.NINJA ADDRESS) PHONEBOOTH=${PLAYER/@/_} PHONEBOOTH=${PHONEBOOTH/\./_} @@ -296,7 +286,7 @@ for PLAYER in ${PLAYERONE[@]}; do ##################################################################### fplayers=($(cat ~/.zen/tmp/${MOATS}/FRIENDS.json | jq -rc .[].title)) echo "${fplayers[@]}" - INPUTPLAYERS=() + UPLAYERSTIDS=() for fp in ${fplayers[@]}; do [[ ! "${fp}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] && echo "BAD ${fp} FORMAT" && continue @@ -317,6 +307,7 @@ for PLAYER in ${PLAYERONE[@]}; do echo "TW: $FTW" echo "G1: $FG1PUB" echo "IHASH: $IHASH" + UPLAYERSTIDS=("${UPLAYERSTIDS[@]}" "[[${FPLAYER^^}|${FPLAYER^^}]]") ## GET ORIGINH FROM LAST KNOWN TW STATE mkdir -p ~/.zen/game/players/${PLAYER}/FRIENDS/${FPLAYER} @@ -377,14 +368,26 @@ for PLAYER in ${PLAYERONE[@]}; do && rm ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/newindex.html \ || echo "ERROR - CANNOT CREATE TW NEWINDEX - ERROR" fi + fi done ## GET $:/moa Tiddlers ####################################### END - + echo "${UPLAYERSTIDS[@]}" ##################################################################### + ###################################### + # (RE)MAKE "SECTORTW_NEWS" TIDDLER + cat ${MY_PATH}/../templates/data/SECTORTW_NEWS.json \ + | sed -e "s~_SECTOR_~${SECTOR}~g" \ + -e "s~_MOATS_~${MOATS}~g" \ + -e "s~_UPLAYERSTIDS_~${UPLAYERSTIDS[@]}~g" \ + -e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \ + > ~/.zen/tmp/${MOATS}/SECTORTW_NEWS.json + + echo "SECTOR $SECTOR SECTORTW=/ipns/${TODATESECTORNS}/TW" + ############################################################# # Connect_PLAYER_To_Gchange.sh : Sync FRIENDS TW - TODO : REWRITE ############################################################## diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 6e13b8219..2d85cfc8f 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -193,8 +193,9 @@ for SECTOR in ${SECTORS[@]}; do ## SET SECTOR sed -i "s~_SECTOR_~${SECTOR}~g" ${INDEX} - ## GET ALL TWs in that SECTOR - mkdir ~/.zen/tmp/${MOATS}/${SECTOR}/TWz + ## REFRESH ALL TWs in that SECTOR + rm -Rf ~/.zen/tmp/${MOATS}/${SECTOR}/TWz + mkdir -p ~/.zen/tmp/${MOATS}/${SECTOR}/TWz cp -rf ~/.zen/tmp/swarm/12D*/UPLANET/__/_*_*/_${SLAT}_${SLON}/_*_*/TW/* \ ~/.zen/tmp/${MOATS}/${SECTOR}/TWz @@ -290,7 +291,7 @@ for SECTOR in ${SECTORS[@]}; do ## ADD SECTOR ZENPUB.png & INFO.png convert -font 'Liberation-Sans' \ -pointsize 80 -fill purple -draw 'text 50,120 "'"${ZEN} Zen"'"' \ - -pointsize 30 -fill purple -draw 'text 40, 180 "'"${SECTOR}"'"' \ + -pointsize 30 -fill purple -draw 'text 40, 180 "'"${SECTOR}:${YESTERDATE}"'"' \ $MY_PATH/../images/G1WorldMap.png "${HOME}/.zen/tmp/${MOATS}/${SECTOR}.png" # CREATE G1PUB AMZQR amzqr ${G1PUB} -l H -p "$MY_PATH/../images/zenticket.png" -c -n ZENPUB.png -d ~/.zen/tmp/${MOATS}/${SECTOR}/ diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index c69c72c61..eb5a9ba58 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -574,7 +574,7 @@ do done <"$asciiart" echo "
-

PRINT & SHARE ZenCard

+

ZenCard

" >> ~/.zen/tmp/${MOATS}/ZenCard.html $MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/ZenCard.html "ZenCard (${PLAYER}) " diff --git a/templates/data/SECTORTW_NEWS.json b/templates/data/SECTORTW_NEWS.json index 366f52f35..c4db686d1 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
\n
\n\n<$button actions=<> > _SECTOR_ (⌐■_■) (TW) \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
\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
\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 192909429..aa7740552 100644 --- a/templates/data/_UPPERFPLAYER_.json +++ b/templates/data/_UPPERFPLAYER_.json @@ -3,8 +3,8 @@ "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 <$button class='tc-tiddlylink'><$list filter='[tag[_FPLAYER_]]'><$action-navigate $to=<> $scroll=no/>_FPLAYER_ (TW) \n", - "tags": "load-external _PLAYER_ $:/tags/SideBar", + "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
\n
\n\n<$button class='tc-tiddlylink'>\n <$list filter='[tag[_FPLAYER_]]'>\n <$action-navigate $to=<> $scroll=no/>\n \n _FPLAYER_\n\n\n(TW) ", + "tags": "load-external _PLAYER_ ", "ihash": "_IHASH_", "filter": "[days[-1]!is[system]!tag[G1Voeu]]", "wikiURL": "_FRIENDTW_",