diff --git a/12345.sh b/12345.sh index 0ac46c5c..fc4ac717 100755 --- a/12345.sh +++ b/12345.sh @@ -125,14 +125,14 @@ while true; do HOST=$(echo "$HOSTP" | cut -d ':' -f 1) ## TODO APPLY GENERAL isLAN or zen !isLAN CALACULA>TONS - [[ ! $isLAN || $USER == "zen" ]] && myHOST="$HOST" && myHOSTPort="ipfs.$HOST" && myHTTP="https://" && myASTROPORT="https://$HOST" ## WAN STATION + [[ ! $isLAN || $USER == "zen" ]] && myHOST="$HOSTNAME" && myHOSTPort="ipfs.$HOSTNAME" && myHTTP="https://" && myASTROPORT="https://$HOSTNAME" ## WAN STATION ############################################################################ [[ $URL == "/test" || $URL == "" ]] && continue echo "************************************************************************* " - echo "ASTROPORT 1234 UP & RUNNING.......................... ${myHTTP}$HOST:1234 PORT" - echo "${MOATS} NEXT COMMAND DELIVERY PAGE ${myHTTP}$HOST:${PORT}" + echo "ASTROPORT 1234 UP & RUNNING.......................... ${myHTTP}$HOSTNAME:1234 PORT" + echo "${MOATS} NEXT COMMAND DELIVERY PAGE ${myHTTP}$HOSTNAME:${PORT}" [[ $XDG_SESSION_TYPE == 'x11' ]] && espeak "Ding" >/dev/null 1>&2 diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index 7d562532..0f837c22 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -115,8 +115,12 @@ do -k ~/.zen/game/players/${PLAYER}/secret.dunikey \ -n "https://data.gchange.fr" \ stars -p ${liking_me} > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json - ## ZOMBIE PROTECTION - [[ "$?" == "0" && ! -s ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json ]] && rm -Rf ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me} && echo "${liking_me} is a ZOMBIE..." && continue + + ## ZOMBIE PROTECTION - TODO PURGE EVERY 60 DAYS + find ~/.zen/game/players/${PLAYER}/FRIENDS/*.try -mtime +60 -type f -exec rm -f '{}' \; + + try=$(cat ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}.try 2>/dev/null) + [[ $try > 3 ]] && echo "${liking_me} TOO MANY TRY" && continue #### RECUP ANNONCES Gchange ## https://www.gchange.fr/#/app/records/wallet?q=2geH4d2sndR47XWtfDWsfLLDVyNNnRsnUD3b1sk9zYc4&old @@ -164,6 +168,8 @@ do echo "AUCUN TW ACTIF. PREVENONS LE" $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${liking_me}" -t "HEY BRO !" -m "G1 TW BunkerBOX >>> (⌐■_■) <<< https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS >>> (ᵔ◡◡ᵔ) <<< " + try=$((try+1)) && echo $try > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}.try + else echo "COOL MON AMI EST SUR IPFS" @@ -224,6 +230,7 @@ do echo "BRO?" $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${G1PUB}" -t "Bro ?" -m "https://www.gchange.fr/#/app/user/${liking_me}/" + try=$((try+1)) && echo $try > ~/.zen/game/players/${PLAYER}/FRIENDS/${liking_me}.try fi