diff --git a/src/g1-info.js b/src/g1-info.js index b7d8585..37d475b 100644 --- a/src/g1-info.js +++ b/src/g1-info.js @@ -35,6 +35,22 @@ bot.global.text({ id: 'g1-pseudo' }); +bot.global.text({ + starts: ['./silkaj', 'biz ./silkaj'] +}, (b) => { + cmd = b.message.text + process.env.hb_cmd = cmd + pubkey = exec("src/shell/g1-infos.sh silkaj $hb_cmd", function(err, stdout, stderr) { + if (err) { + b.respond("Une erreur est survenu :" + err) + } else { + b.respond("```" + stdout + "```") + } + }); +}, { + id: 'g1-silkaj' +}); + bot.global.text({ starts: ['membre','membres', 'biz membre','biz membres'] }, (b) => { diff --git a/src/g1sms.js b/src/g1sms.js deleted file mode 100644 index f789481..0000000 --- a/src/g1sms.js +++ /dev/null @@ -1,20 +0,0 @@ -const bot = require('bbot'); -const exec = require('child_process').exec; -const fs = require('fs'); -const util = require('util') - -bot.global.text({ - contains: ['TEST BSMS'] -}, (b) => { - b.respond("Test de G1SMS ...") - membres = exec("g1sms/test.sh chat", function(err, stdout, stderr) { - if (err) { - b.respond("Une erreur est survenu ...") - } else { - b.respond(stdout) - } - }); -}, { - id: 'sms-test' -}); - diff --git a/src/gbanque.js b/src/gbanque.js new file mode 100644 index 0000000..312ed65 --- /dev/null +++ b/src/gbanque.js @@ -0,0 +1,27 @@ +const bot = require('bbot'); +const exec = require('child_process').exec; +const fs = require('fs'); +const util = require('util') + +bot.global.text({ + starts: ['./gbanque', 'biz ./gbanque', 'biz gb'] +}, (b) => { + username = b.message.user.name + process.env.hb_username = username + room = b.message.user.room.name + process.env.hb_room = room + cmd = b.message.text + process.env.hb_cmd = cmd + +// b.messageRoom("poka", "taratata") + gbanque = exec("src/shell/gbanque.sh ~~~$hb_cmd~~~$hb_username~~~$hb_room", function(err, stdout, stderr) { + if (err) { + b.respond("Une erreur est survenu: " + err) + } else { + b.respond(stdout) + } + }); + +}, { + id: 'gbanque' +}); diff --git a/src/shell/functions.sh b/src/shell/functions.sh new file mode 100755 index 0000000..aaf946a --- /dev/null +++ b/src/shell/functions.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +sendmsg() { +chan="$1" +msg="${@:2}" + +[[ ! $chan || ! $msg ]] && echo "Please select user and message." && exit 1 + +curl -s -H "X-Auth-Token: 9aHo-EZ4ySYv9reV7rwcRLxuOSWeATmKlyKRvwebIXa" \ + -H "X-User-Id: HTuZCNhtoG4yQocCg" \ + -H "Content-type:application/json" \ + http://192.168.9.6:10140/api/v1/chat.postMessage \ + -d "{ \"channel\": \"$chan\", \"text\": \"$msg\" }" > /dev/null 2>&1 +} diff --git a/src/shell/g1-infos.sh b/src/shell/g1-infos.sh index 55caa60..3cdf726 100755 --- a/src/shell/g1-infos.sh +++ b/src/shell/g1-infos.sh @@ -23,6 +23,11 @@ pseudo() { [[ $pseudo ]] && echo "Le pseudo correspondant à la clé publique $pubkey est: @$pseudo" || echo "La clé publique $pubkey n'a pas de pseudo associé." } +silkaj() { + args=$(echo "$@" | tr ' ' '\n' | grep -vEw 'silkaj|biz' | tr '\n' ' ') + /usr/bin/silkaj $args || echo "Silkaj ne comprends cette commande." +} + membres() { url="$node/blockchain/current" local nbr_membres=$(curl -m 5 -s $url | jq '.membersCount') diff --git a/src/shell/gbanque.sh b/src/shell/gbanque.sh new file mode 100755 index 0000000..288368a --- /dev/null +++ b/src/shell/gbanque.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized + +source $MY_PATH/functions.sh + +#args=$(echo "$@" | tr ' ' '\n' | grep -vEwi 'gbanque|gb|biz' | tr '\n' ' ') +args=$(echo "$@" | awk -F '~~~' '{ print $2 }' | tr ' ' '\n' | grep -vEwi 'gbanque|gb|biz' | tr '\n' ' ') +user=$(echo $@ | awk -F '~~~' '{ print $3 }') +room=$(echo $@ | awk -F '~~~' '{ print $4 }') + +[[ $room == "undefined" ]] && dest="@$user" || dest="#$room" + +test() { + echo "Je suis là." +} + +init() { + ## Récupération depuis Ḡ1SMS + ## ./shell/sms_NEW.sh "$PHONE" "$MEMBERUID" & + ## ./silkaj/silkaj generate_auth_file --auth-scrypt -salt="$PHONE" -password="$PIN" + + sendmsg $dest "Création de votre portefeuille..." +# echo "Cette conversation continue en privé @$user - @biz" + + #TODO: Définir le workflow g1sms + echo "Work in progress ..." + +} + +$args + +[[ -z $args ]] && echo "Veuillez préciser votre commande" + +exit 0