echo "(⌐■_■) /UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}"

2024-03-31 19:43:49 +02:00 · 2024-03-31 19:43:49 +02:00 · d65ed3a5b6
parent 84da189bde
commit d65ed3a5b6
5 changed files with 91 additions and 38 deletions
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@ -453,6 +453,16 @@ for PLAYER in ${PLAYERONE[@]}; do
        || echo "ERROR - CANNOT CREATE TW NEWINDEX - ERROR"
    ###########################

+
+    #### SEND TODAY UPlanetDAY${days} ZINE
+    ZINE2="${MY_PATH}/../templates/UPlanetDAY${days}/index.${lang}.html"
+    [[ ! -s ${ZINE2} ]] && ZINE2="${MY_PATH}/../templates/UPlanetDAY${days}/index.html"
+    [[ -s ${ZINE2} ]] \
+        && echo "SENDING ZINE2 DAY ${days} + mailjet TW import " \
+        && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ${ZINE2} "ZINE #${days}" "${HOME}/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html" \
+        || echo "NO ZINE FOR ${days} DAY"
+
+
    ####################
    ## TW NEWINDEX .... #####
    ##############################################################
@ -486,14 +496,6 @@ for PLAYER in ${PLAYERONE[@]}; do
    echo "================================================"
    ipfs pin rm ${CURCHAIN}

-    #### SEND DAY2 ZINE
-    ZINE2="${MY_PATH}/../templates/UPlanetDAY${days}/index.${lang}.html"
-    [[ ! -s ${ZINE2} ]] && ZINE2="${MY_PATH}/../templates/UPlanetDAY${days}/index.html"
-    [[ -s ${ZINE2} ]] \
-        && echo "SENDING ZINE2 DAY ${days}" \
-        && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ${ZINE2} "ZINE #${days}" \
-        || echo "NO ZINE FOR ${days} DAY"
-
    ######################### REPLACE TW with REDIRECT to latest IPFS or IPNS (reduce 12345 cache size)
    [[ ! -z ${TW} ]] && TWLNK="/ipfs/${TW}" || TWLNK="/ipns/${ASTRONAUTENS}"
    echo "<meta http-equiv=\"refresh\" content=\"0; url='${TWLNK}'\" />${PLAYER}" \
@ -545,7 +547,7 @@ if [[ ${days} -ge 14 ]]; then
        ### PLAYER ALIVE PUBLISH RSS &
        FEEDNS=$(ipfs key list -l | grep -w "${PLAYER}_feed" | cut -d ' ' -f 1)
        [[ ${FEEDNS} ]] \
-            && IRSS=$(ipfs add -q ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json | tail -n 1) \
+            && IRSS=$(ipfs add --pin=false -q ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json | tail -n 1) \
            && echo "Publishing ${PLAYER}_feed: /ipns/${FEEDNS} => /ipfs/${IRSS}" \
            && ipfs --timeout 300s name publish --key="${PLAYER}_feed" /ipfs/${IRSS} \
            || echo ">>>>> WARNING ${PLAYER}_feed IPNS KEY PUBLISHING CUT - WARNING"
@ -556,6 +558,8 @@ if [[ ${days} -ge 14 ]]; then
                > ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}.feed.html

 fi
+
+
    ## TODO CREATING 30 DAYS XML RSS STREAM ???
    ## https://talk.tiddlywiki.org/t/has-anyone-generated-an-rss-feed-from-tiddlywiki/966/26
    # tiddlywiki.js --load my-wiki.html --render "[[$:/plugins/sq/feeds/templates/rss]]" "feed.xml" "text/plain" "$:/core/templates/wikified-tiddler"
@ -564,9 +568,6 @@ fi
        #~ --output ~/.zen/game/players/${PLAYER}/ipfs --render '.' "${PLAYER}.rss.xml" 'text/plain' "$:/core/templates/wikified-tiddler" 'exportFilter' '[days:created[-30]!is[system]!tag[G1Voeu]]'


-
-
-
    #################################################
    ################### COPY DATA TO UP LEVEL GRIDS
    #################################################
@ -577,7 +578,7 @@ fi
    RLAT=$(echo ${LAT} | cut -d '.' -f 1)
    RLON=$(echo ${LON} | cut -d '.' -f 1)

-    echo "/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}"
+    echo "(⌐■_■) /UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}"
    ## IPFSNODEID 12345 CACHE UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
    mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/RSS/

@ -603,11 +604,11 @@ fi
    echo "(☉_☉ ) (☉_☉ ) (☉_☉ )"

    #####################################################################
-    ## DAY=7 : SEND 3.1 G1 to PLAYER + 3.1 G1 to UMAP
+    ## DAY=7 : SEND ${G1LEVEL1} G1 to PLAYER
    [[ ${days} -eq 7 && "${CURRENT}" != "${PLAYER}" && "${CURRENT}" != "" ]] \
        && echo "7 DAY. PLAYER STEP ONE SUCCEED." \
        && MIUSER=$(${MY_PATH}/../tools/clyuseryomail.sh "${CURRENT}") \
-        && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/.current/secret.dunikey" "3.1" "${G1PUB}" "UPLANET:WELCOME:${MIUSER}:${YOUSER}" \
+        && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/.current/secret.dunikey" "${G1LEVEL1}" "${G1PUB}" "UPLANET:WELCOME:${MIUSER}:${YOUSER}" \
        && echo "UPLANET:WELCOME:${MIUSER}:${YOUSER}" && echo "(⌐■_■) ~~~ OFFICIAL ~~ _${LAT}_${LON} ~~~ $ASTRONAUTENS"

    ## MAINTAIN R/RW TW STATE
--- a/templates/data/IFRAME.json
+++ b/templates/data/IFRAME.json
@ -1 +1,11 @@
-[{"created":"20240331143448133","text":"<iframe src={{{ [{$:/ipfs/saver/gateway/http/localhost!!text}] [{!!ipfs}] +[join[]] }}} height='720' width='100%'></iframe>","creator":"Fred","tags":"support@qo-op.com [[Old School]] [[Demo Maker]] xem Game G1Game","title":"GAME_It_s_Too_Raw","modified":"20240331143850001","modifier":"Fred","ipfs":"/ipfs/Qmae5PRTKwreyV4NUTw48BdsA5BsMVKkm9mzGbnfnJRJwT","type":"text/vnd.tiddlywiki","github":"https://github.com/xem/gamedevjs2022/"}]
+[
+  {
+    "created": "_MOATS_",
+    "modified": "_MOATS_",
+    "title": "_TITLE_",
+    "text": "<iframe src={{{ [{$:/ipfs/saver/gateway/http/localhost!!text}] [{!!ipfs}] +[join[]] }}} height='720' width='100%'></iframe>",
+    "tags": "UPlanetZine _PLAYER_",
+    "ipfs": "/ipfs/_CID_",
+    "type": "text/vnd.tiddlywiki"
+  }
+]
--- a/tools/mailjet.sh
+++ b/tools/mailjet.sh
@ -26,23 +26,14 @@ echo '
 mail="$1" # EMAIL DESTINATAIRE
 ############################################## SEARCH in players
 $($MY_PATH/../tools/search_for_this_email_in_players.sh ${mail})
-echo "export ASTROPORT=$ASTROPORT ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS INDEX=$INDEX source=$source"
+echo "ASTROPORT=$ASTROPORT
+ASTROTW=$ASTRONAUTENS
+ASTROG1=$ASTROG1
+ASTROMAIL=$EMAIL
+ASTROFEED=$FEEDNS
+TW=$TW
+source=$source"

-############# GETTING MAILJET API ############### from ~/.zen/MJ_APIKEY
-[[ ! -s ~/.zen/MJ_APIKEY ]] \
-    && echo "MISSING ~/.zen/MJ_APIKEY
-    PLEASE PROVIDE MAILJET KEY : MJ_APIKEY_PUBLIC= & MJ_APIKEY_PRIVATE" \
-    && exit 1
-
-## LOAD SENDER API KEYS
-###################################
-######### ~/.zen/MJ_APIKEY contains
-# export MJ_APIKEY_PUBLIC='publickey'
-# export MJ_APIKEY_PRIVATE='privatekey'
-# export SENDER_EMAIL='me@source.tld'
-###################################
-source ~/.zen/MJ_APIKEY
-export RECIPIENT_EMAIL=${mail}

 #~ echo "DEST=$mail"
 # mail=geg-la_debrouille@super.chez-moi.com
@ -77,10 +68,58 @@ EMAILZ=$(ipfs add -q ~/.zen/tmp/email.txt)
 echo "/ipfs/${EMAILZ}"
 ipfs pin rm ${EMAILZ}

+################### TW INDEX TO LOAD IFRAME WITH ?
+INDEX="$4"
+if [[ -s ${INDEX} ]]; then
+    echo "INSERT ZINE INTO TW"
+    MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
+    mkdir -p ~/.zen/tmp/${MOATS}
+
+    cat ${MY_PATH}/../templates/data/IFRAME.json \
+    | sed -e "s~_MOATS_~${MOATS}~g" \
+    -e "s~_TITLE_~${SUBJECT}~g" \
+    -e "s~_CID_~${EMAILZ}~g" \
+    -e "s~_PLAYER_~${mail}~g" \
+        > ~/.zen/tmp/iframe.json
+
+    ### IMPORT INTO TW
+    tiddlywiki --load ${INDEX} \
+                --import ~/.zen/tmp/iframe.json "application/json" \
+                --output ~/.zen/tmp/${MOATS} --render "$:/core/save/all" "newindex.html" "text/plain"
+
+    if [[ -s ~/.zen/tmp/${MOATS}/newindex.html ]]; then
+
+        [[ $(diff ~/.zen/tmp/${MOATS}/newindex.html ${INDEX} ) ]] \
+            && mv ~/.zen/tmp/${MOATS}/newindex.html ${INDEX} \
+            && echo "===> Mise à jour ${INDEX}"
+
+    else
+        echo "Problem with tiddlywiki command. Missing ~/.zen/tmp/${MOATS}/newindex.html"
+        echo "XXXXXXXXXXXXXXXXXXXXXXX"
+    fi
+
+fi
+
 export TEXTPART="$(myIpfsGw)/ipfs/${EMAILZ}"

 [[ $title == "" ]] && title="MESSAGE"

+############# GETTING MAILJET API ############### from ~/.zen/MJ_APIKEY
+[[ ! -s ~/.zen/MJ_APIKEY ]] \
+    && echo "MISSING ~/.zen/MJ_APIKEY
+    PLEASE PROVIDE MAILJET KEY : MJ_APIKEY_PUBLIC= & MJ_APIKEY_PRIVATE" \
+    && exit 1
+
+## LOAD SENDER API KEYS
+###################################
+######### ~/.zen/MJ_APIKEY contains
+# export MJ_APIKEY_PUBLIC='publickey'
+# export MJ_APIKEY_PRIVATE='privatekey'
+# export SENDER_EMAIL='me@source.tld'
+###################################
+source ~/.zen/MJ_APIKEY
+export RECIPIENT_EMAIL=${mail}
+
 json_payload='{
    "Messages": [
        {
--- a/tools/my.sh
+++ b/tools/my.sh
@ -563,3 +563,6 @@ myLIBRA="https://ipfs.asycn.io" ## READ ONLY IPFS GATEWAY
 TODATE=$(date -d "today 13:00" '+%Y-%m-%d')
 YESTERDATE=$(date -d "yesterday 13:00" '+%Y-%m-%d')
 DEMAINDATE=$(date -d "tomorrow 13:00" '+%Y-%m-%d')
+
+## WRITE THE DIFFERENT REWARDS
+G1LEVEL1="3.1"
--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@ -38,12 +38,12 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then

        tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'

-        ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
-        ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)
-        TWCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain)
+        ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astroport)
+        ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].g1pub)
+        TWCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].chain)

        ## GET ASTRONAUTENS - field was missing in TW model Astroport Tiddler -
-        ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astronautens)
+        ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json 2>/dev/null | jq -r .[].astronautens)
        [[ ${ASTRONAUTENS} == "null" || ${ASTRONAUTENS} == "" ]] && ASTRONAUTENS="/ipns/"$(ipfs key list -l | grep -w ${ASTROG1} | cut -d ' ' -f1)
        [[ ${ASTRONAUTENS} == "/ipns/" ]] && ASTRONAUTENS="/ipfs/${TWCHAIN}"
    else
@ -61,6 +61,6 @@ else

 fi

-
-echo "export ASTROPORT=$ASTROPORT ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS INDEX=$INDEX source=$source"
+### RUN THIS $(SCRIPT) TO INITIALIZE PLAYER ENV
+echo "export ASTROPORT=$ASTROPORT ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS TW=$INDEX source=$source"
 exit 0