From ca3a9011057644007aa34865c673eb44ca716e59 Mon Sep 17 00:00:00 2001 From: poka Date: Fri, 7 Aug 2020 17:51:47 +0200 Subject: [PATCH] Patch for telegram using --- src/debug.js | 7 +------ src/reload.js | 2 +- src/shell/functions.sh | 2 +- src/shell/g1-infos.sh | 4 ++-- src/shell/gbanque.sh | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/debug.js b/src/debug.js index 3fba54d..3764029 100644 --- a/src/debug.js +++ b/src/debug.js @@ -6,12 +6,7 @@ bot.global.text({ contains: ['debug user'] }, (b) => { username = b.message -// const userId = res.message.user.id -// username = robot.adapter.api.get('users.info', { userId }) -// process.env.hb_username = username - b.reply("```" + util.inspect(username, {showHidden: false, depth: null}) + "```") - - + b.reply("```" + util.inspect(username) + "```") }, { id: 'debug' }); diff --git a/src/reload.js b/src/reload.js index ece9b61..8d0d4d8 100644 --- a/src/reload.js +++ b/src/reload.js @@ -5,7 +5,7 @@ bot.global.text({ is: ['biz reload'] }, (b) => { function reload() { - pubkey = exec("pm2 reload index --force", function(err, stdout, stderr) { + pubkey = exec("pm2 reload bog --force", function(err, stdout, stderr) { if (err) { b.respond("Une erreur est survenu: " + " - " + stderr) } else { diff --git a/src/shell/functions.sh b/src/shell/functions.sh index dc5b538..0ff54ae 100755 --- a/src/shell/functions.sh +++ b/src/shell/functions.sh @@ -37,7 +37,7 @@ getPubkey() { getPseudo() { url="$node/wot/members" - args=$(echo $@ | tr ' ' '\n' | grep -v 'biz' | tr '\n' ' ') + args=$(echo $@ | tr ' ' '\n' | grep -vEw 'biz|G1LibreBot' | tr '\n' ' ') [ $(echo $args | wc -w) -ge 2 ] && pubkey=$(echo $args | awk '{ print $2 }') || pubkey=$1 # pubkey="$1" pubkey=$(echo $pubkey | tr -d '@') diff --git a/src/shell/g1-infos.sh b/src/shell/g1-infos.sh index 5756cf3..68d9a34 100755 --- a/src/shell/g1-infos.sh +++ b/src/shell/g1-infos.sh @@ -9,7 +9,7 @@ source $MY_PATH/functions.sh # Get Ḡ1 pubkey base on pseudo pubkey() { - local args=$(echo $@ | tr ' ' '\n' | grep -v 'biz' | tr '\n' ' ') + local args=$(echo $@ | tr ' ' '\n' | grep -vEw 'biz|G1LibreBot' | tr '\n' ' ') [ $(echo $args | wc -w) -ge 3 ] && local username=$(echo $args | awk '{ print $3 }') || local username=$1 local username=$(echo $username | tr -d '@') local pubkey=$(getPubkey $@) @@ -20,7 +20,7 @@ pubkey() { pseudo() { getPseudo $@; } silkaj() { - args=$(echo "$@" | tr ' ' '\n' | grep -vEw 'silkaj|biz' | tr '\n' ' ') + args=$(echo "$@" | tr ' ' '\n' | grep -vEw 'silkaj|biz|G1LibreBot' | tr '\n' ' ') cmd=$(echo $args | tr ' ' '\n' | grep -v '-' | head -n1) [[ $cmd =~ ^(tx|authfile|cert)$ ]] && echo "BoḠ refuse d'executer la commande \`$cmd\` ... :eyes:" && exit 0 result=$($silkaj $args) || echo "Silkaj ne comprends cette commande." diff --git a/src/shell/gbanque.sh b/src/shell/gbanque.sh index 030b2d9..255b7eb 100755 --- a/src/shell/gbanque.sh +++ b/src/shell/gbanque.sh @@ -5,7 +5,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized source $MY_PATH/functions.sh -args=$(echo "$@" | awk -F '~~~' '{ print $2 }' | tr ' ' '\n' | grep -vEwi 'gbanque|gb|biz' | tr '\n' ' ') +args=$(echo "$@" | awk -F '~~~' '{ print $2 }' | tr ' ' '\n' | grep -vEwi 'gbanque|gb|biz|G1LibreBot' | tr '\n' ' ') cmd=$(echo "$args" | awk '{ print $1 }') args=$(echo "$args" | awk '{$1=""; print $0}') user=$(echo "$@" | awk -F '~~~' '{ print $3 }')