From 92f7dd03869045d41f15cc3d03bc7d7b15cbd815 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 31 Dec 2023 15:06:34 +0100
Subject: [PATCH] VOEUX.refresh send GRATITUDE ZEN to SECTOR

---
 RUNTIME/VOEUX.refresh.sh | 40 ++++++++++++++++++++++++++++++----------
 TODO.list                | 35 +++++++++++++++++++++--------------
 ajouter_media.sh         | 23 ++++++++++++++---------
 tools/mailjet.sh         |  2 +-
 tools/my.sh              |  2 +-
 5 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh
index 6fe9829a..734d1ce6 100755
--- a/RUNTIME/VOEUX.refresh.sh
+++ b/RUNTIME/VOEUX.refresh.sh
@@ -171,6 +171,7 @@ do
             tiddlywiki --load ${FRIENDTW} --output ~/.zen/tmp --render '.' "${APLAYER}.${WISHNAME}.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${WISHNAME}"
             FWISHNS=$(cat ~/.zen/tmp/${APLAYER}.${WISHNAME}.json | jq -r '.[].wishns')
 #            FWISHPROG=$(cat ~/.zen/tmp/${APLAYER}.${WISHNAME}.json | jq -r '.[].text')
+# TIDDLER COULD CONTAIN #!/bin/bash PROGRAM !!!
             [[ $FWISHNS == "null" ]] && echo "NO FWISHNS in ~/.zen/tmp/${APLAYER}.${WISHNAME}.json" && echo && ((floop++)) && continue
             echo ">>> ${myIPFS}${FWISHNS}"
 
@@ -260,18 +261,37 @@ do
         echo "WALLET ${VOEUKEY} FOUNDED by ${G1PUB}"
         cp -f ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${WISHNAME}/* ~/.zen/game/players/${PLAYER}/G1${WISHNAME}/${G1PUB}/ 2>/dev/null
 
-        #~ echo "************************************************************"
-        #~ echo "Hop, 1 ZEN pour le Voeu $WISHNAME"
-        #~ echo $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 0.1 -p $VOEUKEY -c \'"ASTRO:${IPNS_VOEUNS} G1Voeu $WISHNAME"\' -m
-        #~ echo "************************************************************"
-        #~ echo "************************************************************"
-
-        #~ $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 0.1 -p $VOEUKEY -c "ASTRO:$VOEUXNS G1Voeu $WISHNAME" -m
-        #~ [[ ! $? == 0 ]] \
-        #~ && echo "POOOOOOOOOOOOOOOOOOOORRRRRR GUY. YOU CANNOT PAY A G1 FOR YOUR WISH"
-
 done < ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt
 
+################################################
+### SEND GRATITUDE TO SECTOR
+## GET "GPS" TIDDLER
+tiddlywiki --load ${INDEX} \
+    --output ~/.zen/tmp/${MOATS} \
+    --render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS'  ## GPS Tiddler
+TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
+LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
+LAT=$(makecoord $LAT)
+LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
+LON=$(makecoord $LON)
+echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
+rm ~/.zen/tmp/${MOATS}/GPS.json
+SECLAT="${LAT::-1}"
+SECLON="${LON::-1}"
+SECTOR="_${SECLAT}_${SECLON}"
+##############################################################
+SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
+##############################################################
+GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh)
+G1AMOUNT=$((GRATITUDE / 10))
+echo "***** PLAYER $PLAYER *************************************"
+echo "SEND ${ZENGRATITUDE} ZEN
+to ${SECTOR} WALLET ${SECTORG1PUB}"
+echo "************************************************************"
+${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${G1AMOUNT}" "${SECTORG1PUB}" "IPFS:${WISHFLUX}"
+################################################
+################################################ GRATITUDE SENT TO SECTOR
+
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 echo "TODO : REFRESH WORLD SAME WISH CACHE"
 cat ~/.zen/game/world/$WISHNAME/*/.link 2>/dev/null
diff --git a/TODO.list b/TODO.list
index 1cb78567..bf55a77d 100644
--- a/TODO.list
+++ b/TODO.list
@@ -22,32 +22,39 @@ MADE BY
 ```
 ./ajouter_media.sh:## KEEPS KODI COMPATIBILITY (BROKEN astroport.py !! ) : TODO DEBUG
 ./ajouter_media.sh:        # Funny Crypto Level # TODO MAKE IT MORE SECURE # THIS KEY OWNS THE DOMAIN NOW
+./ajouter_media.sh:            ## NB TEXT IS MADE WITH TIDDLERS FIELDS VALUES (LEARN TODO)
+./ajouter_media.sh:        #~ ## TODO
 ./ajouter_media.sh:        FILE_NAME="$(echo "${TITLE}" | detox --inline).pdf" ## TODO make it better
 ./ajouter_media.sh:    ## TODO : CHECK CACHE LAST MODIFIED
+./setup_nginx.sh: echo "TODO: make it easier ;)"
+./tools/Connect_PLAYER_To_Gchange.sh:# TODO: could make better ES stars requests
 ./tools/Connect_PLAYER_To_Gchange.sh:#### TODO RECUP ANNONCES Gchange ADD TO TW
+./tools/RSS2UPlanetTW.sh:        ## TODO EXTEND CONTROL TO text AND ipfs _canonical_url
+./tools/RSS2UPlanetTW.sh:        ## NB: COULD NEED SORTING (TODO)
+./tools/streaming/install.sh:# TODO: why is this needed?
+./tools/streaming/process-stream.sh:#TODO# Fix this one
 ./tools/make_video_gifanim_ipfs.sh:## Create gifanime ##  TODO Search for similarities BEFORE ADD
 ./tools/create_ipfsnodeid_from_tmp_secret.dunikey.py:# TODO controls
 ./tools/cron_VRFY.sh:## TODO check for Station geoposition in ~/.zen/GPS and calibrate 20H12
 ./tools/cron_VRFY.sh:cat ~/.zen/GPS 2>/dev/null && echo " TODO calibrate 20H12 with GPS"
-./RUNTIME/VISA.new.sh:######### TODO Ajouter d'autres clefs IPNS, GPG ?
-./RUNTIME/VISA.new.sh:WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
-./RUNTIME/VISA.new.sh:    ############ TODO améliorer templates, sed, ajouter index.html, etc...
-./RUNTIME/VISA.new.sh:         ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE
-./RUNTIME/VISA.new.sh:# !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION
-./RUNTIME/VISA.new.sh:# TODO : Allow Astronaut PASS change ;)
-./tools/search_for_this_email_in_players.sh:### TODO MAKE IT WORKS BETTER
+./tools/PAY4SURE.sh:    echo "SENT" > ${PENDINGFILE} ## TODO : MONITOR POTENTIAL CHAIN REJECTION (FORK/MERGE WINDOW)
+./tools/duniter_getnode.sh:# TODO: REMOVE 777 PATCH, ACTIVATE ramdisk
 ./tools/search_for_this_email_in_players.sh:    ## TODO ? SEARCH WITH DNSLINK
 ./tools/new_file_in_astroport.sh:        ## Create gifanime ##  TODO Search for similarities BEFORE ADD
-./tools/new_file_in_astroport.sh:    ## TODO ADD "httrack" for website copying
+./tools/new_file_in_astroport.sh:# EXTRACT INDEX REFERENCE : TMDB or YOUTUBE (TODO : EXTEND)
 ./tools/new_file_in_astroport.sh:    ## TODO USE IT TO MAKE A MEDIAKEY IMAGE KEY "SONDE" FOR FILTERING ?
+./tools/new_file_in_astroport.sh:        TidType="text/vnd.tiddlywiki" ## MAYBE REAL ONCE TW CAN SHOW ATTACHED IPFS VIDEO (TODO: TESTINGS)
 ./tools/new_file_in_astroport.sh:## TODO : Do we keep that ?
-./tools/astroscan.sh:# TODO USE TW COMMANDS
-./ASTROBOT/PLAYER.refresh.sh:    #~ ## IF WALLET IS EMPTY : WHAT TODO ?
-./ASTROBOT/G1PalPay.sh:    echo ">>> TODO CHECK TX HAPPENS LAST 24H (WHAT IS IDATE=$IDATE FORMAT ??)"
-./ASTROBOT/G1PalPay.sh:    #### SEARCH FOR PALPAY ACOUNTS : TODO BETTER §§§
-./ASTROBOT/GCHANGE.process.sh:# Create tiddler informing ... TODO Add keyword ... Use tag="annonce" for tiddlers propagation
+./ASTROBOT/N1Kodi.sh:    ## TODO CREATE A TEMP IPNS KEY ?!
+./ASTROBOT/N1Kodi.sh:## TODO CREATE FROM FRIEND LOCAL KODI RSS
+./ASTROBOT/_sandbox/_GCHANGE.process.sh:# Create tiddler informing ... TODO Add keyword ... Use tag="annonce" for tiddlers propagation
+./ASTROBOT/_sandbox/_GCHANGE.process.sh:echo "TODO DEBUG. CONTINUE?"
+./ASTROBOT/_sandbox/_GCHANGE.process.sh:    # Message tiddlywiki TODO
+./ASTROBOT/G1CopierYoutube.sh:        ## TODO CORRECT - CACHE CHANGED -
+./ASTROBOT/G1CopierYoutube.sh:        ## TODO ACCEPT MORE WITH COINS
 ./ASTROBOT/G1CopierYoutube.sh:        # TODO : DELAY COPY OPERATION...  Astro can download quicker at 03:00 AM
+./ASTROBOT/G1CopierYoutube.sh:        ## COPY FROM YOUTUBE (TODO DOUBLE COPY & MKV to MP4 OPTIMISATION)
 ./ASTROBOT/G1CopierYoutube.sh:        ## Create gifanime ##  TODO Search for similarities BEFORE ADD
 ./ASTROBOT/G1CopierYoutube.sh:    ## TODO : ADD EMAIL TAG ( TIMESTAMP & ADD SIGNATURE over existing ones)
-./ASTROBOT/FRIENDS.manage.sh:# TODO USE WEB INTERFACE
+
 
diff --git a/ajouter_media.sh b/ajouter_media.sh
index a7a6bb3c..70591ffb 100755
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@@ -37,7 +37,10 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 floop=0
 while [[ ! $(netstat -tan | grep 5001 | grep LISTEN) ]]; do
     sleep 1
-    ((floop++)) && [ $floop -gt 10 ] && espeak 'Please check but IPFS cannot start' &&  exit 1
+    ((floop++)) && [ $floop -gt 10 ] \
+        && echo "ERROR. IPFS daemon not running on port 5001"
+        && espeak 'ERROR. IPFS daemon not started' \
+        &&  exit 1
 done
 
 . "${MY_PATH}/tools/my.sh"
@@ -50,11 +53,13 @@ shopt -s expand_aliases
 alias zenity='zenity 2> >(grep -v GtkDialog >&2)'
 alias espeak='espeak 1>&2>/dev/null'
 ########################################################################
-[[ $(which ipfs) == "" ]] && echo "ERREUR! Installez ipfs" && echo "wget https://git.p2p.legal/axiom-team/astrXbian/raw/master/.install/ipfs_alone.sh -O /tmp/ipfs_install.sh && chmod +x /tmp/ipfs_install.sh && /tmp/ipfs_install.sh" && exit 1
+[[ $(which ipfs) == "" ]] && echo "ERREUR! Installez ipfs" && exit 1
 [[ $(which zenity) == "" ]] && echo "ERREUR! Installez zenity" && echo "sudo apt install zenity" && exit 1
 [[ $(which ffmpeg) == "" ]] && echo "ERREUR! Installez ffmpeg" && echo "sudo apt install ffmpeg" && exit 1
 [[ $(which xdpyinfo) == "" ]] && echo "ERREUR! Installez x11-utils" && echo "sudo apt install x11-utils" && exit 1
+[[ $(which tiddlywiki) == "" ]] && echo "ERREUR! Installez tiddlywiki" && echo "sudo npm install -g tiddlywiki" && exit 1
 
+mkdir -p ~/.zen/tmp/
 exec 2>&1 >> ~/.zen/tmp/ajouter_media.log
 
 URL="$1"
@@ -101,7 +106,7 @@ espeak "Hello $PSEUDO"
 G1PUB=$(myPlayerG1Pub)
 [[ $G1PUB == "" ]] && espeak "ERROR NO G 1 PUBLIC KEY FOUND - EXIT" && exit 1
 
-PLAYERNS=$(myPlayerNs) || ( echo "noplayerns" && exit 1 )
+PLAYERNS=$(myPlayerNs) || { echo "noplayerns" && exit 1; }
 
 ASTRONAUTENS=$(myAstroKey)
 [[ $ASTRONAUTENS == "" ]] && echo "ASTRONAUTE manquant" && espeak "Astronaut Key Missing" && exit 1
@@ -840,16 +845,16 @@ if [[ -s ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; t
     echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
     ## GETTING LAST TW via IPFS or HTTP GW
     LIBRA=$(head -n 2 ${MY_PATH}/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 2)
-    rm -f ~/.zen/tmp/ajouter_media.html > /dev/null 2>&1
-    [[ $YOU ]] && echo " ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/ajouter_media.html
-    #~ [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && echo "curl -m 12 $LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/ajouter_media.html "$LIBRA/ipns/${ASTRONAUTENS}"
-    [[ ! -s ~/.zen/tmp/ajouter_media.html ]] && espeak "WARNING. WARNING. impossible to find your TW online"
+    rm -f ~/.zen/tmp/astronaut_TW.html > /dev/null 2>&1
+    [[ $YOU ]] && echo " ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} ($YOU)" && ipfs --timeout 120s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/astronaut_TW.html
+    #~ [[ ! -s ~/.zen/tmp/astronaut_TW.html ]] && echo "curl -m 12 $LIBRA/ipns/${ASTRONAUTENS}" && curl -m 12 -so ~/.zen/tmp/astronaut_TW.html "$LIBRA/ipns/${ASTRONAUTENS}"
+    [[ ! -s ~/.zen/tmp/astronaut_TW.html ]] && espeak "WARNING. WARNING. impossible to find your TW online"
     [[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ]] &&  espeak "FATAL ERROR. No player TW copy found ! EXIT" && exit 1
     ## TODO : CHECK CACHE LAST MODIFIED
     echo "%%%%%%%%%%%%%% I GOT YOUR TW %%%%%%%%%%%%%%%%%%%%%%%%%%"
 
-    [[ -s ~/.zen/tmp/ajouter_media.html ]] \
-    && cp -f ~/.zen/tmp/ajouter_media.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
+    [[ -s ~/.zen/tmp/astronaut_TW.html ]] \
+    && cp -f ~/.zen/tmp/astronaut_TW.html ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
     && espeak "TW Found" \
     || espeak "USING LOCAL COPY"
     ###############################
diff --git a/tools/mailjet.sh b/tools/mailjet.sh
index 562bdef7..a4bd1e4f 100755
--- a/tools/mailjet.sh
+++ b/tools/mailjet.sh
@@ -25,7 +25,7 @@ pseudo=$(echo $mail | cut -d '@' -f 1)
 
 messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP
 
-SUBJECT="[UPlanet/Astroport] $pseudo : $(myHostName)"
+SUBJECT="[UPlanet] $pseudo : $(myHostName)"
 MESSAGEUP="MESSAGE
 ===
 "
diff --git a/tools/my.sh b/tools/my.sh
index 987aa3b7..8836b6aa 100755
--- a/tools/my.sh
+++ b/tools/my.sh
@@ -480,7 +480,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
 ###
 fi
 
-EARTHCID="/ipfs/QmR3am7JVzNuF2ebKMCi4UffKnh8HbNZEY51v4jieS7kbh"
+EARTHCID="/ipfs/QmdcABuoGFgqkxjxbuhS2VLEKgq3upSJSrZdA9qtHhMMa1"
 FLIPPERCID="${EARTHCID}/coinflip"
 
 myUPLANET="${myIPFS}${EARTHCID}" ## EMAIL LAT LON KEY