axiom-team
/
astroport
9
3
Fork 1
Code Issues 13 Pull Requests 1 Releases Wiki Activity

qrcode in about

This commit is contained in:
qo-op 2020-05-12 18:46:41 +02:00
parent b21073ea51
commit 9634353e45
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g1sms/functions.sh
View File

@ -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

10
zen/ssb_INIT.sh
View File

@ -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