diff --git a/biosms.sh b/biosms.sh index e608e7a..5a1154d 100755 --- a/biosms.sh +++ b/biosms.sh @@ -11,5 +11,13 @@ ME="${0##*/}" echo "EXECUTE $ME ($1, $2)" echo "Expédition SMS aux GROUPES et PHONE" -# SEARCH FOR /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh +YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) || er+=" ipfs daemon not running" +[[ ! -f /home/${YOU}/.zen/secret.dunikey ]] && echo "Crypto is missing... please provide /home/${YOU}/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1 +G1PUB=$(cat /home/${YOU}/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) + +# SEARCH FOR /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh +./scraper2sms.sh + +BIODYNSMS=$(cat /tmp/sms) +# for ls ~/.zen/SMS/GUILDES/MIZ/MEMBERS/* diff --git a/printQR_oasis_MODEL.sh b/printQR_img_MODEL.sh similarity index 100% rename from printQR_oasis_MODEL.sh rename to printQR_img_MODEL.sh diff --git a/dialvoice.py b/pygsm/dialvoice.py similarity index 100% rename from dialvoice.py rename to pygsm/dialvoice.py diff --git a/sendmessage.py b/pygsm/sendmessage.py similarity index 100% rename from sendmessage.py rename to pygsm/sendmessage.py diff --git a/scraper2sms.sh b/scrapers/org.bio-dynamie.sh similarity index 99% rename from scraper2sms.sh rename to scrapers/org.bio-dynamie.sh index f2996f6..99ec64e 100755 --- a/scraper2sms.sh +++ b/scrapers/org.bio-dynamie.sh @@ -31,6 +31,7 @@ YEAR=$(date +%y) [[ $DAY == "Sunday" ]] && DAY="Dimanche" && DAYE="Mardi" # CHECK WEEK INTERVAL +S=1 [[ $DOM -ge $A && $DOM -le $B ]] && S=1 [[ $DOM -ge $C && $DOM -le $D ]] && S=2 diff --git a/search b/search old mode 100644 new mode 100755 diff --git a/sms/ERASE.sh b/sms/ERASE.sh index a5d7bc7..c65f4a2 100755 --- a/sms/ERASE.sh +++ b/sms/ERASE.sh @@ -22,7 +22,7 @@ G1PUB=$(cat /home/${YOU}/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ## TEST PHONE ######################################################################## phonehash=$(echo $phone | sha256sum | cut -d ' ' -f1) -htest=$(ls /home/${YOU}/.zen/SMS/PHONE/${phonehash} 2>dev/null) +htest=$(ls /home/${YOU}/.zen/SMS/PHONE/${phonehash} 2>/dev/null) if [[ $htest ]]; then NEW=0 xzuid=$(cat "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/xzuid.txt") @@ -52,10 +52,12 @@ $MY_PATH/natools.py decrypt -f pubsec -k "/home/${YOU}/.zen/secret.dunikey" -i " ######################################################################## if [[ "${guilde}" == "MIZ" ]]; then + if [[ -f /var/www/nextcloud/occ ]]; then echo "## DELETE NEXTCLOUD : $xzuid" sudo su -s /bin/sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 - + fi + echo "## DELETE GCHANGE : $xzuid" $MY_PATH/jaklis/jaklis.py -k /home/${YOU}/.zen/SMS/DUNIKEY/${xzuid}_${phone}.dunikey -n "https://data.gchange.fr" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 @@ -70,8 +72,10 @@ fi ######################################################################## if [[ "${guilde}" == "NEXTCLOUD" ]]; then + if [[ -f /var/www/nextcloud/occ ]]; then sudo su -s /bin/sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + fi fi ######################################################################## diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh index b4bc4a0..261446f 100755 --- a/sms/GUILDE.sh +++ b/sms/GUILDE.sh @@ -32,7 +32,7 @@ phonehash=$(echo $phone | sha256sum | cut -d ' ' -f1) echo "=> ${phonehash}" ######################################################################## -htest=$(ls /home/${YOU}/.zen/SMS/PHONE/${phonehash} 2>dev/null) +htest=$(ls /home/${YOU}/.zen/SMS/PHONE/${phonehash} 2>/dev/null) if [[ $htest ]]; then NEW=0 xzuid=$(cat "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/xzuid.txt") @@ -62,7 +62,7 @@ if [[ ! $xzuid ]]; then echo "## $xzuid / $phone => NEW DUNIKEY & QRCODE" ######################################################################## echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Bienvenue dans le JEu 'Made In Zion / Astroport' - $xzuid est votre Identité Interplanétaire, heureux de vous compter parmi nous \"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh +sudo gammu sendsms TEXT \"$phone\" -text \"Heureux de vous accueillir. $xzuid est votre nouvelle Identité Interplanétaire MadeInZion/Astroport.\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh ######################################################################## echo "## MAKE secret.dunikey" @@ -101,33 +101,33 @@ sudo gammu sendsms TEXT \"$phone\" -text \"Votre identifiant est $xzuid, votre m echo "CREATING FAKE AVATAR" ######################################################################## $MY_PATH/timeout.sh -t 10 curl -s https://thispersondoesnotexist.com/image -o /home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg -[[ $? == 0 ]] && echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Notre Intelligence Artificielle Amie vient de créer la photo de profil anonyme de votre avatar ${xzuid}\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh + [[ $? == 0 ]] && echo "#!/bin/bash +sudo gammu sendsms TEXT \"$phone\" -text \"Nous venons de créer une photo de profil anonyme pour votre avatar ${xzuid}/${phone}\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh if [[ -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg ]]; then ######################################################################## echo "GCHANGE+ PROFILE" ######################################################################## $MY_PATH/timeout.sh -t 10 $MY_PATH/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://data.gchange.fr" set --name "${xzuid}" --avatar "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg" #GCHANGE+ -[[ $? == 0 ]] && echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Avec https://gchange.fr quittez la monnaie des Banques et échangez gratuitement en JUNE : https://monnaie-libre.fr \"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh + [[ $? == 0 ]] && echo "#!/bin/bash +sudo gammu sendsms TEXT \"$phone\" -text \"Utilisez https://gchange.fr quittez la monnaie des Banques et échangez gratuitement en JUNE : https://monnaie-libre.fr \"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh ######################################################################## echo "CESIUM+ PROFILE" ######################################################################## $MY_PATH/timeout.sh -t 10 $MY_PATH/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://g1.data.e-is.pro" set --name "${xzuid}" --avatar "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg" #CESIUM+ -[[ $? == 0 ]] && echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Recevez vos primes de missions sur votre portefeuille libre https://cesium.app - $g1pub -\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh + [[ $? == 0 ]] && echo "#!/bin/bash +sudo gammu sendsms TEXT \"$phone\" -text \"Recevez les primes de vos missions sur votre portefeuille libre https://cesium.app - $g1pub -\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh fi if [[ -f /var/www/nextcloud/occ ]]; then - ######################################################################## - echo "## NEXTCLOUD : ${xzuid} / ${phone} " - ######################################################################## + ######################################################################## + echo "## NEXTCLOUD : ${xzuid} / ${phone} " + ######################################################################## sudo su -s /bin/sh www-data -c "export OC_PASS=\"${phone}\" && php /var/www/nextcloud/occ user:add --password-from-env --group=\"${guilde}\" --display-name=\"${xzuid}\" ${xzuid}" -[[ $? == 0 ]] && echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Fuyez les GAFAM! Synchronisez votre smartphone sur NEXTCloud chez un ami du réseau de %MAKER https://copylaradio.com - DEMO - https://taurus.copylaradio.com\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh + [[ $? == 0 ]] && echo "#!/bin/bash +sudo gammu sendsms TEXT \"$phone\" -text \"Quittez les GAFAM! Synchronisez votre smartphone avec NEXTCloud chez un ami du réseau de %MAKER https://copylaradio.com - DEMO - https://taurus.copylaradio.com\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh fi @@ -155,7 +155,7 @@ echo "## GESTION RELATION PHONE / GUILDE : ${phone} / ${guilde}" ######################################################################## ## NOUVELLE INSCRIPTION [[ ! -f /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/${phone} ]] && echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Faisons connaissance. Ouvrez votre compte sur https://oasis.astroport.com -SVP- Utilisez votre Prénom Nom -SVP- \"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/0000000000000.tosend.sh +sudo gammu sendsms TEXT \"$phone\" -text \"Bienvenue ${xzuid}. Continuez votre inscription au JEu avec votre actuelle identité 'Prénom Nom' sur https://oasis.astroport.com\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/0000000000000.tosend.sh ## MEMORISATION DU MESSAGE dans GUILDES/${guilde}/INPUT/ mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/ diff --git a/sms/jaklis/lib/__pycache__/cesium.cpython-36.pyc b/sms/jaklis/lib/__pycache__/cesium.cpython-36.pyc new file mode 100644 index 0000000..553de43 Binary files /dev/null and b/sms/jaklis/lib/__pycache__/cesium.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/cesiumCommon.cpython-36.pyc b/sms/jaklis/lib/__pycache__/cesiumCommon.cpython-36.pyc new file mode 100644 index 0000000..890783e Binary files /dev/null and b/sms/jaklis/lib/__pycache__/cesiumCommon.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/messaging.cpython-36.pyc b/sms/jaklis/lib/__pycache__/messaging.cpython-36.pyc new file mode 100644 index 0000000..b4e56c1 Binary files /dev/null and b/sms/jaklis/lib/__pycache__/messaging.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/natools.cpython-36.pyc b/sms/jaklis/lib/__pycache__/natools.cpython-36.pyc new file mode 100644 index 0000000..2654611 Binary files /dev/null and b/sms/jaklis/lib/__pycache__/natools.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/offers.cpython-36.pyc b/sms/jaklis/lib/__pycache__/offers.cpython-36.pyc new file mode 100644 index 0000000..1ea3e8c Binary files /dev/null and b/sms/jaklis/lib/__pycache__/offers.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/profiles.cpython-36.pyc b/sms/jaklis/lib/__pycache__/profiles.cpython-36.pyc new file mode 100644 index 0000000..e7fac95 Binary files /dev/null and b/sms/jaklis/lib/__pycache__/profiles.cpython-36.pyc differ diff --git a/sms/jaklis/lib/__pycache__/stars.cpython-36.pyc b/sms/jaklis/lib/__pycache__/stars.cpython-36.pyc new file mode 100644 index 0000000..4a16d9b Binary files /dev/null and b/sms/jaklis/lib/__pycache__/stars.cpython-36.pyc differ diff --git a/sms/prepare_sms_tosend.sh b/sms/prepare_sms_tosend.sh index 6b8f3a2..780c1a7 100644 --- a/sms/prepare_sms_tosend.sh +++ b/sms/prepare_sms_tosend.sh @@ -3,7 +3,7 @@ phone="$1" phonehash=$(echo $phone | sha256sum | cut -d ' ' -f1) message="$2" -groupe="$3" +# groupe="$3" ts=$(date -u +%s%N | cut -b1-13) echo "#!/bin/bash diff --git a/sms_received.sh b/sms_received.sh index e73ba6e..68aaccd 100755 --- a/sms_received.sh +++ b/sms_received.sh @@ -10,12 +10,15 @@ prefix="+33" MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ######################################################################## +YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) || er+=" ipfs daemon not running" +[[ ! -f /home/${YOU}/.zen/secret.dunikey ]] && echo "Crypto is missing... please provide /home/${YOU}/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1 +G1PUB=$(cat /home/${YOU}/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ######################################################################## # GET smsadmin PHONE NUMBER FROM ~/.zen/SMSADMIN FILE ######################################################################## -[[ ! -f /home/pi/.zen/SMSADMIN ]] && echo "EXIT. Indiquez votre numéro de mobile dans /home/pi/.zen/SMSADMIN" && exit 1 -SMSADMIN="$(cat /home/pi/.zen/SMSADMIN)" ## FRENCH NUMBER +[[ ! -f /home/${YOU}/.zen/SMSADMIN ]] && echo "EXIT. Indiquez votre numéro de mobile dans /home/${YOU}/.zen/SMSADMIN" && exit 1 +SMSADMIN="$(cat /home/${YOU}/.zen/SMSADMIN)" ## FRENCH NUMBER [[ ${SMSADMIN#"$prefix"} != "${SMSADMIN}" ]] && smsadmin=0${SMSADMIN#"$prefix"} || smsadmin="${SMSADMIN}" ## 06 ######################################################################## @@ -33,7 +36,7 @@ ping -q -w 1 -c 1 taurus.copylaradio.com 2>&1>/dev/null && echo "TAURUS OK" && T PHONE="$SMS_1_NUMBER" # gammu-smsd [[ ! ${PHONE} ]] && PHONE="$1" # CLI MODE -[[ "${#PHONE}" < 10 || "${#PHONE}" > 12 ]] && echo "${PHONE} NON RECONNU. EXIT" && exit 1 +[[ "${#PHONE}" < 10 || "${#PHONE}" > 12 ]] && echo "PHONE ${PHONE} NON RECONNU. EXIT" && exit 1 ## Remove prefix: phone contains local number [[ ${PHONE#"$prefix"} != "${PHONE}" ]] && phone=0${PHONE#"$prefix"} || phone="${PHONE}" @@ -78,7 +81,8 @@ case "$CMD" in STOP) ## STOP RELATION WITH CMD GUILDE GROUP - $MY_PATH/sms/ERASE.sh "$phone" "$CMD" & + GUILDE=$(echo "$TEXT" | awk '{print toupper($2)}') + $MY_PATH/sms/ERASE.sh "$phone" "$GUILDE" & ;; *) @@ -89,7 +93,7 @@ case "$CMD" in echo "${MESSAGE}" fi ## OK CMD=GROUPE suivi de message - $MY_PATH/sms/GUILDE.sh "$phone" "$CMD" > /home/pi/.zen/SMS/debug.log + $MY_PATH/sms/GUILDE.sh "$phone" "$CMD" > /home/${YOU}/.zen/SMS/debug.log ## TRY UGGLY WAY !!?? # sudo service gammu-smsd stop @@ -102,5 +106,5 @@ esac ## [[ "$phone" != "$smsadmin" ]] && gammu-smsd-inject TEXT "$smsadmin" -text "$phone : $TEXT" ## FILESYSTEM RIGHTS CORRECTION -chown -R pi:pi /home/pi/.zen/SMS +chown -R ${YOU}:${YOU} /home/${YOU}/.zen/SMS exit 0