From 9634353e454997f2fc0e15be15faa1596a3ac4a4 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 12 May 2020 18:46:41 +0200
Subject: [PATCH] qrcode in about

---
 g1sms/functions.sh |  3 ++-
 zen/ssb_INIT.sh    | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index f1a537d..efe7ea6 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -292,7 +292,8 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         #######################
 		# log "$NODE_PUBSECFILE $PUBKEY THIRD_PARTY_MANAGER:$NODE_G1PUBKEY"
         duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/duniter_getnode.sh)
-        TX_IN=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.ssb/secret.dunikey tx --output $PUBKEY --amount 3.24 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY" -y)
+        [[ $MEMBERUID != "" ]] && combieng1="4.24" || combieng1="3.24"
+        TX_IN=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.ssb/secret.dunikey tx --output $PUBKEY --amount $combieng1 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY" -y)
 		log "__SUB:sms_INIT_ACCOUNT: G1 Wallet TX IN: $TX_IN"
 		sleep 2
         
diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh
index 5286901..37abb44 100755
--- a/zen/ssb_INIT.sh
+++ b/zen/ssb_INIT.sh
@@ -79,10 +79,14 @@ curl -s ${CESIUM}/user/profile/${g1pub} | jq -r '._source.avatar._content' | bas
 ##############################################
 # IF AVATAR not png take IMAGE of G1 wallet QRCode
 qrencode -s 5 -o ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_g1.qrcode.png "$g1pub"
+imagefile=~/.zen/ipfs/.$ipfsnodeid/G1SSB/_g1.qrcode.png
+qrname=${imagefile##*/}
+qrid="$(sbotc blobs.add < $imagefile)"
+qrtype="$(file -b --mime-type $imagefile)"
+qrsize="$(wc -c < $imagefile)"
 
 if [[ ! $(file "/tmp/_g1.avatar.png" | grep 'PNG') ]]; then
     echo "NO Cesium AVATAR - Using G1Pub QRCode"
-    imagefile=~/.zen/ipfs/.$ipfsnodeid/G1SSB/_g1.qrcode.png
     rm -f /tmp/_g1.avatar.png
 else
     echo "AVATAR FOUND"
@@ -109,7 +113,7 @@ $id : $type : $size bits
 "
 # sbot publish --type about --about $ssbpub --description "[Astroport Node](https://astroport.com) [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) - Wallet $g1pub - $diskperf" --name "$title" --image "$id"
 echo "sbotc publish \"{\"type\":\"about\",\"about\":\"$ssbpub\",\"description\":\"[Astroport Station](https://astroport.com) [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) - Wallet $g1pub - $diskperf\",\"name\":\"$title\",\"image\":\"$id\"}\""
-sbotc publish "{\"type\":\"about\",\"about\":\"$ssbpub\",\"description\":\"[Astroport Station](https://astroport.com) [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) - $g1pub - $diskperf\",\"name\":\"$title\",\"image\":\"$id\"}"
+sbotc publish "{\"type\":\"about\",\"about\":\"$ssbpub\",\"description\":\"![QRCode]($qrid)\\n[Astroport Station](https://astroport.com)\\n IPFS: [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) \\n G1: $g1pub \\n PERF: $diskperf\",\"name\":\"$title\",\"image\":\"$id\"}"
 
 # REQUEST DUNITER G1 Wallet balance
 
@@ -143,7 +147,7 @@ $g1balance
 "
 # IF no AVATAR, publish message with QRCode
 if [[ ! $(file "/tmp/_g1.avatar.png" | grep 'PNG') ]]; then
-    sbotc publish '{"type":"post","text":"![QRCode]('"$id"')\n Scan QRCode with [Cesium](https://cesium.app).\n Thank you\n ONE :heart:","mentions":[{"link":"'"$id"'","name":"'"$name"'","size":'"$size"',"type":"'"$type"'"}]}'
+    sbotc publish '{"type":"post","text":"![QRCode]('"$qrid"')\n Scan QRCode with [Cesium](https://cesium.app).\n Thank you\n ONE :heart:","mentions":[{"link":"'"$id"'","name":"'"$name"'","size":'"$size"',"type":"'"$type"'"}]}'
 else
     # Publish only if new avatar
     if [[ $(diff /tmp/_g1.avatar.png ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_g1.avatar.png) ]]; then