From f07f5f994afe7a626cc3a5a849dc9dd89f1988e3 Mon Sep 17 00:00:00 2001 From: qo-op Date: Wed, 18 Dec 2019 02:31:12 +0100 Subject: [PATCH] shell/sms_ABO.sh --- _chain | 2 +- _comments | 1 + _nanodate | 2 +- _publishkey.gpg | Bin 1288 -> 1288 bytes shell/cron_G1TAG_REFRESH.sh | 2 +- shell/functions.sh | 4 ++-- shell/sms_ABO.sh | 24 ++++++++++++++++++++---- sms_received.sh | 5 ++--- 8 files changed, 28 insertions(+), 12 deletions(-) mode change 100644 => 100755 shell/sms_ABO.sh diff --git a/_chain b/_chain index 493f092..953407d 100755 --- a/_chain +++ b/_chain @@ -1 +1 @@ -QmTDcHP1Nqy4SFzYCwuDH3JxvBT7fsdAKWQvrcvsVPMUpD +QmbRvGMpwZws4ii5xe5x8EgK1SSxNBaNNjinwdWjhye3TR diff --git a/_comments b/_comments index c06d6e2..7842c23 100755 --- a/_comments +++ b/_comments @@ -174,3 +174,4 @@ OK 2019-12-14: 2019-12-17: Better G1Tx 2019-12-17: G1TAG REFRESH & more +2019-12-18: RAZ diff --git a/_nanodate b/_nanodate index a017c9f..7778f6d 100755 --- a/_nanodate +++ b/_nanodate @@ -1 +1 @@ -1576604811163661452 +1576627244479575204 diff --git a/_publishkey.gpg b/_publishkey.gpg index 5a2f3c4d9fcf5296250fbbcbf5ad63ebad4d2c45..619e3dc50687c359bc2dc032d3aeb90658ecfee3 100755 GIT binary patch literal 1288 zcmV+j1^4=l4Fm}T0tzl_!_Nv3yui}x0VC1ylAIPxJroN22|@7*|4&J!EX5-P4<7Ty z#@!yLtP{1+fPga`XURI@?+W_Hn_6i_fz7@`up(-H@u(lK=bwg}2~_EVtS+NfPG=iL zpI>6EWLk=Z?U1%#_<~qq{UPZr;$tvkfF2%P$cc%*0`Gpksx+#rm(t4**=z*5;7Mq$Ui+)U{{KB^= zJIhY^ysF&tXr$PwI8LTHzNNrqb$CaB_#|uaHrnR|EVmq4#jdKb?yOv*p=kbfUqACb zoXtzywvs1`!>zw^wSrg8&oFK0Bzj9=TxE~+kGNAp@BpyD(CH|quuIGz{qx^K@1>W6 zh?%*SX7-5cz}HgX0LB~a=Ul%?wbWIJB-wEa0BLkvzE~|1D38n{3M#Oj1D*5@I0H*f zv)5{?_aE}MgkH4#fb=aZ5K&Muv)?w-e|j198Mn+Ke(x?-2#!fEtzHSa8t`VWE3gwYSyJn}KeKrTbcaDOT zVKdDzoq^3@=}o?>jNI&gc}tr$A?hHoyP(hYyJsm!Gr@8A*r&Jb#`k)m!+1whU=UoC zU;YV3vvay2D*rO-e-r0`uyn*dK5#KSw>Q@=EPrm?K zh9No25#x@H0G+jBpH*V)?#=eR9=*5q|3OgD%tB@n=l;rg#)=)?kM$++L|CIi}h3mZXQ`&a6t&b>aHxlf?Qq0UzbDuQ{OtoK1_3!Wj=Qvk5j8hjcP@=$5sQf@d8;@G ztd&?5V`b*Bz%{ncK&MMXO*hK>KDf0h_Z#(X%`lKSs7UVX?93qEO>-gCFBleLwDw%} zt^87Y*mw(=Dn7gTiyZ|0^0U3J)bcbYzJSw&w0JQ6O0||N=;ix?rk;Vw#7`i8vQE`- zESK?mi~7STKw%R89}uS6)eRNdxEs~q8&?@xYG zS>q8n#PFAfz)x)$R+8xCuRISdCMd$Wq>D8cQiC{>VZreo)?ix)ylPykDX1s%Xdf* znxO##0w;VO?qfKv#_<&08Z9SUN)9^XJWZ$rlin0Co~yurH*C@I;huXV3SMTHF9YRq zi$fZw$|;oH>jsW(K=nLNTL4&Jv|;f2lAPcKxUV9wSnW>HXx^Crp!UVlEPua);at;>ltX^u zsdC+|ofFcl$|KsQh>-6$gYIL!I{P$0M8#kR2kSP3m(gA+T;|N+ZFPH!LnM{SBWLW< z+PCP_j;;{V&ifvf8=58JQwtBZ2mhXZJcF6bze$^wOhHpp1~NS}n$!`oyJ>QwWoTDJ z!DD>b>J-YFDDB@IoQVww(*oiIp`jEb`V7UJjGdHc)j;m}tN-6w;@+JUoMfnH8E)wU ztd9Y9(?>BQhwMvs*}vkVXfCnT%KFQ5wM22!9{D~IM&EebDRXg?^ z;~Cr)ifa}zTIqBIq~b-^JVd_Z3=TNV3B{qF; zCtO*?P{O29X*0IpR|XZD+Nd-BIHxfxzKw9@nBtQ3ad+74iS8W*m1%jCJ@tM<5vtAE3lkn~BN51dsoE`GwrD_WvfmVb zcXbU?mo*vUz%?;_l3)vC!OJzP{1cPadR^z^s%)R=7#w#X?H%$~OF|WpgAM|+LOcS> zler)rTTTcxY$FCj<8ORrqJAZN`q}1C1^U(OHO{7zj({oA46_HcO(J&~G8f_LCQ|leqwz-j#E8|_v{u~9SuG+q#Y+Tb@&qIKtd9|}D>2RW`-&AZ- zna*0NOhq5v{E%~Xv2`{O43zYj y+RD?|wJyf0{5UL%yDm1}UsG_d@UZjz8PWLofFT0`8~Qt-dkYvY-k>PK@KF0IhIl^! diff --git a/shell/cron_G1TAG_REFRESH.sh b/shell/cron_G1TAG_REFRESH.sh index ff4251d..de8eaec 100755 --- a/shell/cron_G1TAG_REFRESH.sh +++ b/shell/cron_G1TAG_REFRESH.sh @@ -67,7 +67,7 @@ for tag in ./wallets/.$IPFSNODEID/TAG/*; do rm /home/$YOU/.ipfs/keystore/${RR}.crypt fi echo "__SUB:cron_G1TAG_REFRESH.sh: G1Tag PUBLISHKEY OK : /home/$YOU/.ipfs/keystore/${RR}" - + echo ${NANODATE} > ./TAG/${RR}/TAG_nanodate # PUBLISH VERIFIED G1Tag VERSION I=$(su $YOU -c "ipfs add -qr ./TAG/${RR} | tail -n 1") # RECORD TAG_chain And HASH again diff --git a/shell/functions.sh b/shell/functions.sh index 20f82ec..7dbb9bf 100755 --- a/shell/functions.sh +++ b/shell/functions.sh @@ -116,8 +116,8 @@ if [[ $PHONE ]]; then rm -Rf ./wallets_swarm/$PHONE; fi su $YOU -c "ipfs get --output=./wallets_swarm/ /ipns/$IPFSNODEID" count=1 # Search for All peers Nodes. TODO: To be changed when Swarm is too bug or not expendanding -#for id in ./wallets_swarm/.Qm*/; -for id in $(su $YOU -c "ipfs swarm peers" | awk -F '/' '{print $7}'); +for id in ./wallets_swarm/.Qm*/; +#for id in $(su $YOU -c "ipfs swarm peers" | awk -F '/' '{print $7}'); do count=$((count+1)) id=$(echo $id | cut -d '.' -f 3 | cut -d '/' -f 1) diff --git a/shell/sms_ABO.sh b/shell/sms_ABO.sh old mode 100644 new mode 100755 index 7601a87..1686a3a --- a/shell/sms_ABO.sh +++ b/shell/sms_ABO.sh @@ -11,12 +11,28 @@ # TODO: Create information Channels and moderate OPT IN/OUT source ./shell/init.sh source ./shell/functions.sh -log "__SUB:sms_ABO.sh: START ($1=SERVICE, $2=YESNO)" -SERVICE=$1 -YESNO=$2 -PARAMS=$3 +log "__SUB:sms_ABO.sh: START ($1=PHONE, $2=SERVICE)" +PHONE=$1 +SERVICE=$2 + +sms_INIT_ACCOUNT "$PHONE" case "$SERVICE" in + ON) + log "Abonnement Kalkun" + if [[ "$MEMBER" != "" ]]; then + add_contact $MEMBER $PHONE && log "${c_green}Contact has been added to database$c_" || "${c_red}Contact can't be added to database$c_"; + sms_SEND "$PHONE" "$MEMBER votre inscription annuaire est active" + fi + ;; + OFF) + log "Retrait Kalkun" + if [[ $MEMBER ]]; then + rm_contact $MEMBER $PHONE && log "${c_green}Contact has been deleted from database$c_" || "${c_red}Contact can't be deleted database$c_"; + sms_SEND "$PHONE" "$MEMBER retrait annuaire prise en compte..." + fi + ;; + MARCHE) log "Avertissement G1 marchés" # PARAMS could be "$distance" to Member GeoPoint... diff --git a/sms_received.sh b/sms_received.sh index 2b4b461..4bf00d5 100755 --- a/sms_received.sh +++ b/sms_received.sh @@ -184,9 +184,8 @@ case "$CMD" in ;; ABO) # GERER SES ABONNEMENT CANAUX INFO SMS - CANAL=$(echo "$TEXT" | awk '{print $2}'| grep -E "([A-Za-z0-9\-\_]+$)") - YESNO=$(echo "$TEXT" | awk '{print $3}'| grep -E "([A-Za-z0-9\-\_]+$)") - ./shell/sms_ABO.sh "$PHONE" "$CANAL" "$YESNO" & + SERVICE=$(echo "$TEXT" | awk '{print toupper($2)}'| grep -E "([A-Za-z0-9\-\_]+$)") + ./shell/sms_ABO.sh "$PHONE" "$SERVICE" & ;; DELIVERED|PENDING|FAILED) # If delivered/pending notification come back (gammu/phone config)