From 3125ca5b1c8297bf296f074f2768853c64ba5017 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 21 Apr 2020 00:38:03 +0200
Subject: [PATCH] export alias sbotc='ssb'

---
 zen/ssb_INIT.sh                |  5 +----
 zen/tools/make_G1SSB_secret.sh | 10 +++++-----
 zen/zen_MAKE.sh                | 23 ++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh
index 0612247..7432afa 100755
--- a/zen/ssb_INIT.sh
+++ b/zen/ssb_INIT.sh
@@ -30,11 +30,8 @@ echo '
 # [ASTROPORT](https://astroport.com)
 ########################################################################
 '
-# TODO: Make choice during install
-# Do you already have an SSB account?
-# Do you already have a G1 account?
-# Do you want a passphrase?
 
+[[ which ssb-cli ]] && export alias sbotc='ssb'
 ########################################################################
 # ENVIRONEMENT DETECTION + IPFS ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_info
 ########################################################################
diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh
index 1874cea..c945e98 100755
--- a/zen/tools/make_G1SSB_secret.sh
+++ b/zen/tools/make_G1SSB_secret.sh
@@ -76,14 +76,14 @@ python3 $MY_PATH/key_create_dunikey.py "$salt" "$pepper"
 mv $MY_PATH/.secret.dunikey ~/.ssb/secret.dunikey
 
 # CREATE SSB secret
-pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
-priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
-ssbpub=$(echo $pub | base58 -d | base64)
-ssbpriv=$(echo $priv | base58 -d | base64)
+g1pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
+g1priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
+ssbpub=$(echo $g1pub | base58 -d | base64)
+ssbpriv=$(echo $g1priv | base58 -d | base64)
 
 cat > ~/.ssb/secret <<EOF
 # This secret is related to your G1Wallet - https://cesium.app
-# silkaj balance $pub
+# silkaj balance $g1pub
 # ID (salt): $salt / Pass: $pepper
 # THIS KEY IS YOURS! REMIND IT AND KEEP IT SAFE AS A REAL WALLET
 # chmod 400 ~/.zen/secret
diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh
index f53f607..0fb3f52 100755
--- a/zen/zen_MAKE.sh
+++ b/zen/zen_MAKE.sh
@@ -95,6 +95,7 @@ echo "
 [[ ! -f ~/.zen/cache/g1_TX_inputs/zen.$ZENSOURCE ]] && echo "ERROR# UNKNOWN  ~/.zen/cache/g1_TX_inputs/zen.$ZENSOURCE !!" && exit 1
 ISSUER=$(cat ~/.zen/cache/g1_TX_inputs/zen.$ZENSOURCE)
 [[ $ISSUER == "" ]] && echo "ERROR# NO ISSUER FOUND FOR TX $ZENSOURCE !!" && exit 1 
+echo "ISSUER = $ISSUER SENT TX $ZENSOURCE !!"
 
 else
 
@@ -109,6 +110,7 @@ SSB PASSENGER ~/.zen/miam/$ZENSOURCE
 [[ ! -d ~/.zen/miam/$ZENSOURCE ]] && echo "ERROR# UNKNOWN ~/.zen/miam/$ZENSOURCE !!" && exit 1
 ISSUER=$(cat ~/.zen/miam/$ZENSOURCE/msg_key)
 [[ $ISSUER == "" ]] && echo "ERROR# NO ISSUER FOUND FOR miam $ZENSOURCE !!" && exit 1 
+echo "ISSUER = SSB Message $ISSUER !!"
 
 
 fi
@@ -347,7 +349,7 @@ echo "
 ipfs ls /ipfs/${I}
 
 ZenTAG       : ipfs ls /ipns/${J}
-NODE index   : ipfs ls /ipns/$NODEIPNS/.$ipfsnodeid/TAG/${ZENSOURCE}
+NODE index   : ipfs ls /ipns/$ipfsnodeid/.$ipfsnodeid/TAG/${ZENSOURCE}
 "
 
 ########################################################################
@@ -424,6 +426,25 @@ INLINE=$(node -p "JSON.stringify(process.env.MESSAGE)")
 sbotc publish '{"type":"post", "branch": "'"$msg_branch"'", "root": "'"$msg_root"'", "text":'${INLINE}',"mentions":[{"link":"'"$id"'","name":"'"$name"'","size":"'"$size"'","type":"'"$type"'"},{"link":"#zenbot"},{"link":"#astroport"}]}'
 
 
+else
+# REGULAR ZenTAG, Send QRCode to INPUT TX emitter
+
+ssbid="@$(echo $ISSUER | base58 -d | base64).ed25519"
+
+file=~/.zen/tag/${AAH}/_QRCODE.read.png
+#recps='@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519 @5XaVcAJ5DklwuuIkjGz4lwm2rOnMHHovhNg7BFFnyJ8=.ed25519'
+recps="$ssbid"
+
+name=${file##*/}
+link="$(sblob encrypt "$file")"
+type="$(file -b --mime-type "$file")"
+id=${link%?unbox=*}
+key=${link#*?unbox=}
+size="$(sbotc -e blobs.size "$id")"
+recps_array="[$(for recp in $recps; do printf '"%s"\n' "$recp"; done | paste -sd,)]"
+sbotc private.publish '{"type":"post","text":"['"$name"']('"$link"')","mentions":[{"link":"'"$id"'","name":"'"$name"'","size":'"$size"',"type":"'"$type"'","query":{"unbox":"'"$key"'"}}],"recps":'"$recps_array"'}' "$recps_array"
+
+
 fi
 
 ########################################################################