From 21ca95fe0f23d6529424cf3c2917725ed68910ac Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sat, 29 Apr 2023 23:27:49 +0200
Subject: [PATCH] G1Milgram v0.1 / Sub PLAYER G1Voeu YYYYMM - must be relayed
 to find target - maximum validity 2 month

---
 ASTROBOT/G1Voeu.sh   |  24 ++--------
 command.sh           |   2 +-
 tools/VOEUX.print.sh | 106 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 99 insertions(+), 33 deletions(-)

diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh
index 0b839882..3d7a9917 100755
--- a/ASTROBOT/G1Voeu.sh
+++ b/ASTROBOT/G1Voeu.sh
@@ -96,26 +96,10 @@ mkdir -p ~/.zen/tmp/${MOATS}
 
     qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.WISHLINK.png" "$LIBRA/ipns/${VOEUNS}"
 
-    ## MAKING amrzqr containing GPG SALT API INPUT
-    ## LE MOT DE PASSE DU PLAYER PEUT UTILISER LE G1PASS
-    USALT=$(echo "$SECRET1" | jq -Rr @uri)
-    UPEPPER=$(echo "${SECRET2}" | jq -Rr @uri)
-    DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
-    echo "${DISCO}"  > ~/.zen/tmp/topgp
-    cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$SALT" -o ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc
-
-    cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png
-
-    ## MAKE amzqr WITH ~~~ PGP G1PASS FORMAT
-    amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc  | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" \
-                -d "$HOME/.zen/tmp/${MOATS}" \
-                -l H \
-               -p ~/.zen/tmp/${MOATS}/result.png -c
-
-    convert -gravity northwest -pointsize 25 -fill black -draw "text 5,5 \"${PLAYER}\"" ~/.zen/tmp/${MOATS}/result_qrcode.png ~/.zen/tmp/${MOATS}/layer1.png
-    convert -gravity southeast -pointsize 25 -fill black -draw "text 5,5 \"${VoeuName}\"" ~/.zen/tmp/${MOATS}/layer1.png $HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/result.png
-
-    IMAGIC=$(ipfs add -Hq ~/.zen/game/world/${VoeuName}/${WISHG1PUB}/result.png | tail -n 1)
+    #################################################################
+    ## MAKING SPECIAL amrzqr => G1Milgram TICKET
+    ## LE QRCODE CORRESPOND A LA CLEF DERIVE "${PLAYER} :: G1${VoeuName}" avec PASS=YYYYMM
+    IMAGIC=$(${MY_PATH}/../tools/VOEUX.print.sh "${PLAYER}" "${VoeuName}" "${MOATS}" | tail -n 1)
 
     qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.ASTROLINK.png" "$LIBRA/ipns/$ASTRONAUTENS"
     qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1ASTRO.png" "$G1PUB"
diff --git a/command.sh b/command.sh
index 4f24e351..e3d55044 100755
--- a/command.sh
+++ b/command.sh
@@ -121,7 +121,7 @@ select fav in  "${choices[@]}"; do
             ipfs key rm $vk
         done
 
-        ## UNPLUG PLAYER DOCKER
+        ## UNPLUG PLAYER DOCKER / SEE myos MODE
         [[ $USER == "zen" ]] && make player MAIL=$PLAYER DELETE=true
 
         #~ echo "REMOVING GCHANGE+ PROFILE"
diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh
index 11f762b2..2a946cbe 100755
--- a/tools/VOEUX.print.sh
+++ b/tools/VOEUX.print.sh
@@ -8,16 +8,59 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 . "$MY_PATH/my.sh"
 
 PLAYER=$1
+VoeuName=$2
+MOATS=$3
 
+UPASS=$(date '+%Y%m') # YYYYMM
 [[ ${PLAYER} == "" ]] && PLAYER=$(cat ~/.zen/game/players/.current/.player 2>/dev/null)
 [[ ${PLAYER} == "" ]] && echo "PLAYER manquant" && exit 1
 PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
-[[ $G1PUB == "" ]] && G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub 2>/dev/null)
-[[ $G1PUB == "" ]] && echo "G1PUB manquant" && exit 1
+[[ ${G1PUB} == "" ]] && G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub 2>/dev/null)
+[[ ${G1PUB} == "" ]] && echo "G1PUB manquant" && exit 1
 ASTRONAUTENS=$(ipfs key list -l | grep -w "${G1PUB}" | cut -d ' ' -f 1)
-[[ $ASTRONAUTENS == "" ]] && echo "ASTRONAUTE manquant" && exit 1
+[[ ${ASTRONAUTENS} == "" ]] && echo "ASTRONAUTE manquant" && exit 1
 
+############################################################ G1Voeu.sh use
+############################################################ PRINT G1Milgram (once a month)
+    if [[ ${G1PUB} != "" && ${VoeuName} != "" && -d ~/.zen/tmp/${MOATS} ]]; then
+
+    #################################################################
+    ## MAKING SPECIAL amrzqr => G1Milgram TICKET
+    ## LE QRCODE CORRESPOND A LA CLEF DERIVE "${PLAYER} ${G1PUB} :: G1${VoeuName}" avec PASS=YYYYMM
+    SECRET1="${PLAYER} ${G1PUB}"
+    SECRET2="G1${VoeuName}"
+
+    ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${VoeuName}.ipfskey "${SECRET1}" "${SECRET2}"
+
+    USALT=$(echo "${SECRET1}" | jq -Rr @uri)
+    UPEPPER=$(echo "${SECRET2}" | jq -Rr @uri)
+    DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
+    echo "${DISCO}"  > ~/.zen/tmp/${MOATS}/topgp
+
+    cat ~/.zen/tmp/${MOATS}/topgp | gpg --symmetric --armor --batch --passphrase "$UPASS" -o ~/.zen/tmp/${MOATS}/gpg.asc
+
+    cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png
+
+    ## MAKE amzqr WITH @@@@@ PGP G1PASS FORMAT (%40)
+    amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.asc  | tr '-' '@' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" \
+                -d "$HOME/.zen/tmp/${MOATS}" \
+                -l H \
+               -p ~/.zen/tmp/${MOATS}/result.png -c
+
+    convert -gravity northwest -pointsize 25 -fill black -draw "text 5,5 \"${PLAYER} - ${UPASS} \"" ~/.zen/tmp/${MOATS}/result_qrcode.png ~/.zen/tmp/${MOATS}/layer1.png
+    convert -gravity southeast -pointsize 25 -fill black -draw "text 5,5 \"${VoeuName}\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/final.png
+
+    IMAGIC=$(ipfs add -Hq ~/.zen/tmp/${MOATS}/final.png | tail -n 1)
+    echo ${IMAGIC}
+    exit 0
+
+    fi
+############################################################
+############################################################
+
+## COMMAND LINE MODE
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+[[ ! ${MOATS} ]] && MOATS=$(date -u +"%Y%m%d%H%M%S%4N") && mkdir -p ~/.zen/tmp/${MOATS}
 ###############################
 ## EXTRACT G1Voeu from PLAYER TW
 echo "Exporting ${PLAYER} TW [tag[G1Voeu]]"
@@ -55,7 +98,7 @@ select zwish in "${vlist[@]}"; do
 
         VOEUXNS=$(ipfs key list -l | grep -w ${voeu} | cut -d ' ' -f1)
 
-        choices=("TW" "Ğ1")
+        choices=("TW" "Ğ1" "Ğ1Milgram")
         PS3='Imprimer le QR (TW DApp) ou de son portefeuille (Ğ1) ?'
         select typ in "${choices[@]}"; do
 
@@ -64,31 +107,70 @@ select zwish in "${vlist[@]}"; do
                 echo "Changer de Gateway $myIPFS ?"
                 read GW && [[ ! $GW ]] && GW="$myIPFS"
                 qrencode -s 12 -o "$HOME/.zen/game/world/${TITLE}/${voeu}/QR.WISHLINK.png" "$GW/ipns/$VOEUXNS"
-                convert $HOME/.zen/game/world/${TITLE}/${voeu}/QR.WISHLINK.png -resize 600 ~/.zen/tmp/START.png
+                convert $HOME/.zen/game/world/${TITLE}/${voeu}/QR.WISHLINK.png -resize 600 ~/.zen/tmp/${MOATS}/START.png
                 echo " QR code ${TITLE}  : $GW/ipns/$VOEUXNS"
                 break
             ;;
+
             "Ğ1")
                 qrencode -s 12 -o "$HOME/.zen/game/world/${TITLE}/${voeu}/G1PUB.png" "${voeu}"
-                convert $HOME/.zen/game/world/${TITLE}/${voeu}/G1PUB.png -resize 600 ~/.zen/tmp/START.png
+                convert $HOME/.zen/game/world/${TITLE}/${voeu}/G1PUB.png -resize 600 ~/.zen/tmp/${MOATS}/START.png
                 break
             ;;
+
+            "Ğ1Milgram")
+
+                # CREATE G1Milgram
+                IMAGIC=$(${MY_PATH}/VOEUX.print.sh "${PLAYER}" "${TITLE}" "${MOATS}" | tail -n 1)
+
+                ## EXTRACT TEXT FROM TIDDLER
+                tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu \
+                                    --render '.' "${PLAYER}.${TITLE}.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${TITLE}"
+
+                cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.${TITLE}.json | jq -r '.[].text' > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.html
+
+                MILGRAM=$(ipfs add -q ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.html)
+
+                xdg-open http://ipfs.localhost:8080/ipfs/${IMAGIC}
+
+                # ${TITLE} key
+                IK=$(ipfs key list -l | grep -w "${PLAYER}_${TITLE}" | cut -d ' ' -f 1 )
+                [[ $IK ]] && ipfs key rm ${PLAYER}_${TITLE}
+                ipfs key import ${PLAYER}_${TITLE} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${TITLE}.ipfskey
+                IK=$(ipfs key list -l | grep -w "${PLAYER}_${TITLE}" | cut -d ' ' -f 1 )
+
+                xdg-open http://ipfs.localhost:8080/ipfs/${MILGRAM}
+                (
+                    ipfs name publish -k ${PLAYER}_${TITLE} /ipfs/${MILGRAM}
+                    echo "${TITLE} ${UPASS} G1Milgram emitted ${PLAYER}"
+                ) &
+
+                break
+            ;;
+
+            "")
+                echo "Mauvais choix."
+            ;;
+
             esac
         done
 
-        convert -gravity northwest -pointsize 40 -fill black -draw "text 50,2 \"${TITLE} ($typ)\"" ~/.zen/tmp/START.png ~/.zen/tmp/g1voeu1.png
-        convert -gravity southeast -pointsize 30 -fill black -draw "text 50,2 \"${GW}\"" ~/.zen/tmp/g1voeu1.png ~/.zen/tmp/g1voeu.png
+        convert -gravity northwest -pointsize 40 -fill black -draw "text 50,2 \"${TITLE} ($typ)\"" ~/.zen/tmp/${MOATS}/START.png ~/.zen/tmp/${MOATS}/g1voeu1.png
+        convert -gravity southeast -pointsize 30 -fill black -draw "text 50,2 \"${GW}\"" ~/.zen/tmp/${MOATS}/g1voeu1.png ~/.zen/tmp/${MOATS}/g1voeu.png
 
-        #~ echo "~/.zen/tmp/g1voeu.png READY ?"
-        [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/g1voeu.png
+        #~ echo "~/.zen/tmp/${MOATS}/g1voeu.png READY ?"
+        [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/g1voeu.png
 
         LP=$(ls /dev/usb/lp* 2>/dev/null | head -n1)
         [[ ! $LP ]] && echo "NO PRINTER FOUND - Brother QL700 validated" && continue
 
         echo "IMPRESSION LIEN TW VOEU"
-        brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/g1voeu.png > ~/.zen/tmp/toprint.bin 2>/dev/null
-        sudo brother_ql_print ~/.zen/tmp/toprint.bin $LP
+        brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/g1voeu.png > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null
+        sudo brother_ql_print ~/.zen/tmp/${MOATS}/toprint.bin $LP
 
         ;;
     esac
 done
+
+## DEV MODE : AUDIT CODE & ACTIVATE REMOVE FOR SECURITY (OR USE encrypted RAM DISK for ~/.zen/tmp )
+# rm -Rf ~/.zen/tmp/${MOATS}