diff options
Diffstat (limited to 'index.js')
| -rw-r--r-- | index.js | 48 |
1 files changed, 6 insertions, 42 deletions
@@ -1,5 +1,4 @@ -var linkify = require("linkifyjs"); -var linkifyHtml = require('linkifyjs/html'); + var shell = require('electron').shell; var config = require('./config.json') var pjson = require('./package.json'); @@ -49,6 +48,7 @@ console.log($("#channel-input").val()); ssl = ($("#ssl-input:checked").val() == "on"); console.log(ssl); client.use(debugmiddleware.DebugMiddleware()); + console.log(server) client.connect({ host: server, port: port, @@ -57,12 +57,15 @@ console.log($("#channel-input").val()); gecos: myNick, password: password, tls: ssl, - rejectUnauthorized: false + rejectUnauthorized: false, + version: "blachat 0.1.3" }); + handlers.setChannels(channels); handlers.handleCommands(client); + $("#chan-container").show(); $("#message").show(); $("#connect-container").hide(); @@ -200,45 +203,6 @@ function joinChannel(channel, sendJoin) { $('.menu .item').tab({history:false}); - - client.addListener('message#'+channel, function (from, message) { - // message = message.autoLink( { - // callback: function(url) { - // return /\.(gif|png|jpe?g)$/i.test(url) ? '<img src="' + url + '">' : null; - // }, - // target: "_blank" - // }); - // console.log(message.autoLink()); - console.log(from + ' => #'+ channel +': ' + message); - var chatTab = $("[data-tab=chan-"+ channel +"].chat"); - message = linkifyHtml(message); - - chatTab.append("<p class='chat-line'><" + from + "> " + message +"</p>"); - var imgMatch = message.match(/[a-z0-9\-]+[\.:]\S+\.(gif|png|jpe?g|bmp)/); - var vidMatch = message.match(/[a-z0-9\-]+[\.:]\S+\.(webm|mp4)/); - var audioMatch = message.match(/[a-z0-9\-]+[\.:]\S+\.(mp3|wav|ogg)/); - var youtubeMatch = message.match(/(https?\:\/\/)?(www\.)?(youtube\.com|youtu\.be)\/(watch\?v=)?[a-z0-9A-Z_\-]+/); - if (imgMatch != null && imgMatch.length > 0) { - var image = imagify(imgMatch[0],channel); - chatTab.append("<p class=chat-line>"+image+"</p>"); - } - if (vidMatch != null && vidMatch.length > 0) { - chatTab.append("<p class=chat-line><video controls><source src="+vidMatch[0]+"></video></p>"); - } - if (audioMatch != null && audioMatch.length > 0) { - chatTab.append("<p class=chat-line><audio controls><source src="+audioMatch[0]+"></audio></p>"); - } - if (youtubeMatch != null && youtubeMatch.length > 0) { - console.log(youtubeMatch) - youtubeParts = youtubeMatch[0].split("/"); - youtubeId = youtubeParts[youtubeParts.length-1]; - youtubeId = youtubeId.replace("watch?v=",""); - chatTab.append("<p class=chat-line><iframe width='480' height='270' src='https://www.youtube.com/embed/"+youtubeId+"' frameborder='0' allowfullscreen></iframe></p>"); - } - - chatTab.scrollTop(chatTab.prop("scrollHeight")); - }); - numChans++; } function removeChannel(channel, sendPart) { |