G1PalPay v0.1

2023-01-03 19:56:30 +01:00 · 2023-01-03 19:56:30 +01:00 · 82f1e97e8a
parent db84c6d8cc
commit 82f1e97e8a
3 changed files with 32 additions and 97 deletions
--- a/ASTROBOT/G1PalPay.sh
+++ b/ASTROBOT/G1PalPay.sh
@ -59,8 +59,8 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun

 ## DEBUG ## cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -r

-## GET @ in
-for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[] | grep 'Bro'); do
+## GET @ in JSON INLINE
+for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[] | grep '@'); do

    echo "MATCHING IN COMMENT"
    JSON=$LINE
@ -68,11 +68,17 @@ for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.jso
    IPUBKEY=$(echo $JSON | jq -r .pubkey)
    IAMOUNT=$(echo $JSON | jq -r .amount)
    IAMOUNTUD=$(echo $JSON | jq -r .amountUD)
-    ICOMMENT=$(echo $JSON | jq -r .comment)
+    COMMENT=$(echo $JSON | jq -r .comment)

-    echo $IDATE $IPUBKEY $IAMOUNT [$IAMOUNTUD] $ICOMMENT
+    ICOMMENT=($COMMENT)
+    ## IF MULTIPLE WORDS OR EMAILS : DIVIDE INCOMING AMOUNT TO SHARE
+    echo "N=${#ICOMMENT[@]}"
+    N=${#ICOMMENT[@]}
+    SHARE=$(echo "$IAMOUNT/$N" | bc -l | cut -d '.' -f 1) ## INTEGER ROUNDED VALUE

-    for EMAIL in "${ICOMMENT[@]}";
+    echo $IDATE $IPUBKEY $IAMOUNT [$IAMOUNTUD] $ICOMMENT % $SHARE %
+
+    for EMAIL in "${ICOMMENT[@]}"; do

        if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
            echo "VALID EMAIL : ${EMAIL}"
@ -94,7 +100,7 @@ for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.jso
                sleep 12

                curl -x http://$TELETUBE:$TELEPORT -o ~/.zen/tmp/${MOATS}/astro.rep
-                $(cat ~/.zen/tmp/${MOATS}/astro.rep | tail -n 1)
+                $(cat ~/.zen/tmp/${MOATS}/astro.rep | tail -n 1) ## SOURCE LAST LINE (SEE SALT PEPPER EMAIL API RETURN)

                ######################################################

@ -104,13 +110,17 @@ for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.jso
            fi

            ## MAKE FRIENDS & SEND G1
-            echo "My PalPay Friend $ASTROMAIL
+            echo "Hello PalPay Friend $ASTROMAIL
            TW : $ASTROTW
            G1 : $ASTROG1
+            ASTROIPFS : $ASTROIPFS
            RSS : $ASTROFEED"

            ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \
-            ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 10 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json
+            ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${SHARE} -p ${ASTROG1} -c "PalPay:$N:$IPUBKEY" -m 2>&1
+
+            ## COULD SEND STARS ??
+

        else
                echo "BAD EMAIL : ${EMAIL}"
@ -122,87 +132,10 @@ for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.jso
 done


-
-#~ ###################################################################
-#~ ## tag[PalPay] EXTRACT ~/.zen/tmp/PalPay.json FROM TW
-#~ ###################################################################
-#~ rm -f ~/.zen/game/players/${PLAYER}/G1PalPay/PalPay.json
-#~ tiddlywiki  --load ${INDEX} \
-                    #~ --output ~/.zen/game/players/${PLAYER}/G1PalPay \
-                    #~ --render '.' 'PalPay.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[PalPay]]'
-#~ echo "DEBUG : cat ~/.zen/game/players/${PLAYER}/G1PalPay/PalPay.json | jq -r"
-#~ ## GOT PalPay TIDDLER
-
-
-        #~ echo "Creating Youtube ${YID} tiddler : G1PalPay !"
-        #~ echo $TEXT
-
-        #~ echo '[
-  #~ {
-    #~ "created": "'${MOATS}'",
-    #~ "resolution": "'${RES}'",
-    #~ "duree": "'${DUREE}'",
-    #~ "duration": "'${DURATION}'",
-    #~ "giftime": "'${PROBETIME}'",
-    #~ "gifanime": "'/ipfs/${ANIMH}'",
-    #~ "modified": "'${MOATS}'",
-    #~ "title": "'$ZFILE'",
-    #~ "type": "'text/vnd.tiddlywiki'",
-    #~ "vtratio": "'${VTRATIO}'",
-    #~ "text": "'$TEXT'",
-    #~ "g1pub": "'${G1PUB}'",
-    #~ "mime": "'${MIME}'",
-    #~ "size": "'${FILE_BSIZE}'",
-    #~ "filesize": "'${FILE_SIZE}'",
-    #~ "sec": "'${SEC}'",
-    #~ "dur": "'${dur}'",
-    #~ "ipfs": "'/ipfs/${ILINK}'",
-    #~ "youtubeid": "'${YID}'",
-    #~ "tags": "'ipfs G1PalPay ${PLAYER} ${EXTRATAG} ${MIME}'"
-  #~ }
-#~ ]
-#~ ' > "$HOME/.zen/tmp/${IPFSNODEID}/G1PalPay/${PLAYER}/$YID.TW.json"
-
-    #~ TIDDLER="$HOME/.zen/tmp/${IPFSNODEID}/G1PalPay/${PLAYER}/$YID.TW.json"
-
-#~ else
-    #~ ###################################################################
-    #~ echo '# TIDDLER WAS IN CACHE'
-    #~ ###################################################################
-    #~ ## TODO : ADD EMAIL TAG ( TIMESTAMP & ADD SIGNATURE over existing ones)
-
-#~ fi
-
-#~ cp -f "${TIDDLER}" "$HOME/.zen/game/players/${PLAYER}/G1PalPay/"
-
-
-#~ #################################################################
-#~ ### ADDING $YID.TW.json to ASTONAUTENS INDEX.html
-#~ #################################################################
-        #~ echo "=========================="
-        #~ echo "Adding $YID tiddler to TW /ipns/$ASTONAUTENS "
-
-        #~ rm -f ~/.zen/tmp/${IPFSNODEID}/newindex.html
-
-        #~ echo  ">>> Importing $HOME/.zen/game/players/${PLAYER}/G1PalPay/$YID.TW.json"
-
-        #~ tiddlywiki --load ${INDEX} \
-                        #~ --import "$HOME/.zen/game/players/${PLAYER}/G1PalPay/$YID.TW.json" "application/json" \
-                        #~ --output ~/.zen/tmp/${IPFSNODEID} --render "$:/core/save/all" "newindex.html" "text/plain"
-
-#~ # --deletetiddlers '[tag[PalPay]]' ### REFRESH CHANNEL COPY
-
-        #~ if [[ -s ~/.zen/tmp/${IPFSNODEID}/newindex.html ]]; then
-
-            #~ ## COPY JSON TIDDLER TO PLAYER
-            #~ ln -s "$HOME/.zen/game/players/${PLAYER}/G1PalPay/$YID.TW.json" "$HOME/.zen/game/players/${PLAYER}/G1PalPay/$ZFILE.json"
-
-            #~ [[ $(diff ~/.zen/tmp/${IPFSNODEID}/newindex.html ${INDEX} ) ]] && cp ~/.zen/tmp/${IPFSNODEID}/newindex.html ${INDEX} && echo "===> Mise à jour ${INDEX}"
-
-        #~ else
-            #~ echo "Problem with tiddlywiki command. Missing ~/.zen/tmp/${IPFSNODEID}/newindex.html"
-            #~ echo "XXXXXXXXXXXXXXXXXXXXXXX"
-        #~ fi
+### NEXT #####
+### INNER TIDDLERS TREATMENT
+## SEARCH FOR NEW TIDDLERS WITH MULTIPLE EMAILS IN TAG
+## SEND 1 JUNE DIVIDED INTO ALL

 rm -Rf $HOME/.zen/tmp/${MOATS}

--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@ -115,6 +115,9 @@ for PLAYER in ${PLAYERONE[@]}; do
        ${MY_PATH}/VOEUX.refresh.sh "$PLAYER" "$MOATS" ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html
        ##############################################################

+        ## CHECK G1PALPAY TO MAKE
+        ${MY_PATH}/G1PalPay.sh
+
        ##################################
        echo "# TW : GW API + LightBeam Feed + Friends"
        TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)
@ -126,8 +129,8 @@ for PLAYER in ${PLAYERONE[@]}; do

                ###########################
                # Modification Tiddlers de contrôle de GW & API
-            echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'$(myPlayerApiGw)'"}]' > ~/.zen/tmp/${MOATS}/5001.json
-            echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'$myIPFS'"}]' > ~/.zen/tmp/${MOATS}/8080.json
+            #~ echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'$(myPlayerApiGw)'"}]' > ~/.zen/tmp/${MOATS}/5001.json
+            #~ echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'$myIPFS'"}]' > ~/.zen/tmp/${MOATS}/8080.json

            FRIENDSFEEDS=$(cat ~/.zen/tmp/${IPFSNODEID}/rss/${PLAYER}/FRIENDSFEEDS 2>/dev/null)
            echo "FRIENDS FEEDS : "${FRIENDSFEEDS}
@ -138,8 +141,6 @@ for PLAYER in ${PLAYERONE[@]}; do
            tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html \
                            --import ~/.zen/tmp/${MOATS}/lightbeam-name.json "application/json" \
                            --import ~/.zen/tmp/${MOATS}/lightbeam-key.json "application/json" \
-                            --import "$HOME/.zen/tmp/${MOATS}/5001.json" "application/json" \
-                            --import "$HOME/.zen/tmp/${MOATS}/8080.json" "application/json" \
                            --import "$HOME/.zen/tmp/${MOATS}/friends.json" "application/json" \
                            --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER} --render "$:/core/save/all" "newindex.html" "text/plain"

--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@ -26,18 +26,19 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
    ## EXTRACT DATA FROM TW
    mkdir -p ~/.zen/tmp/${MOATS}
    rm -f ~/.zen/tmp/${MOATS}/Astroport.json
-    tiddlywiki --load ~/.zen/tmp/${MOATS}/TW/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
+    tiddlywiki --load $INDEX --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
    ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
    ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)
    rm -Rf ~/.zen/tmp/${MOATS}
+    # cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r

 else

-    echo "NO PLAYER WITH ${EMAIL} FOUND"
+    echo "ASTROTW="" # ${EMAIL} NOT FOUND"
+    exit 0

 fi


-echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
-
+echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$ASTROG1 ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
 exit 0