From 1da87b7002c31bc264342839f1da8ed0e75c137c Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sun, 23 Feb 2020 19:26:19 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20axiom=20adh=C3=A9rent=20in=20bbot=20scrip?=
 =?UTF-8?q?ts=20and=20improve=20shell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bb_scripts/admins-chan.txt    |  1 +
 bb_scripts/aide.js            |  2 +-
 bb_scripts/axiom.js           | 17 +++++++++--------
 bb_scripts/disabled/tpl.js    |  2 +-
 bb_scripts/g1-info.js         |  4 ++--
 bb_scripts/g1sms.js           |  2 +-
 bb_scripts/liens.js           |  2 +-
 bb_scripts/reactions.js       |  2 +-
 bb_scripts/reload.js          |  2 +-
 bb_scripts/shell/helloasso.sh | 21 +++++++++++++++++++--
 10 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 bb_scripts/admins-chan.txt

diff --git a/bb_scripts/admins-chan.txt b/bb_scripts/admins-chan.txt
new file mode 100644
index 0000000..710b2a3
--- /dev/null
+++ b/bb_scripts/admins-chan.txt
@@ -0,0 +1 @@
+biz-bot-admin
diff --git a/bb_scripts/aide.js b/bb_scripts/aide.js
index 7955247..d7bcd1c 100644
--- a/bb_scripts/aide.js
+++ b/bb_scripts/aide.js
@@ -8,7 +8,7 @@ bot.global.text({
 }, (b) => {
   membres = exec("src/shell/aide.sh text", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/axiom.js b/bb_scripts/axiom.js
index 0b9e0ea..143466f 100644
--- a/bb_scripts/axiom.js
+++ b/bb_scripts/axiom.js
@@ -2,7 +2,7 @@ const bot = require('bbot');
 const exec = require('child_process').exec;
 
 //ADMINS
-var adminRooms = exec("pwd"); //cat admins-chan.txt");
+//var adminRooms = exec("cat admins-chan.txt"); //cat admins-chan.txt");
 
 bot.global.text({
   contains: ['axiom adhérent','axiom adhérents','axiom adherent','axiom adherents']
@@ -16,18 +16,19 @@ bot.global.text({
 	roomName = b.message.user.name
   }
 
-  b.respond("JE SUIS LA" + adminRooms.) //kopa
+//  b.respond("JE SUIS LA" + adminRooms.) //kopa
 
-  if (adminRooms.indexOf(roomName) == -1) {
-     cmd = "adherentsSoft"
-  } else {
+//  if (adminRooms.indexOf(roomName) == -1) {
+  if (['biz-bot-admin', 'poka', 'brad.pi', '_pole_financements', '_axiom_business_plan', 'compta-axiom', 'communication', '_recrutement'].includes(roomName)) {
      cmd = "adherents"
+	 process.env.hb_cmd = cmd
+  } else {
+     b.respond("Réservé aux administrateurs de l'association.")
   }
-  process.env.hb_cmd = cmd
 
   pubkey = exec("src/shell/helloasso.sh $hb_cmd", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
@@ -41,7 +42,7 @@ bot.global.text({
 }, (b) => {
   membres = exec("src/shell/helloasso.sh cagnotte", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/disabled/tpl.js b/bb_scripts/disabled/tpl.js
index 5253e78..5334b17 100644
--- a/bb_scripts/disabled/tpl.js
+++ b/bb_scripts/disabled/tpl.js
@@ -22,7 +22,7 @@ bot.global.text({
 }, (b) => {
   membres = exec("src/shell/.sh", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/g1-info.js b/bb_scripts/g1-info.js
index 2c4d776..c9048a1 100644
--- a/bb_scripts/g1-info.js
+++ b/bb_scripts/g1-info.js
@@ -10,7 +10,7 @@ bot.global.text({
   process.env.hb_cmd = cmd
   pubkey = exec("src/shell/g1-infos.sh pubkey $hb_username \"$hb_cmd\"", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
@@ -24,7 +24,7 @@ bot.global.text({
 }, (b) => {
   membres = exec("src/shell/g1-infos.sh membres", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/g1sms.js b/bb_scripts/g1sms.js
index 218e0e8..e28bf24 100644
--- a/bb_scripts/g1sms.js
+++ b/bb_scripts/g1sms.js
@@ -10,7 +10,7 @@ bot.global.text({
   const username = b.message.user.id
   membres = exec("g1sms/test.sh chat", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/liens.js b/bb_scripts/liens.js
index 2f5e0f9..d05c269 100644
--- a/bb_scripts/liens.js
+++ b/bb_scripts/liens.js
@@ -10,7 +10,7 @@ bot.global.text({
   process.env.hb_cmd = cmd
   membres = exec("src/shell/liens.sh $hb_cmd", function(err, stdout, stderr) {
      if (err) {
-        b.respond("Une erreur est survenu ...")
+        b.respond("Une erreur est survenue ...")
      } else {
         b.respond(stdout)
      }
diff --git a/bb_scripts/reactions.js b/bb_scripts/reactions.js
index 43fe740..ee7b58e 100644
--- a/bb_scripts/reactions.js
+++ b/bb_scripts/reactions.js
@@ -4,7 +4,7 @@ const globe_delay = 60000; // 1 minute
 var globe_said = {};
 
 bot.global.text({
-  contains: ['facebook', 'google', 'amazon', 'apple', 'microsoft']
+  contains: ['facebook', 'google', 'amazon', 'apple', 'microsoft', 'youtube']
 }, (b) => {
   b.respondVia('react', ':hear_no_evil:');
 }, {
diff --git a/bb_scripts/reload.js b/bb_scripts/reload.js
index 5f6ced0..a80b34b 100644
--- a/bb_scripts/reload.js
+++ b/bb_scripts/reload.js
@@ -7,7 +7,7 @@ bot.global.text({
   function reload() {
      pubkey = exec("pm2 reload bbot --force", function(err, stdout, stderr) {
         if (err) {
-           b.respond("Une erreur est survenu: " + " - " + stderr)
+           b.respond("Une erreur est survenue: " + " - " + stderr)
         } else {
            b.respond("Biz a été rechargé")
         }
diff --git a/bb_scripts/shell/helloasso.sh b/bb_scripts/shell/helloasso.sh
index f94c7dd..19a7941 100755
--- a/bb_scripts/shell/helloasso.sh
+++ b/bb_scripts/shell/helloasso.sh
@@ -5,7 +5,15 @@ ha="https://api.helloasso.com/v3"
 
 adherents() {
 	url="$ha/campaigns/000001053192/actions.json?type"
-	curl -m 5 --user $ids -s $url | jq -r '.resources[] | .date + " , " + .first_name + " " + .last_name + " - " + .email' | sed 's/T.*,//'
+	list=$(curl -m 5 --user $ids -s $url | jq -r '.resources[] | .date + " , " + .first_name + " " + .last_name + " - " + .email' | sed 's/T.*,//')
+
+	echo "$list" | awk '!seen[$3]++'
+
+	nbrAdherents=$(echo "$list" | awk '!seen[$3]++' | wc -l)
+
+	echo "---"
+	echo -e "\n Il y a actuellement **$nbrAdherents adhérents** de l'association Axiom-Team."
+
 }
 
 adherentsSoft() {
@@ -16,7 +24,16 @@ adherentsSoft() {
 
 cagnotte() {
 	url="$ha/campaigns/000001053192.json"
-	curl -m 5 --user $ids -s $url | jq -r '.name, {"Donnateurs": .supporters},{"Fonds":.funding},.url' | grep -v '{|}'
+	list=$(curl -m 5 --user $ids -s $url | jq -r '.name, {"Donnateurs": .supporters},{"Fonds":.funding},.url' | tr -d '{|}')
+#	list=$(curl -m 5 --user $ids -s $url | jq -r '{"Donnateurs": .supporters},{"Fonds":.funding},.url' | tr -d '{|}')
+
+	name=$(echo "$list" | head -n1)
+	url=$(echo "$list" | tail -n1)
+	donnateurs=$(echo "$list" | grep "Donnateurs" | awk '{ print $2 }')
+	fonds=$(echo "$list" | grep "Fonds" | awk '{ print $2 }')
+
+	echo "Il y a **${fonds}€** pour **$donnateurs donnateurs** sur la cagnotte **\"$name\"**"
+
 }