From a72a1dbaeb4c5266521ca189b5fef7e1bd4b5a34 Mon Sep 17 00:00:00 2001
From: Adrian Amaglio <Vous@exemple.com>
Date: Thu, 2 Apr 2020 18:01:29 +0200
Subject: [PATCH] :lipstick: some improvements

---
 index.html |  1 +
 index.js   |  8 ++++++++
 main.js    | 12 ++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index ef876c1..e295fda 100644
--- a/index.html
+++ b/index.html
@@ -10,6 +10,7 @@
         <main id="educbot-status">
             <p v-if="connection">Connecté !</p>
             <p v-else="">Non connecté !</p>
+            <p>{{message}}</p>
             <ul>
                 <li v-for="(value, key) in reactions">
                     <!--<img src="https://discordapp.com/assets/08c0a077780263f3df97613e58e71744.svg" width="30px" />
diff --git a/index.js b/index.js
index 7fc3f0a..be8c5a1 100644
--- a/index.js
+++ b/index.js
@@ -2,6 +2,9 @@
 require('dotenv').config();
 const fs = require('fs');
 
+/* Catch evry unhandled promise rejection */
+process.on('unhandledRejection', error => console.error('Uncaught Promise Rejection', error));
+
 /* Deep clone of objects */
 const clonedeep = require('lodash.clonedeep')
 
@@ -147,9 +150,14 @@ const client = new Discord.Client();
 client.on('ready', () => {
     console.log('Connected to Discord as ' + client.user.tag); 
     client.user.setAvatar('avatar.png')
+    client.user.setUsername('Educ-Bot')
 }); 
 /* Discord message center */
 client.on('message', msg => {
+    //TODO
+    //const prefixRegex = new RegExp(`^(<@!?${client.user.id}>|${escapeRegex(prefix)})\\s*`);
+	//if (!prefixRegex.test(message.content)) return;
+
     if (msg.content === '!educpop-enable') {
         if (msg.channel.id in channels) {
             msg.reply('J’écoute déjà ce canal texte.')
diff --git a/main.js b/main.js
index d5d10b7..af025f3 100644
--- a/main.js
+++ b/main.js
@@ -8,6 +8,7 @@ window.onload = function () {
             ws_url: 'ws://localhost:8080',
             reactions: {},
             connection: false,
+            message: '',
         },
         created: function () {
             var url = new URL(location.href)
@@ -19,8 +20,15 @@ window.onload = function () {
             }
             this.ws = new WebSocket(this.ws_url)
             this.ws.onmessage = (data) => {
-                this.reactions = JSON.parse(data.data)
-                console.log(this.reactions)
+                var reactions = JSON.parse(data.data)
+                if ('error' in reactions) {
+                    this.message = 'Erreur ! ' 
+                    if (reactions.error === "bad channel") {
+                        this.message += 'Les identifiants sont incorrect ! Redemandez les à Educ-Bot avec la commande "!educpop-web"'
+                    }
+                    return
+                }
+                this.reactions = reactions
             }
             this.ws.onopen = () => {
                 this.sendWs('init')