#channel
+
-
-
-
diff --git a/client/js/chat.js b/client/js/chat.js
index d88ff6b..0128247 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -55,27 +55,34 @@ $(function() {
});
socket.on("init", function(data) {
- var channels = $.map(data.networks, function(n) {
- return n.channels;
- });
- sidebar.find(".networks").html(
+ if (data.networks.length === 0) {
+ $("#footer").find(".connect").trigger("click");
+ return;
+ }
+
+ sidebar.find(".networks").append(
render("networks", {
networks: data.networks
})
);
+ var channels = $.map(data.networks, function(n) {
+ return n.channels;
+ });
chat.html(
render("chat", {
channels: channels
})
);
+
var id = $.cookie("target");
- var target = sidebar.find("[data-target=" + id + "]");
- if (target.length !== 0) {
- target.trigger("click");
- } else {
- sidebar.find(".chan")
+ var target = sidebar.find("[data-target=" + id + "]").trigger("click");
+ if (target.length === 0) {
+ var first = sidebar.find(".chan")
.eq(0)
.trigger("click");
+ if (first.length === 0) {
+ $("#footer").find(".connect").trigger("click");
+ }
}
});
@@ -109,11 +116,18 @@ $(function() {
});
socket.on("network", function(data) {
+ $("#connect").find(".btn").prop("disabled", false);
+ sidebar.find(".empty").hide();
sidebar.find(".networks").append(
render("networks", {
networks: [data.network]
})
);
+ chat.append(
+ render("chat", {
+ channels: data.network.channels
+ })
+ );
sidebar.find(".chan")
.last()
.trigger("click");
@@ -216,7 +230,8 @@ $(function() {
var names = $(this).closest(".users").find(".names");
names.find("button").each(function() {
var btn = $(this);
- if (btn.text().toLowerCase().indexOf(value) === 0) {
+ var name = btn.text().toLowerCase().replace(/[+%@~]/, "");
+ if (name.indexOf(value) === 0) {
btn.show();
} else {
btn.hide();
@@ -271,9 +286,25 @@ $(function() {
}
});
- function isActive(chan) {
- return active !== null && chan == active;
- }
+ var connect = $("#connect");
+ connect.on("submit", "form", function(e) {
+ e.preventDefault();
+ var form = $(this)
+ .find(".btn")
+ .attr("disabled", true)
+ .end();
+
+ var post = {};
+ var values = form.serializeArray();
+
+ $.each(values, function(i, obj) {
+ if (obj.value !== "") {
+ post[obj.name] = obj.value;
+ }
+ });
+
+ socket.emit("conn", post);
+ });
function complete(word) {
return $.grep(
diff --git a/lib/client.js b/lib/client.js
index 3b7ab2f..5886ae0 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -24,13 +24,12 @@ var events = [
"whois"
];
-function Client(attr) {
- _.merge(this, _.extend({
- id: id++,
+function Client(sockets) {
+ _.merge(this, {
networks: [],
- keepAlive: false,
- sockets: null
- }, attr));
+ id: id++,
+ sockets: sockets
+ });
}
Client.prototype.emit = function(event, data) {
@@ -63,7 +62,7 @@ Client.prototype.find = function(id) {
Client.prototype.connect = function(args) {
var client = this;
var options = {
- host: args.host,
+ host: args.host || "irc.freenode.org",
port: args.port || 6667
};
@@ -72,9 +71,13 @@ Client.prototype.connect = function(args) {
console.log(e);
});
+ var nick = args.nick || "shout";
+ var realname = args.realname || "Shout User";
+
var irc = slate(stream);
- irc.nick("shout");
- irc.user("shout", "Shout User");
+ irc.me = nick;
+ irc.nick(nick);
+ irc.user(nick, realname);
var network = new Network({
host: options.host,
@@ -87,10 +90,25 @@ Client.prototype.connect = function(args) {
});
events.forEach(function(plugin) {
- require("./plugins/irc-events/" + plugin).apply(client, [irc, network]);
+ require("./plugins/irc-events/" + plugin).apply(client, [
+ irc,
+ network
+ ]);
});
+ var join = (args.join || "#shout-irc").replace(/\,/g, " ").split(/\s+/g);
irc.on("welcome", function() {
- irc.join("#shout-test");
+ irc.join(join);
+ });
+};
+
+Client.prototype.quit = function() {
+ this.networks.forEach(function(network) {
+ var irc = network.irc;
+ if (network.connected) {
+ irc.quit("");
+ } else {
+ irc.stream.end();
+ }
});
};
diff --git a/lib/models/chan.js b/lib/models/chan.js
index 432bbbe..2c932f3 100644
--- a/lib/models/chan.js
+++ b/lib/models/chan.js
@@ -13,9 +13,9 @@ var id = 0;
function Chan(attr) {
_.merge(this, _.extend({
id: id++,
- type: Chan.Type.CHANNEL,
- name: "",
messages: [],
+ name: "",
+ type: Chan.Type.CHANNEL,
users: []
}, attr));
}
diff --git a/lib/models/msg.js b/lib/models/msg.js
index 6e6c6cd..309297a 100644
--- a/lib/models/msg.js
+++ b/lib/models/msg.js
@@ -21,9 +21,9 @@ module.exports = Msg;
function Msg(attr) {
_.merge(this, _.extend({
- type: Msg.Type.MESSAGE,
- time: moment().format("HH:mm"),
from: "",
- text: ""
+ text: "",
+ time: moment().format("HH:mm"),
+ type: Msg.Type.MESSAGE
}, attr));
}
diff --git a/lib/models/network.js b/lib/models/network.js
index 3d13f72..db2eb60 100644
--- a/lib/models/network.js
+++ b/lib/models/network.js
@@ -7,12 +7,12 @@ var id = 0;
function Network(attr) {
_.merge(this, _.extend({
- id: id++,
+ channels: [],
connected: false,
host: "",
+ id: id++,
irc: null,
- name: capitalize(attr.host.split(".")[1]) || attr.host,
- channels: []
+ name: prettify(attr.host)
}, attr));
this.channels.unshift(
new Chan({name: this.name, type: Chan.Type.LOBBY})
@@ -23,6 +23,14 @@ Network.prototype.toJSON = function() {
return _.omit(this, "irc");
};
+function prettify(host) {
+ var name = capitalize(host.split(".")[1]);
+ if (!name) {
+ name = host;
+ }
+ return name;
+}
+
function capitalize(str) {
return str.charAt(0).toUpperCase() + str.slice(1);
}
diff --git a/lib/plugins/irc-events/errors.js b/lib/plugins/irc-events/errors.js
index 3fcae24..8597178 100644
--- a/lib/plugins/irc-events/errors.js
+++ b/lib/plugins/irc-events/errors.js
@@ -14,7 +14,7 @@ module.exports = function(irc, network) {
});
if (!network.connected) {
if (data.cmd == "ERR_NICKNAMEINUSE") {
- var random = client.nick + Math.floor(10 + (Math.random() * 89));
+ var random = irc.me + Math.floor(10 + (Math.random() * 89));
irc.nick(random);
}
}
diff --git a/lib/plugins/irc-events/quit.js b/lib/plugins/irc-events/quit.js
index 0f9f3f8..73965d5 100644
--- a/lib/plugins/irc-events/quit.js
+++ b/lib/plugins/irc-events/quit.js
@@ -16,7 +16,8 @@ module.exports = function(irc, network) {
});
var msg = new Msg({
type: Msg.Type.QUIT,
- from: data.nick
+ from: data.nick,
+ text: data.message
});
chan.messages.push(msg);
client.emit("msg", {
diff --git a/lib/server.js b/lib/server.js
index 65d9e80..35135d0 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -26,7 +26,7 @@ var inputs = [
module.exports = function() {
sockets = io(http().use(http.static("client")).listen(config.port || 9000));
- sockets.on("connection", function(socket) {
+ sockets.on("connect", function(socket) {
if (config.public) {
auth.call(socket);
} else {
@@ -40,7 +40,18 @@ function init(socket, client) {
socket.emit("auth");
socket.on("auth", auth);
} else {
- socket.on("input", function(data) { input(client, data); });
+ socket.on(
+ "input",
+ function(data) {
+ input(client, data);
+ }
+ );
+ socket.on(
+ "conn",
+ function(data) {
+ client.connect(data);
+ }
+ );
socket.join(client.id);
socket.emit("init", {
networks: client.networks
@@ -51,15 +62,12 @@ function init(socket, client) {
function auth(data) {
var socket = this;
if (config.public) {
- // Temporary:
- var client = clients[0];
- if (clients.length === 0) {
- client = new Client({sockets: sockets});
- clients.push(client);
- client.connect({
- host: "irc.freenode.org"
- });
- }
+ var client = new Client(sockets);
+ clients.push(client);
+ socket.on("disconnect", function() {
+ clients = _.without(clients, client);
+ client.quit();
+ });
init(socket, client);
} else {
if (false) {
@@ -89,7 +97,6 @@ function input(client, data) {
args
]);
} catch (err) {
- console.log(err.stack);
// ..
}
});
-
-
-
+
Connect
+
+
-
+
-
-
-
- Settings
+
+
+