\
if the problem persists, please contact support@qo-op.com" >> ~/.zen/tmp/${MOATS}/disco
@@ -240,7 +251,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
else
- echo "
${WHAT} ${VAL} ${CURCOINS} GLOBAL ERROR
" >> ~/.zen/tmp/${MOATS}/disco
+ echo "
${WHAT} ${G1DEST} ${CURCOINS} GLOBAL ERROR
" >> ~/.zen/tmp/${MOATS}/disco
fi
@@ -286,15 +297,15 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
if [[ ${APPNAME} == "friend" ]]; then
- # CHECK IF ${VAL} HAS A PROFILE
+ # CHECK IF ${G1DEST} HAS A PROFILE
${MY_PATH}/../tools/timeout.sh -t 5 \
- curl -s ${myDATA}/user/profile/${VAL} > ~/.zen/tmp/${MOATS}/gchange.json
+ curl -s ${myDATA}/user/profile/${G1DEST} > ~/.zen/tmp/${MOATS}/gchange.json
## Send ॐ★ॐ
[[ -s ~/.zen/tmp/${MOATS}/gchange.json ]] \
- && ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key stars -p ${VAL} -n ${WHAT} >> ~/.zen/tmp/${MOATS}/disco \
+ && ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key stars -p ${G1DEST} -n ${WHAT} >> ~/.zen/tmp/${MOATS}/disco \
&& rm ~/.zen/tmp/${MOATS}/gchange.json \
- || echo "/${VAL} profile is not existing yet..." >> ~/.zen/tmp/${MOATS}/disco
+ || echo "/${G1DEST} profile is not existing yet..." >> ~/.zen/tmp/${MOATS}/disco
fi
diff --git a/API/UPLANET.sh b/API/UPLANET.sh
index d6bcbb55..79162a09 100755
--- a/API/UPLANET.sh
+++ b/API/UPLANET.sh
@@ -6,7 +6,7 @@
################################################################################
## API: UPLANET
## Dedicated to OSM2IPFS & UPlanet Client App
-# ?uplanet=EMAIL&salt=LAT&pepper=LON&g1pub=PASS
+# ?uplanet=EMAIL&zlat=LAT&zlon=LON&g1pub=PASS
## https://git.p2p.legal/qo-op/OSM2IPFS
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
@@ -50,9 +50,9 @@ mkdir -p ~/.zen/tmp/${MOATS}/
## GET & VERIFY PARAM
PLAYER=${THAT}
-[[ ${PLAYER} == "salt" ]] && PLAYER="@"
+[[ ${PLAYER} == "zlat" ]] && PLAYER="@"
-[[ ${AND} != "salt" ]] \
+[[ ${AND} != "zlat" ]] \
&& (echo "$HTTPCORS ERROR - BAD PARAMS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
SALT=${THIS}
@@ -76,7 +76,7 @@ fi
PEPPER=${WHAT}
-[[ ${APPNAME} != "pepper" ]] \
+[[ ${APPNAME} != "zlon" ]] \
&& (echo "$HTTPCORS ERROR - BAD PARAMS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
[[ ${PEPPER} == "0" ]] && PEPPER="0.00"
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index fa37563b..0895f75c 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -130,6 +130,7 @@ for PLAYER in ${PLAYERONE[@]}; do
tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
--output ~/.zen/tmp/${MOATS} \
--render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport' ## Astroport Tiddler
+ BIRTHDATE=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].birthdate)
ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport) ## Raccorded G1Station IPNS address
CURCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain | rev | cut -f 1 -d '/' | rev) # Remove "/ipfs/" part
[[ ${CURCHAIN} == "" || ${CURCHAIN} == "null" ]] \
@@ -163,7 +164,7 @@ for PLAYER in ${PLAYERONE[@]}; do
if [[ ${IPNSTAIL} != ${IPFSNODEID} || ${IPNSTAIL} == "_ASTROPORT_" ]]; then
echo "> I AM ${IPFSNODEID} : PLAYER MOVED TO ${IPNSTAIL} : EJECTION "
echo "UNPLUG PLAYER"
- ${MY_PATH}/../tools/PLAYER.unplug.sh "${HOME}/.zen/game/players/${PLAYER}/ipfs/moa/index.html" "${PLAYER}"
+ ${MY_PATH}/../tools/PLAYER.unplug.sh "${HOME}/.zen/game/players/${PLAYER}/ipfs/moa/index.html" "${PLAYER}" "FREE"
echo ">>>> ASTRONAUT ${PLAYER} TW CAPSULE EJECTION TERMINATED"
continue
fi
@@ -285,7 +286,21 @@ for PLAYER in ${PLAYERONE[@]}; do
--output ~/.zen/game/players/${PLAYER}/ipfs --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]!is[system]!tag[G1Voeu]]'
[[ ! -s ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json ]] && echo "NO ${PLAYER} RSS - BAD ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json -"
- ## CHECK FOR EMPTY RSS + 30 DAYS BIRTHDATE
+ ##################################
+ #### PLAYER ACCOUNT CLEANING #########
+ ## CHECK FOR EMPTY RSS + 30 DAYS BIRTHDATE + null G1
+ [[ $(cat ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json) == "[]" ]] \
+ && echo "RSS IS EMPTY" \
+ && SBIRTH=$(${MY_PATH}/../tools/MOATS2seconds.sh ${BIRTHDATE}) \
+ && SNOW=$(${MY_PATH}/../tools/MOATS2seconds.sh ${MOATS}) \
+ && [[ $(( SNOW - SBIRTH )) >= $(( 27 * 24 * 60 * 60 )) ]] \
+ && echo "YOUR ACOUNT WILL BE UNPLUGGED IN 3.2.1 DAYS" > ~/.zen/tmp/alert \
+ && ${MY_PATH}/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/alert \
+ && [[ $(( SNOW - SBIRTH )) > $(( 30 * 24 * 60 * 60 )) ]] \
+ && ${MY_PATH}/../tools/PLAYER.unplug.sh ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ${PLAYER} \
+ && echo ">>>> PLAYER UNPLUGGED >>>>> BYE BYE ${PLAYER}" \
+ && continue
+ #################################### UNPLUG ACCOUNT
IRSS=$(ipfs add -q ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json | tail -n 1) \
&& ipfs name publish --key="${PLAYER}_feed" /ipfs/${IRSS}
diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh
index 24b2064b..87b8fcaf 100755
--- a/RUNTIME/VOEUX.refresh.sh
+++ b/RUNTIME/VOEUX.refresh.sh
@@ -260,7 +260,7 @@ do
#~ echo "************************************************************"
#~ echo "Hop, 0.1 JUNE pour le Voeu $WISHNAME"
- #~ echo $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 0.1 -p $VOEUKEY -c \'"ASTRO:$${IPNS_VOEUNS} G1Voeu $WISHNAME"\' -m
+ #~ echo $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 0.1 -p $VOEUKEY -c \'"ASTRO:${IPNS_VOEUNS} G1Voeu $WISHNAME"\' -m
#~ echo "************************************************************"
#~ echo "************************************************************"
diff --git a/WWW/favicon.heart.ico b/WWW/favicon.heart.ico
new file mode 100644
index 00000000..7427a537
Binary files /dev/null and b/WWW/favicon.heart.ico differ
diff --git a/WWW/favicon.zen.body.mind.spirit.ico b/WWW/favicon.zen.body.mind.spirit.ico
new file mode 100644
index 00000000..32110228
Binary files /dev/null and b/WWW/favicon.zen.body.mind.spirit.ico differ
diff --git a/WWW/favicon.zen.kanji.ico b/WWW/favicon.zen.kanji.ico
new file mode 100644
index 00000000..f9ec71b2
Binary files /dev/null and b/WWW/favicon.zen.kanji.ico differ
diff --git a/WWW/favicon.zen.longevity.ico b/WWW/favicon.zen.longevity.ico
new file mode 100644
index 00000000..1dc7f68c
Binary files /dev/null and b/WWW/favicon.zen.longevity.ico differ
diff --git a/WWW/favicon.zen.triangle.ico b/WWW/favicon.zen.triangle.ico
new file mode 100644
index 00000000..e0625216
Binary files /dev/null and b/WWW/favicon.zen.triangle.ico differ
diff --git a/WWW/favicon_yy.ico b/WWW/favicon_yy.ico
new file mode 100644
index 00000000..de50231b
Binary files /dev/null and b/WWW/favicon_yy.ico differ
diff --git a/_12345.sh b/_12345.sh
index 7b7c7404..a1a2104c 100755
--- a/_12345.sh
+++ b/_12345.sh
@@ -51,6 +51,7 @@ echo "$(date -u)" > ~/.zen/tmp/${IPFSNODEID}/_MySwarm.staom
echo "## MAKE /proc/cpuinfo IPFSNODEID DERIVATED KEY ##"
SECRET1=$(cat /proc/cpuinfo | grep -Ev MHz | sha512sum | cut -d ' ' -f 1)
SECRET2=${IPFSNODEID}
+ echo "SALT=$SECRET1 && PEPPER=$SECRET2" > ~/.zen/game/myswarm_secret.june
${MY_PATH}/tools/keygen -t ipfs -o ~/.zen/game/myswarm_secret.ipfskey "$SECRET1" "$SECRET2"
${MY_PATH}/tools/keygen -t duniter -o ~/.zen/game/myswarm_secret.dunikey "$SECRET1" "$SECRET2"
ipfs key import "MySwarm_${IPFSNODEID}" -f pem-pkcs8-cleartext ~/.zen/game/myswarm_secret.ipfskey
@@ -98,7 +99,7 @@ while true; do
done
############# GET BOOSTRAP SWARM DATA
- for bootnode in $(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$') # remove comments and empty lines
+ for bootnode in $(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | grep -v '^[[:space:]]*$') # remove comments and empty lines
do
echo "############# RUN LOOP ######### $(date)"
diff --git a/templates/register.html b/templates/register.html
index 75fb1415..93df91fc 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -136,10 +136,10 @@ a:active{
[]-[] registration