From 4f16a5dec020e1a6ae2be8185b84b960a2ebddf3 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Fri, 12 Jun 2020 16:49:43 +0200
Subject: [PATCH] N Pseudo correction (Pb with silkaj timeout !!!)

---
 g1sms/functions.sh | 12 +++++++-----
 g1sms/sms_NEW.sh   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index fd71215..d987526 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -176,13 +176,15 @@ function sms_uid2key (){
 #           else
     ##################### REWRITE TODO 
         # SEARCH WITH SILKAJ
-        log "__SUB:sms_uid2key: GETTING FROM SILKAJ MEMBER ID"
+        log "__SUB:sms_uid2key: silkaj -p $duniter_server id $ASKWALLET"
         DESTRIB=$(silkaj -p "$duniter_server" id "$ASKWALLET" | grep -w "$ASKWALLET" | awk '{print $2}' | tail -n 1)
         log "__SUB:sms_uid2key: OUT OFF SWARM MEMBER wallet: $DESTRIB"
-        # GET CESIUM+ geoPoint DATA (TODO: cron for GCHANGE SMS Alert)
-        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.geoPoint' > "/home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json"
-        log "__SUB:sms_uid2key: GET CESIUM+ geoPoint and AVATAR : $(cat /home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json)"
-        curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.avatar._content' | sed 's/\"//g' | base64 -d > "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png"
+        if [[ "$DESTRIB" != "" ]]; then
+            # GET CESIUM+ geoPoint DATA (TODO: cron for GCHANGE SMS Alert)
+            curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.geoPoint' > "/home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json"
+            log "__SUB:sms_uid2key: GET CESIUM+ geoPoint and AVATAR : $(cat /home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json)"
+            curl -s ${CESIUM}/user/profile/${DESTRIB} | jq -r '._source.avatar._content' | base64 -d > "/home/$YOU/.zen/g1sms/$PHONE/_avatar.png"
+        fi
     fi
 
 	if [ "$DESTRIB" != "" ]; then
diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh
index a519cdf..c4fe83b 100755
--- a/g1sms/sms_NEW.sh
+++ b/g1sms/sms_NEW.sh
@@ -22,7 +22,7 @@ if [[ "$MEMBERUID" != "" && "$MEMBERUID" != "N" && "$MEMBERUID" != "D" && "$MEMB
 	VIRDEST=$MEMBERUID
 	MEMRIB=$(sms_uid2key "$MEMBERUID" "$PHONE" "$PIN")
     log "# MEMRIB: $MEMRIB"
-	[[ $MEMRIB == "" ]] &&  exit 1
+	[[ $MEMRIB == "" ]] && sms_SEND "$PHONE" "Problème pour trouver $MEMBERUID , rééssayer dans 5 mn" && exit 1
 	MEMBER="$MEMBERUID"
 fi