diff --git a/12345.sh b/12345.sh index ce5e7b9f..c2163f9d 100755 --- a/12345.sh +++ b/12345.sh @@ -39,7 +39,7 @@ function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } while true; do MOATS=$(date -u +"%Y%m%d%H%M%S%4N") ## CHANGE NEXT PORT (HERE YOU CREATE A SOCKET QUEUE) - [ $PORT -lt 12345 ] && PORT=$((PORT+${RANDOM:0:2})) || PORT=$((PORT-${RANDOM:0:2})) + [ $PORT -lt 12345 ] && PORT=$((PORT+${RANDOM:0:3})) || PORT=$((PORT-${RANDOM:0:3})) ## RANDOM PORT SWAPPINESS SALT=""; PEPPER=""; TYPE="" @@ -228,8 +228,8 @@ cat ~/.zen/tmp/123/${MOATS}.messaging.json >> ~/.zen/tmp/123/${MOATS}.index.redi if [[ -s ~/.zen/tmp/123/${MOATS}.astroindex.html ]]; then tiddlywiki --load ~/.zen/tmp/123/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' OLDIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret) - [[ ! $OLDIP ]] && (echo "ERROR - $OLDIP WRONG TW - CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue - # FIRST TIME WHAT TW USING GATEWAY + [[ ! $OLDIP ]] && (echo "501 ERROR - SORRY - YOUR TW IS OUT OF SWARM#0 - CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue + # LOCKED TW BECOMING NEW GATEWAY if [[ $OLDIP == "_SECRET_" ]]; then echo "_SECRET_ TW PUSHING TW" ## SEND FULL TW sed -i "s~_SECRET_~${myIP}~g" ~/.zen/tmp/123/${MOATS}.astroindex.html @@ -241,7 +241,7 @@ Content-Type: text/html; charset=UTF-8 cat ~/.zen/tmp/123/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & continue fi - # REDIRECTING TO ACTUAL GATEWAY + # REDIRECTING TO TODAY GATEWAY [[ $OLDIP != $myIP ]] && TWIP=$OLDIP echo "*********** OFFICIAL LOGIN GOES TO $TWIP" else diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh index 2827884b..f08ca1fa 100755 --- a/ASTROBOT/VOEUX.refresh.sh +++ b/ASTROBOT/VOEUX.refresh.sh @@ -87,7 +87,11 @@ do [[ $(cat ~/.zen/tmp/${IPFSNODEID}/${ASTRONAUTENS}/${WISHNAME}/g1wishtiddlers.json) == "[]" ]] && echo "EMPTY ${WISHNAME} - CONTINUE -" && continue echo "## WISHES FOUND ;) MIAM " + ###################################### ## TODO ADD EXTRA TAG ? + # Remove G1${WISHNAME} with WISHNAME Initial TIDDLER + # Reduce importation with extra filters days:created[-1] + # Apply Extra filters... TODO LEARN https://talk.tiddlywiki.org/t/how-to-filter-and-delete-multiple-tiddlers/4950/2?u=papiche echo ">>> Importing ~/.zen/tmp/${IPFSNODEID}/${ASTRONAUTENS}/${WISHNAME}/g1wishtiddlers.json" tiddlywiki --load $INDEX \ diff --git a/templates/index.http b/templates/index.http index aa6817e8..c32abe91 100644 --- a/templates/index.http +++ b/templates/index.http @@ -17,18 +17,18 @@ Content-Type: text/html; charset=UTF-8

Astroport Ŋ1 Swarm#0

---- Devenez Astronaute ---
+--- Astronaute ---

- Recevez vos clefs par Email
+ Saisir vos clefs pour recevoir votre Visa Libre par email
Phrase Une ("identifiant") :
Phrase Deux ("mot de passe") :
- acceptation des G1Conditions
+ accepter leur délégation et synchonisation Ŋ1 à 20h12
Email :

- +
-

ALLER AU PROCHAIN PORT

+

[VISITER LE PORT SUIVANT]