STI/Astroport.ONE
STI
/
Astroport.ONE
4
1
Fork 2
Code Issues 11 Pull Requests Projects Releases 1 Wiki Activity

Filter TW PLAYER already existing

This commit is contained in:
fred 2023-09-06 14:40:57 +02:00
parent d883a207ad
commit a1b82be754
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
API/UPLANET.sh
View File

@ -129,7 +129,6 @@ else
fi
### CREATE G1VISA & G1Card
echo "${MY_PATH}/../tools/VISA.print.sh" "${EMAIL}" "'"$LAT"'" "'"$LON"'" "'"$PASS"'" "'"$PASS"'"
${MY_PATH}/../tools/VISA.print.sh "${EMAIL}" "$LAT" "$LON" "$PASS" "${PASS}"##
@ -200,22 +199,26 @@ ls ~/.zen/tmp/${MOATS}/
### CREATE A G1VISA FOR PLAYER (NO TW EXISTS YET for EMAIL)
if [[ ! -f ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ]]; then
## Create a redirection to PLAYER (EMAIL/PASS) TW
## CHECK IF TW EXISTS FOR THIS EMAIL ALREADY
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more
echo "export ASTROTW=${ASTRONAUTENS} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
[[ ${ASTROTW} ]] && (echo "$HTTPCORS INFO - (╥☁╥ ) - ${PLAYER} TW ALREADY EXISTING /ipns/${ASTROTW}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
## Create a redirection to PLAYER (EMAIL/PASS) TW
mkdir -p ~/.zen/tmp/${MOATS}/TW/${EMAIL}
## CREATE TW LINK /ipns/TWADD
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}.priv "$EMAIL" "$PASS"
TWADD=$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}.priv)
ipfs key rm ${MOATS} && rm ~/.zen/tmp/${MOATS}.priv
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${TWADD}'\" />" > ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html
if [[ ${PASS} == ${VAL} ]]; then
## CREATE OR TRANSFER TW ON CURRENT ASTROPORT
(
NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
## CREATE OR TRANSFER TW ON CURRENT ASTROPORT
(
NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
${MY_PATH}/../tools/VISA.new.sh "${EMAIL}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
) &
fi
${MY_PATH}/../tools/VISA.new.sh "${EMAIL}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
) &
fi
## MAKE A MESSAGE
@ -272,7 +275,7 @@ echo "<html>
## WHO WILL BE THE G1 WINNER OF THE AREA
# SHOW G1 STATION WALLETS
rm ~/.zen/tmp/${MOATS}/message.html ## RENIT OLD FORMAT TO REMOVE
rm ~/.zen/tmp/${MOATS}/message.html 2>/dev/null ## RENIT OLD FORMAT TO REMOVE
# $(find ~/.zen/tmp/${MOATS}/ -type d -regex '.*[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}.*')
## TAKING CARE OF THE CHAIN

5
RUNTIME/PLAYER.refresh.sh
View File

@ -219,6 +219,7 @@ for PLAYER in ${PLAYERONE[@]}; do
[[ -s ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain ]] \
&& ZCHAIN=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain) \
&& echo "# CHAIN : ${CURCHAIN} -> ${ZCHAIN}" \
&& [[ ${CURCHAIN} != "" && ${ZCHAIN} != "" ]] \
&& sed -i "s~${CURCHAIN}~${ZCHAIN}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
fi
##############################################################
@ -236,11 +237,11 @@ for PLAYER in ${PLAYERONE[@]}; do
echo ${MOATS} > ~/.zen/game/players/${PLAYER}/ipfs/moa/.moats
echo "================================================"
echo " MAJ TW ${PLAYER} : = /ipfs/${TW}"
echo " NEW TW ${PLAYER} : = ${myIPFS}/ipfs/${TW}"
echo " $myIPFSGW/ipns/${ASTRONAUTENS}"
echo "================================================"
echo "(☉_☉ ) (☉_☉ ) (☉_☉ )"
echo "(☉_☉ ) (☉_☉ ) (☉_☉ ) RSS"
## CREATING 30 DAYS RSS STREAM
tiddlywiki --load --load ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html \
--output ~/.zen/game/players/${PLAYER}/ipfs --render '.' "${PLAYER}.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-30]]'

6
tools/search_for_this_email_in_players.sh
View File

@ -21,8 +21,8 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
INDEX=$(ls $HOME/.zen/tmp/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null)
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/$IPFSNODEID/${EMAIL}/index.html 2>/dev/null)
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/${EMAIL}/index.html 2>/dev/null)
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null)
[[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null)
[[ ! $INDEX ]] && exit 1
## TODO ? SEARCH WITH DNSLINK
@ -30,7 +30,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
mkdir -p ~/.zen/tmp/${MOATS}
rm -f ~/.zen/tmp/${MOATS}/Astroport.json
tiddlywiki --load $INDEX --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} --render '.' 'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)