1 files changed, 26 insertions, 13 deletions
diff --git a/index.js b/index.js
index 96ce9dd..a21b00e 100644
--- a/index.js
+++ b/index.js
@@ -3,10 +3,15 @@ var linkifyHtml = require('linkifyjs/html');
 var shell = require('electron').shell;
 var config = require('./config.json')
 var pjson = require('./package.json');
+var handlers = require('./handlers.js');
+
+var debugmiddleware = require('./debugmiddleware.js');
 const progName = pjson.name;
 const version = pjson.version;
 var myNick = config.nick;
-
+var server = config.server;
+var port = config.port;
+var password = config.password;
 $(document).ready(function() {
   $("#send-message").focus();
 });
@@ -17,6 +22,8 @@ $(document).on('click', 'a[href^="http"]', function(event) {
 });
 
 const irc = require('irc');
+const IRC = require('irc-framework');
+const client = new IRC.Client()
 
 $("#server-input").val(config.server);
 $("#port-input").val(config.port);
@@ -31,24 +38,29 @@ config.channels.forEach(function(channel) {
 txtChannels = txtChannels.substring(0, txtChannels.length-1)
 
 $("#channel-input").val(txtChannels);
-var client;
 
 $('#connect').on('click', function() {
 console.log($("#channel-input").val());
+  server = $("#server-input").val();
+  port = $("#port-input").val();
   channels = $("#channel-input").val().split(" ");
-  myNick = $("#nick-input").val()
+  myNick = $("#nick-input").val();
+  password = $("#password-input").val();
   ssl = ($("#ssl-input:checked").val() == "on");
   console.log(ssl);
-  client = new irc.Client($("#server-input").val(), myNick, {
-    channels: channels,
-    userName: myNick,
-    password: $("#password-input").val(),
-    port: $("#port-input").val(),
-    secure: ssl,
-    selfSigned: true,
-    certExpired: true
-});
-  createListeners(client);
+  client.use(debugmiddleware.DebugMiddleware());
+  client.connect({
+    host: server,
+    port: port,
+    nick: myNick,
+    username: myNick,
+    gecos: myNick,
+    password: password,
+    tls: ssl,
+    rejectUnauthorized: false
+  });
+
+  handlers.handleCommands(client);
 
 
   $("#chan-container").show();
@@ -168,6 +180,7 @@ function setTopic(channel, topic) {
 }
 
 function joinChannel(channel, sendJoin) {
+    console.log("here");
   if (sendJoin) {
     client.join(channel);
   }