diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index f3cba666..e6dbc967 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -87,7 +87,7 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/ GDESCR=$(cat ~/.zen/game/players/${PLAYER}/ipfs/gchange.json | jq -r '.description' 2>/dev/null) [[ ! $GDESCR || $GDESCR == "null" ]] && GDESCR="Astronaute GChange" CDESCR=$(cat ~/.zen/game/players/${PLAYER}/ipfs/cesium.json | jq -r '.description' 2>/dev/null) - [[ ! $CDESCR || $CDESCR == "null" ]] && CDESCR="Portefeuille G1PalPay" + [[ ! $CDESCR || $CDESCR == "null" ]] && CDESCR="Portefeuille G1PalPer" GVILLE=$(cat ~/.zen/game/players/${PLAYER}/ipfs/gchange.json | jq -r '.city' 2>/dev/null) [[ ! $GVILLE || $GVILLE == "null" ]] && GVILLE="" @@ -211,7 +211,7 @@ do ## COUNT NUMBER OF STAR COLLECT TRIES try=$(cat ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}.try 2>/dev/null) || try=0 - [[ $try > 2 && $try < 30 ]] && echo "${liking_me} TOO MANY TRY" && continue + [[ $try > 2 && ( $try < 30 || $try > 31 ) ]] && echo "${liking_me} TOO MANY TRY ( $try )" && continue #### TODO RECUP ANNONCES Gchange ADD TO TW ## https://www.gchange.fr/#/app/records/wallet?q=2geH4d2sndR47XWtfDWsfLLDVyNNnRsnUD3b1sk9zYc4&old @@ -264,7 +264,7 @@ do echo "AUCUN TW ACTIF. PREVENONS LE" $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey send -d "${liking_me}" -t "HEY BRO !" -m "G1 ♥BOX : https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" - ## I TRY + ## +1 TRY try=$((try+1)) && echo $try > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}.try else diff --git a/tools/download_from_kodi_log.sh b/tools/download_from_kodi_log.sh index f0c7ac17..91eedfc7 100755 --- a/tools/download_from_kodi_log.sh +++ b/tools/download_from_kodi_log.sh @@ -74,16 +74,16 @@ do echo "DETECTED MOVIE : $uqname (https://uqload.com/$uqlink)" uqload_downloader https://uqload.com/$uqlink "$HOME/Astroport/film/${MOATS}/$uqname.mp4" echo "COPY ~/Astroport/film/${MOATS}/$uqname.mp4 DONE" - ## RUNNING ON ASTROPORT STATION? - ( - [[ $(which ipfs) && $IPFSNODEID ]] \ - && espeak "Download $uqname done. Adding file to I P F S" \ - && ~/.zen/Astroport.ONE/tools/new_file_in_astroport.sh "$HOME/Astroport/film/${MOATS}/" "$uqname.mp4" + #~ ## RUNNING ON ASTROPORT STATION? + #~ ( + #~ [[ $(which ipfs) && $IPFSNODEID ]] \ + #~ && espeak "Download $uqname done. Adding file to I P F S" \ + #~ && ~/.zen/Astroport.ONE/tools/new_file_in_astroport.sh "$HOME/Astroport/film/${MOATS}/" "$uqname.mp4" #~ && CID=$(ipfs add -q ~/Astroport/$uqname.mp4 | tail -n 1) \ #~ && mkdir -p ~/.zen/tmp/$IPFSNODEID/$PLAYER/Astroport/ \ #~ && echo "/ipfs/$CID" > ~/.zen/tmp/$IPFSNODEID/Astroport/$uqname.mp4.ipfs \ #~ && espeak "Added to Station 12345 mapping" - ) & + #~ ) & fi done echo diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 3c98fab4..0aa6e631 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -15,7 +15,17 @@ PLAYERONE=($(ls -t ~/.zen/game/players/ | grep -Ev "localhost" 2>/dev/null)) for PLAYER in ${PLAYERONE[@]}; do pub=$(cat ~/.zen/game/players/$PLAYER/.g1pub) curl -so ~/.zen/tmp/carousel/${pub}.png \ - "https://g1sms.fr/g1barre/image.php?pubkey=${pub}&target=20000&title=${PLAYER}&node=g1.duniter.org&start_date=2020-01-01&display_pubkey=true&display_qrcode=true" + "https://g1sms.fr/g1barre/image.php?pubkey=${pub}&target=20000&title=${PLAYER}&node=g1.asycn.io&start_date=2020-01-01&display_pubkey=true&display_qrcode=true" + + # Get PLAYER wallet amount :: ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS + COINS=$(${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance | cut -d '.' -f 1) + [[ $COINS == "" || $COINS == "null" ]] && echo "${PLAYER} G1WALLET ERROR" && continue + echo "+++ ${PLAYER} have $COINS Ğ1 Coins +++" + OLDCOINS=$(cat ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS 2>/dev/null) + [[ $OLDCOINS != $COINS && ! $COINS -lt 0 ]] \ + && ( cp ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS.$MOATS 2>/dev/null; \ + echo $COINS > ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/COINS ) + done img_dir="$HOME/.zen/tmp/carousel" fi