forked from STI/Astroport.ONE
Astronaut MadeInZion map coming
This commit is contained in:
parent
431b49fa26
commit
abab3a9012
|
@ -16,12 +16,14 @@ ASTRONAUTENS=$(ipfs key list -l | grep -w "$PLAYER" | cut -d ' ' -f 1)
|
||||||
echo "CREATING $PLAYER GCHANGE+ PROFILE"
|
echo "CREATING $PLAYER GCHANGE+ PROFILE"
|
||||||
########################################################################
|
########################################################################
|
||||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "https://astroport.com/ipns/$ASTRONAUTENS" #GCHANGE+
|
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "https://astroport.com/ipns/$ASTRONAUTENS" #GCHANGE+
|
||||||
[[ ! $? == 0 ]] && echo "GCHANGE PROFILE CREATION FAILED" && exit 1
|
[[ ! $? == 0 ]] && echo "GCHANGE PROFILE CREATION FAILED" && echo "Action Manuelle " $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://data.gchange.fr" set --name "Astronaute $PSEUDO" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "https://astroport.com/ipns/$ASTRONAUTENS" #GCHANGE+
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
#echo "CREATING $PLAYER CESIUM+ PROFILE"
|
#echo "CREATING $PLAYER CESIUM+ PROFILE"
|
||||||
########################################################################
|
########################################################################
|
||||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://g1.data.presles.fr" set --name "Astronaute $PLAYER" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://127.0.0.1:8080/ipns/$ASTRONAUTENS" #CESIUM+
|
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://g1.data.presles.fr" set --name "Astronaute $PLAYER" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://127.0.0.1:8080/ipns/$ASTRONAUTENS" #CESIUM+
|
||||||
#[[ ! $? == 0 ]] && echo "CESIUM PROFILE CREATION FAILED" && exit 1
|
[[ ! $? == 0 ]] && echo "CESIUM PROFILE CREATION FAILED" && echo "Action Manuelle " $ $MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "https://g1.data.presles.fr" set --name "Astronaute $PLAYER" --avatar "/home/$USER/.zen/Astroport.ONE/images/logo.png" --site "http://127.0.0.1:8080/ipns/$ASTRONAUTENS" #CESIUM+
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
|
@ -0,0 +1,124 @@
|
||||||
|
#!/bin/bash
|
||||||
|
################################################################################
|
||||||
|
# Author: Fred (support@qo-op.com)
|
||||||
|
# Version: 0.1
|
||||||
|
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||||
|
################################################################################
|
||||||
|
# Extract last ads
|
||||||
|
# Thank you @kimamila for cesium & gchange
|
||||||
|
# ES backend http://www.elasticsearchtutorial.com/spatial-search-tutorial.html
|
||||||
|
|
||||||
|
echo "REWRITING NEEDED"
|
||||||
|
exit 1
|
||||||
|
|
||||||
|
MY_PATH="`dirname \"$0\"`" # relative
|
||||||
|
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||||
|
|
||||||
|
# Get Player Name
|
||||||
|
PLAYER="$1"
|
||||||
|
|
||||||
|
mkdir -p ~/.zen/tmp/gchange
|
||||||
|
|
||||||
|
[[ ! -f ~/.zen/game/players/$PLAYER/secret.dunikey ]] && echo "Astronaute inconnu. Connectez-vous"
|
||||||
|
g1pub=$(cat ~/.zen/game/players/$PLAYER/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
||||||
|
|
||||||
|
CESIUM="https://g1.data.le-sou.org"
|
||||||
|
GCHANGE="https://data.gchange.fr" # /user/profile/2L8vaYixCf97DMT8SistvQFeBj7vb6RQL7tvwyiv1XVH?&_source_exclude=avatar._content
|
||||||
|
|
||||||
|
#curl -sk ${CESIUM}/user/profile/${g1pub} -o ~/.zen/cache/cesium_profile.json
|
||||||
|
LON=$(cat ~/.zen/cache/cesium_profile.json | jq '._source.geoPoint.lon')
|
||||||
|
LAT=$(cat ~/.zen/cache/cesium_profile.json | jq '._source.geoPoint.lat')
|
||||||
|
|
||||||
|
curl -sk ${GCHANGE}/user/profile/${g1pub} -o ~/.zen/cache/GCHANGE_profile.json
|
||||||
|
LON=$(cat ~/.zen/cache/GCHANGE_profile.json | jq '._source.geoPoint.lon')
|
||||||
|
LAT=$(cat ~/.zen/cache/GCHANGE_profile.json | jq '._source.geoPoint.lat')
|
||||||
|
|
||||||
|
RAD="$1"
|
||||||
|
[[ ! $RAD ]] && RAD="50km"
|
||||||
|
|
||||||
|
if [[ "$LON" != "null" ]]; then
|
||||||
|
curl -sk -XPOST 'https://data.gchange.fr/market/record/_search?pretty&_source=title' -d '
|
||||||
|
{
|
||||||
|
"size": 200,
|
||||||
|
"query": {
|
||||||
|
"bool": {
|
||||||
|
"filter": [{
|
||||||
|
"geo_distance": {
|
||||||
|
"distance": "'$RAD'",
|
||||||
|
"geoPoint": {
|
||||||
|
"lat": '$LAT',
|
||||||
|
"lon": '$LON'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}' > /tmp/gchange.json || exit 1
|
||||||
|
else
|
||||||
|
echo "Aucune coordonnées geoPoint pour $g1pub"
|
||||||
|
sbotc publish '{"type":"post","text":"Ajouter sa géolocalisation dans Cesium+ permet de publier les annonces autour de chez soi..."}'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
TIMEBEFORE=$(date -u --date="-$DELAY" +"%s")
|
||||||
|
TIMESTAMP=$(date -u +"%s")
|
||||||
|
TOTAL=$(cat /tmp/gchange.json | jq .hits.total)
|
||||||
|
echo 'tail -f ~/.zen/cache/gchange.txt'
|
||||||
|
echo 'Annonces_Gchange' > ~/.zen/cache/gchange.txt
|
||||||
|
echo "Portefeuille_[June_:heart:](https://demo.cesium.app/#/app/wot/$g1pub/)" >> ~/.zen/cache/gchange.txt
|
||||||
|
echo "Carte_[$RAD](https://www.openstreetmap.org/#map=10/$LAT/$LON) " >> ~/.zen/cache/gchange.txt
|
||||||
|
chunk=0
|
||||||
|
fullcount=0
|
||||||
|
|
||||||
|
DUNITERNODE=$($MY_PATH/tools/duniter_getnode.sh)
|
||||||
|
DUNITERURL="https://$DUNITERNODE"
|
||||||
|
LASTDU=$(curl -s ${DUNITERURL}/blockchain/with/ud | jq '.result.blocks[]' | tail -n 1);
|
||||||
|
[[ $LASTDU != "" ]] && LASTDU=$(curl -s ${DUNITERURL}/blockchain/block/${LASTDU} | jq '.dividend')
|
||||||
|
echo "DU = $LASTDU G1"
|
||||||
|
|
||||||
|
for gID in $(cat /tmp/gchange.json | jq -r .hits.hits[]._id); do
|
||||||
|
|
||||||
|
NEW=""
|
||||||
|
|
||||||
|
[[ ! -f ~/.zen/cache/gchange/$gID.json ]] &&
|
||||||
|
NEW="true" \
|
||||||
|
&& curl -s --create-dirs -o ~/.zen/cache/gchange/$gID.json -s https://data.gchange.fr/market/record/$gID?_source=category,title,description,issuer,time,creationTime,location,address,city,price,unit,currency,thumbnail._content_type,thumbnail._content,picturesCount,type,stock,fees,feesCurrency,geoPoint \
|
||||||
|
&& sleep $((1 + RANDOM % 3))
|
||||||
|
|
||||||
|
type=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.type)
|
||||||
|
stock=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.stock)
|
||||||
|
[[ $stock == 0 ]] && continue
|
||||||
|
|
||||||
|
# [[ $type == "need" ]] && continue
|
||||||
|
creationTime=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.creationTime)
|
||||||
|
title=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.title)
|
||||||
|
|
||||||
|
currency=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.currency)
|
||||||
|
price=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.price)
|
||||||
|
|
||||||
|
categoryname=$(cat ~/.zen/cache/gchange/$gID.json | jq -r ._source.category.name)
|
||||||
|
|
||||||
|
[[ $price == null ]] && price="0"
|
||||||
|
[[ $currency == "g1" ]] && love=$(bc -l <<< "scale=2; $price / $LASTDU * 100") || love="?.??"
|
||||||
|
love="$love_LOVE"
|
||||||
|
price=$(bc -l <<< "scale=2; $price / 100")
|
||||||
|
|
||||||
|
fullcount=$((fullcount+1)) && echo "DEBUG : $fullcount - $type - $price $currency - $title "
|
||||||
|
[[ $price == "0" ]] && love="..." && price="A débattre "
|
||||||
|
|
||||||
|
|
||||||
|
[[ $type == "offer" ]] && LINE="___OFFRE___[$title](https://data.gchange.fr/market/record/$gID/_share)_$love"
|
||||||
|
[[ $type == "need" ]] && LINE="__DEMANDE__[$title](https://data.gchange.fr/market/record/$gID/_share)_$love"
|
||||||
|
|
||||||
|
[[ $NEW == "true" ]] && echo "$LINE" >> ~/.zen/cache/gchange.txt && chunk=$((chunk+1)) && echo $chunk
|
||||||
|
|
||||||
|
done
|
||||||
|
echo "$chunk_nouvelles_annonces_($TOTAL)" >> ~/.zen/cache/gchange.txt
|
||||||
|
|
||||||
|
## TODO AUTOMATIC PUBLISHING \n and message size problem ??
|
||||||
|
if [[ $(cat ~/.zen/cache/gchange.txt | wc -c) -lt 8000 ]]; then
|
||||||
|
export raw="$(cat ~/.zen/cache/gchange.txt)"
|
||||||
|
annonces=$(node -p "JSON.stringify(process.env.raw)")
|
||||||
|
sbotc publish '{"type":"post","text":'$annonces'}'
|
||||||
|
fi
|
||||||
|
# EXTRA COULD CREATE IT'S OWN MAP with https://github.com/zicmama/tile-stitch.git
|
||||||
|
# And magick to overlay... But best would be a local map proxy...
|
|
@ -34,7 +34,8 @@ for PLAYER in $(ls ~/.zen/game/players/); do
|
||||||
else
|
else
|
||||||
## Replace tube links with downloaded video
|
## Replace tube links with downloaded video
|
||||||
$MY_PATH/TUBE.copy.sh ~/.zen/tmp/astro/index.html $PLAYER
|
$MY_PATH/TUBE.copy.sh ~/.zen/tmp/astro/index.html $PLAYER
|
||||||
|
echo "DIFFERENCE ?"
|
||||||
|
diff ~/.zen/tmp/astro/index.html ~/.zen/game/players/$PLAYER/ipfs/moa/index.html
|
||||||
echo "Upgrade TW local copy..."
|
echo "Upgrade TW local copy..."
|
||||||
cp ~/.zen/tmp/astro/index.html ~/.zen/game/players/$PLAYER/ipfs/moa/index.html
|
cp ~/.zen/tmp/astro/index.html ~/.zen/game/players/$PLAYER/ipfs/moa/index.html
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -41,6 +41,9 @@ do
|
||||||
## Replace tube links with downloaded video
|
## Replace tube links with downloaded video
|
||||||
$MY_PATH/TUBE.copy.sh ~/.zen/tmp/work/index.html $voeu
|
$MY_PATH/TUBE.copy.sh ~/.zen/tmp/work/index.html $voeu
|
||||||
|
|
||||||
|
echo "DIFFERENCE ?"
|
||||||
|
diff ~/.zen/tmp/work/index.html ~/.zen/game/world/$voeu/index.html
|
||||||
|
echo "Update local copy"
|
||||||
# Update local copy
|
# Update local copy
|
||||||
cp ~/.zen/tmp/work/index.html ~/.zen/game/world/$voeu/index.html
|
cp ~/.zen/tmp/work/index.html ~/.zen/game/world/$voeu/index.html
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue