extract configs

brunoventura · brunoventura · commit 983e95eb5bf6 · 2016-02-29T21:28:09.000-03:00
extract configs

Conflicts:
	app.js
diff --git a/app.js b/app.js
@@ -3,44 +3,71 @@
 const irc = require('irc');
 const request = require('request');
 const cheerio = require('cheerio');
+const fs = require('fs');
+const NODE_ENV = process.env.NODE_ENV || 'development';
+let config = loadEnv();
+console.log(config);
 
-const client = new irc.Client(
-    'rajaniemi.freenode.net',
-    'ctfbot',
-    { channels: ['#ctf-br'] }
-);
+// const client = new irc.Client(
+//     'rajaniemi.freenode.net',
+//     'ctfbot',
+//     { channels: ['#ctf-bot-test'] }
+// );
 
 const messagesListner = {};
 
+function loadEnv() {
+    try {
+        const file = NODE_ENV != 'production' ? 'config.json': 'dev-config.json'
+        return JSON.parse(fs.readFileSync(file));
+    } catch (err) {
+        console.error(err);
+        process.exit();
+    }
+}
+
 //Generic message handler
 function respondMessage(message, idle, action) {
     messagesListner[message] = {idle, action};
 }
 
-//Magic happens here
+//Listeners
+
+//Message Listener
 client.addListener('message', function (from, to, message) {
     if (messagesListner[message]) {
         const msg = messagesListner[message];
         if (msg.idle > (new Date().getTime() - msg.timer)) {
-            client.say('#ctf-br', `To ocupado!!!`);
+            client.say('#ctf-bot-test', `To ocupado!!!`);
             return;
         }
         msg.timer = new Date().getTime();
         msg.action();
     }
 });
+//Give voice for new members join when they join
+client.addListener('join', function(channel, who){
+	if(who !== 'ctfbot'){
+		client.send('MODE', channel, '+v', who);
+	}
+});
+//Error handler
+client.addListener('error', function(error){
+	console.log(error);
+});
+
 
 //Message handlers
 respondMessage('!nextctf', 10000, () => {
     upcomingCtf()
         .then(ctf => {
-            client.say('#ctf-br', `Nome: ${ctf.name}`)
-            client.say('#ctf-br', `Data: ${ctf.date}`)
-            client.say('#ctf-br', `Tipo: ${ctf.type}`)
-            client.say('#ctf-br', `Site: ${ctf.link}`)
+            client.say('#ctf-bot-test', `Nome: ${ctf.name}`)
+            client.say('#ctf-bot-test', `Data: ${ctf.date}`)
+            client.say('#ctf-bot-test', `Tipo: ${ctf.type}`)
+            client.say('#ctf-bot-test', `Site: ${ctf.link}`)
         })
         .catch(err => {
-            client.say('#ctf-br', `${err}`);
+            client.say('#ctf-bot-test', `${err}`);
         });
 });
 
diff --git a/config.json b/config.json
@@ -0,0 +1,7 @@
+{
+    "server": "rajaniemi.freenode.net",
+    "bot_nick": "ctfbot",
+    "channels": [
+        "#ctf-br"
+    ]
+}
diff --git a/dev-config.json b/dev-config.json
@@ -0,0 +1,7 @@
+{
+    "server": "rajaniemi.freenode.net",
+    "bot_nick": "ctfbot",
+    "channels": [
+        "#ctf-bot-test"
+    ]
+}
