Skip to content

Commit

Permalink
Merge pull request thelounge#286 from thelounge/xpaw/unknown-command
Browse files Browse the repository at this point in the history
Display unhandled numerics on the client
  • Loading branch information
astorije authored Jul 6, 2016
2 parents 704c4c9 + 867a14b commit afee449
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 4 deletions.
4 changes: 4 additions & 0 deletions client/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,10 @@ button {
color: #f00;
}

#chat .unhandled .from {
color: #eee;
}

#chat .msg.toggle .time {
visibility: hidden;
}
Expand Down
10 changes: 6 additions & 4 deletions client/js/lounge.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ $(function() {
}

var chan = chat.find(target);
var msg;
var template = "msg";

if (!data.msg.highlight && !data.msg.self && (type === "message" || type === "notice") && highlights.some(function(h) {
return data.msg.text.indexOf(h) > -1;
Expand All @@ -245,11 +245,13 @@ $(function() {
"ctcp",
].indexOf(type) !== -1) {
data.msg.template = "actions/" + type;
msg = $(render("msg_action", data.msg));
} else {
msg = $(render("msg", data.msg));
template = "msg_action";
} else if (type === "unhandled") {
template = "msg_unhandled";
}

var msg = $(render(template, data.msg));

var text = msg.find(".text");
if (text.find("i").size() === 1) {
text = text.find("i");
Expand Down
4 changes: 4 additions & 0 deletions client/themes/morning.css
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ body {
color: #f92772;
}

#chat .unhandled .from {
color: #99a2b4;
}

#chat .msg.quit .time,
#chat .msg.quit .from button {
color: #d0907d !important;
Expand Down
4 changes: 4 additions & 0 deletions client/themes/zenburn.css
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ body {
color: #bc6c4c;
}

#chat .unhandled .from {
color: #aaa;
}

#chat .msg.quit .time,
#chat .msg.quit .from button {
color: #bc6c9c !important;
Expand Down
11 changes: 11 additions & 0 deletions client/views/msg_unhandled.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="msg {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}">
<span class="time">
{{tz time}}
</span>
<span class="from">[{{command}}]</span>
<span class="text">
{{#each params}}
<span>{{this}}</span>
{{/each}}
</span>
</div>
1 change: 1 addition & 0 deletions src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = Client;
var id = 0;
var events = [
"connection",
"unhandled",
"ctcp",
"error",
"invite",
Expand Down
1 change: 1 addition & 0 deletions src/models/msg.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var _ = require("lodash");

Msg.Type = {
UNHANDLED: "unhandled",
ACTION: "action",
ERROR: "error",
INVITE: "invite",
Expand Down
18 changes: 18 additions & 0 deletions src/plugins/irc-events/unhandled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var Msg = require("../../models/msg");

module.exports = function(irc, network) {
var client = this;

irc.on("unknown command", function(command) {
// Do not display users own name
if (command.params[0] === network.irc.user.nick) {
command.params.shift();
}

network.channels[0].pushMessage(client, new Msg({
type: Msg.Type.UNHANDLED,
command: command.command,
params: command.params
}));
});
};

0 comments on commit afee449

Please sign in to comment.