From 2218958d857f1a7315709523e0659d30bd85d7e8 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 31 Jul 2023 17:08:55 +0200
Subject: [PATCH] comment=N1Kodi:TiddlerTiltleHash

---
 ASTROBOT/G1Kodi.sh   |  2 +-
 ASTROBOT/G1PalPay.sh | 10 +++++-----
 TODO.list            | 17 +++++++++++++++++
 ajouter_media.sh     | 32 +++++++++++++++++++-------------
 install.sh           |  2 +-
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/ASTROBOT/G1Kodi.sh b/ASTROBOT/G1Kodi.sh
index 5cf67ef8..5c57b802 100755
--- a/ASTROBOT/G1Kodi.sh
+++ b/ASTROBOT/G1Kodi.sh
@@ -147,7 +147,7 @@ while read TITRE; do
             #~ THASHSEC=$(cat ~/.zen/tmp/${MOATS}/thash.enc | base16)
             #~ Then update THASH with THASHSEC next
             ## CREATE june:// QRCODE put it in IPFS
-            PAYCOM="june://${G1PUB}?comment=N1Kodi:${THASH}&"
+            PAYCOM="june://${G1PUB}?comment=N1Kodi:${THASH}&" ## comment=N1Kodi:TiddlerTiltleHash
             echo "${PAYCOM}"
             amzqr "${PAYCOM}" -l H -c -p ${MY_PATH}/../images/TV.png -n VOD_${TITLE}.png -d ~/.zen/tmp/${MOATS}/
             convert -gravity northwest -pointsize 20 -fill black -draw "text 30,3 \"${TITRE} (${YEAR})\"" ~/.zen/tmp/${MOATS}/VOD_${TITLE}.png ~/.zen/tmp/${MOATS}/VOD.png
diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh
index a863b3c5..12ff89a2 100755
--- a/ASTROBOT/G1PalPay.sh
+++ b/ASTROBOT/G1PalPay.sh
@@ -64,7 +64,7 @@ cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[]
 while read NLINE; do
     IDATE=$(echo ${NLINE} | jq -r .date)
     IPUBKEY=$(echo ${NLINE} | jq -r .pubkey)
-    [[ $(cat ~/.zen/game/players/${PLAYER}/.idate) -ge $IDATE ]]  && echo "N1COMMAND $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue
+    [[ $(cat ~/.zen/game/players/${PLAYER}/.ndate) -ge $IDATE ]]  && echo "N1COMMAND $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue
 
     COMMENT=$(echo ${NLINE} | jq -r .comment)
     CMD=$(echo ${COMMENT} | cut -d ':' -f 1)
@@ -75,7 +75,7 @@ while read NLINE; do
         echo "RECEIVED CMD=${CMD} from ${IPUBKEY}"
         ${MY_PATH}/${CMD}.sh ${INDEX} ${PLAYER} ${MOATS} ${IPUBKEY} ${TH}
         ## WELL DONE .
-        [[ $? == 0 ]] && echo "${CMD} DONE" && echo "$IDATE" > ~/.zen/game/players/${PLAYER}/.idate ## MEMORIZE LAST IDATE
+        [[ $? == 0 ]] && echo "${CMD} DONE" && echo "$IDATE" > ~/.zen/game/players/${PLAYER}/.ndate ## MEMORIZE LAST IDATE
 
     else
 
@@ -110,7 +110,7 @@ while read LINE; do
     COMMENT=$(echo $JSON | jq -r .comment)
 
     echo ">>> TODO CHECK TX HAPPENS LAST 24H (WHAT IS IDATE=$IDATE FORMAT ??)"
-    [[ $(cat ~/.zen/game/players/${PLAYER}/.idate) -ge $IDATE ]]  && echo "PalPay $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue
+    [[ $(cat ~/.zen/game/players/${PLAYER}/.atdate) -ge $IDATE ]]  && echo "PalPay $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue
 
     ## GET EMAILS FROM COMMENT
     ICOMMENT=($(echo "$COMMENT" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
@@ -140,7 +140,7 @@ while read LINE; do
 
         [[ ! ${ASTROG1} ]] \
         && echo "SORRY ${EMAIL} MISSING ASTROG1" \
-        && echo " $PLAYER  VEUX VOUS OFFRIR ${SHARE} G1 \n Joignez-vous au Collectif ♥BOX https://opencollective.com/monnaie-libre/" > ~/.zen/tmp/palpay.bro \
+        && echo " $PLAYER  VEUX VOUS OFFRIR ${SHARE} G1 \n Joignez-vous au Collectif https://www.copylaradio.com/" > ~/.zen/tmp/palpay.bro \
         && ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. " ~/.zen/tmp/palpay.bro \
         && continue
 
@@ -165,7 +165,7 @@ while read LINE; do
         fi
 
         ## DONE STAMP IT
-        [[ $STAMP == 0 ]] && echo "STAMP DONE" && echo "$IDATE" > ~/.zen/game/players/${PLAYER}/.idate ## MEMORIZE LAST IDATE
+        [[ $STAMP == 0 ]] && echo "STAMP DONE" && echo "$IDATE" > ~/.zen/game/players/${PLAYER}/.atdate ## MEMORIZE LAST IDATE
 
     done
 
diff --git a/TODO.list b/TODO.list
index 8a569b6d..ba54c890 100644
--- a/TODO.list
+++ b/TODO.list
@@ -1,3 +1,20 @@
+CESIUM PLUS POD API
+https://github.com/duniter/cesium-plus-pod/blob/master/src/site/markdown/REST_API.md
+
+FIND IN SYNC DUNITER NODES
+
+https://g1.data.e-is.pro/g1/block/current
+
+https://g1.duniter.fr/network/peers
+https://g1.duniter.fr/network/ws2p/heads
+
+EXTRACT MEMBER
+https://g1.data.e-is.pro/wot/members
+
+FOLLOW THE G1 (FIND LOOPS)
+https://g1.data.e-is.pro/g1/movement/_search?pretty&q=DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech
+
+
 # TODO LIST
 MADE BY
 ```
diff --git a/ajouter_media.sh b/ajouter_media.sh
index 4e3f6893..2ba3d32b 100755
--- a/ajouter_media.sh
+++ b/ajouter_media.sh
@@ -20,7 +20,6 @@
 ########################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
-. "${MY_PATH}/tools/my.sh"
 
 LOWMODE=$(sudo systemctl status ipfs | grep disabled) ## IPFS DISABLED - START ONLY FOR SYNC -
 # echo "$USER ALL=(ALL) NOPASSWD:/bin/systemctl" | (sudo su -c 'EDITOR="tee" visudo -f /etc/sudoers.d/systemctl')
@@ -29,6 +28,19 @@ if [[ $LOWMODE != "" ]]; then
     sudo systemctl start ipfs
 fi
 
+########################################################################
+
+espeak "restarting I P F S daemon"
+[[ "$isLAN" ]] && sudo systemctl restart ipfs
+
+## CHECK IF IPFS DAEMON IS STARTS WELL
+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
+done
+
+. "${MY_PATH}/tools/my.sh"
 [[ $IPFSNODEID == "" ]] && echo "IPFSNODEID manquant" && espeak "IPFS NODE ID Missing" && exit 1
 
 
@@ -161,18 +173,6 @@ ISPUBLISHING=$(ps auxf --sort=+utime | grep -w 'ipfs name publish' | grep -v -E
 [[ $ISADDING || $ISPUBLISHING ]] \
 && espeak "I P F S task in progress. Wait finish & try later" && exit 1
 
-########################################################################
-
-espeak "restarting I P F S daemon"
-[[ "$isLAN" ]] && sudo systemctl restart ipfs
-
-## CHECK IF IPFS DAEMON IS STARTS WELL
-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
-done
-
 ## CHECK IF ASTROPORT/CRON/IPFS IS RUNNING
 YOU=$(myIpfsApi)
 [[ ! $YOU ]] &&  espeak "I P F S not running - EXIT" && exit 1
@@ -479,6 +479,12 @@ echo '[
 
         espeak "OK P D F received"
 
+        #~ ## TODO
+        #~ ## CONVERT TO DOCX
+        #~ pdf2docx convert ~/.zen/tmp/output.pdf
+        #~ # THEN TO MD
+        #~ pandoc -f docx -t markdown -o ~/.zen/tmp/output.md ~/.zen/tmp/output.docx
+
         CTITLE=$(echo $URL | rev | cut -d '/' -f 1 | rev)
 
         [ ! $2 ] && TITLE=$(zenity --entry --width 480 --title "Titre" --text "Quel nom donner à ce fichier ? " --entry-text="${CTITLE}") || TITLE="$CTITLE"
diff --git a/install.sh b/install.sh
index 0d41c8cb..7076730b 100755
--- a/install.sh
+++ b/install.sh
@@ -137,7 +137,7 @@ echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo
 # python3 -m pip install -U silkaj
 # python3 -m pip install -U protobuf==3.19.0
 
-for i in pip setuptools wheel cryptography==3.4.8 Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes amzqr; do
+for i in pip setuptools wheel cryptography==3.4.8 Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes amzqr pdf2docx; do
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         sudo python3 -m pip install -U $i
         [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python3 -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue