From 0756e6c5eb9fe93f30ded87fefde86d021c86562 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 26 Feb 2023 00:41:38 +0100 Subject: [PATCH] =?UTF-8?q?Please=20take=20time=20to=20read=20why=20=C5=8A?= =?UTF-8?q?1=20Network=20(are/is)=20the=20best=20solution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ASTROBOT/G1PalPay.sh | 10 ++++++++-- README.en.md | 2 +- tools/Connect_PLAYER_To_Gchange.sh | 8 ++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh index 5d05d5a1..302230fe 100755 --- a/ASTROBOT/G1PalPay.sh +++ b/ASTROBOT/G1PalPay.sh @@ -171,8 +171,11 @@ tiddlywiki --load $INDEX \ ## FILTER MY OWN EMAIL cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/today.${PLAYER}.tiddlers.json | jq -rc # LOG -cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/today.${PLAYER}.tiddlers.json | sed "s~${PLAYER}~ ~g" | jq -rc '.[] | select(.tags | contains("@"))' > ~/.zen/tmp/${MOATS}/@tags.json 2>/dev/null -[[ $? != 0 ]] && echo "NO EXTRA TIDDLERS TODAY" && exit 0 + +cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/today.${PLAYER}.tiddlers.json \ + | sed "s~${PLAYER}~ ~g" | jq -rc '.[] | select(.tags | contains("@"))' > ~/.zen/tmp/${MOATS}/@tags.json 2>/dev/null ## INLINE JSON + +[[ $? != 0 ]] && echo "NO EXTRA @tags.json TIDDLERS TODAY" && exit 0 echo "******************TIDDLERS with EMAIL in TAGS treatment" #~ cat ~/.zen/game/players/${PLAYER}/G1CopierYoutube/${G1PUB}/${PLAYER}.tiddlers.json | sed "s~${PLAYER}~ ~g" | jq -rc '.[] | select(.tags | contains("@"))' > ~/.zen/tmp/${MOATS}/@tags.json @@ -180,6 +183,8 @@ echo "******************TIDDLERS with EMAIL in TAGS treatment" ## EXTRACT NOT MY EMAIL while read LINE; do + echo "---------------------------------- PalPé mec" + echo "$LINE" echo "---------------------------------- PalPAY for Tiddler" TCREATED=$(echo $LINE | jq -r .created) TTITLE=$(echo $LINE | jq -r .title) @@ -197,6 +202,7 @@ while read LINE; do echo $MSG ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" + #### SEARCH FOR PALPAY ACOUNTS : TODO BETTER §§§ $($MY_PATH/../tools/search_for_this_email_in_players.sh ${ZMAIL}) ## export ASTROTW and more if [[ ${ASTROG1} && ${ASTROG1} != ${G1PUB} ]]; then diff --git a/README.en.md b/README.en.md index 7273e6c2..ebe46a6d 100644 --- a/README.en.md +++ b/README.en.md @@ -70,4 +70,4 @@ From this association has just been born "THE ♥BOX", a software and network se To try online with an email and a link to keep... -https://astroprot.copylaradio.com +https://astroport.copylaradio.com diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index 11cd6213..e47bb415 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -39,6 +39,8 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/ # $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey get > ~/.zen/game/players/${PLAYER}/ipfs/gchange.json ## GET AVATAR PICTURE cat ~/.zen/game/players/${PLAYER}/ipfs/gchange.json | jq -r '._source.avatar._content' | base64 -d > "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.gchange_avatar.png" 2>/dev/null + # CLEANING BAD FILE TYPE + [[ ! $(file -b "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.gchange_avatar.png" | grep PNG) ]] && rm "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.gchange_avatar.png" ## GET CESIUM PUBKEY & C+ PROFILE CPUB=$(cat ~/.zen/game/players/${PLAYER}/ipfs/gchange.json | jq -r '._source.pubkey' 2>/dev/null) @@ -51,6 +53,10 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/ [[ ! $? == 0 ]] && echo "xxxxx ERROR PROBLEM WITH CESIUM+ NODE ${myCESIUM} xxxxx" cat ~/.zen/game/players/${PLAYER}/ipfs/cesium.json | jq -r '._source.avatar._content' | base64 -d > "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" 2>/dev/null + # CLEANING NOT PNG FILE + [[ ! $(file -b "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" | grep PNG) ]] && rm "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" + + CPSEUDO=$(cat ~/.zen/game/players/${PLAYER}/ipfs/cesium.json | jq -r '.title' 2>/dev/null) [[ $CPSEUDO ]] \ @@ -71,6 +77,8 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/ [[ ! $? == 0 ]] && echo "xxxxx ERROR PROBLEM WITH CESIUM+ NODE ${myCESIUM} xxxxx" cat ~/.zen/game/players/${PLAYER}/ipfs/cesium.json | jq -r '._source.avatar._content' | base64 -d > "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" 2>/dev/null + [[ ! $(file -b "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" | grep PNG) ]] && rm "$HOME/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.cesium_avatar.png" + CPSEUDO=$(cat ~/.zen/game/players/${PLAYER}/ipfs/cesium.json | jq -r '.title' 2>/dev/null) [[ $CPSEUDO ]] \