Skip to content

Commit 4bb9635

Browse files
committed
Better server notice detection
1 parent a9f213d commit 4bb9635

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/commands/handlers/messaging.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ var handlers = {
1212
var message = command.params[command.params.length - 1];
1313
var target = command.params[0];
1414
var target_group;
15-
var notice_from_server = false;
1615

1716
if ((message.charAt(0) === '\x01') && (message.charAt(message.length - 1) === '\x01')) {
1817
// It's a CTCP response
@@ -32,13 +31,8 @@ var handlers = {
3231
target_group = parsed_target.target_group;
3332
}
3433

35-
notice_from_server = (
36-
command.prefix === handler.network.server ||
37-
!handler.connection.registered
38-
);
39-
4034
handler.emit('notice', {
41-
from_server: notice_from_server,
35+
from_server: command.nick.indexOf('.') > -1,
4236
nick: command.nick || undefined,
4337
ident: command.ident,
4438
hostname: command.hostname,

test/helper.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ describe('src/irclineparser.js', function () {
2727
});
2828
});
2929

30-
it('should recognize when just passed a user and host', function () {
30+
it('should recognize when just passed a nick and host', function () {
3131
var msgObj = Helper.parseMask("something@something");
3232

3333
expect(msgObj).to.containSubset({
3434
host: "something",
35-
user: "something",
35+
nick: "something",
3636
});
3737
});
3838

0 commit comments

Comments
 (0)