From c611487f421c27573b7b7844011e74a338dc9bde Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sun, 20 Oct 2013 16:16:21 +0000
Subject: [PATCH] mite b cool
---
modules/nickserv/nickserv.js | 21 +++++++++++++--------
modules/nickserv/strings.json | 5 ++++-
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/modules/nickserv/nickserv.js b/modules/nickserv/nickserv.js
index afa252a..97d0e62 100644
--- a/modules/nickserv/nickserv.js
+++ b/modules/nickserv/nickserv.js
@@ -11,7 +11,7 @@ var nickserv = function(dbot) {
if(!_.has(this.authStack, server)) this.authStack[server] = {};
this.authStack[server][nick] = callback;
- dbot.say(server, nickserv, infoCommand + ' ' + nick);
+ dbot.say(server, nickserv, infoCommand + ' ' + nick + ' *');
},
'getUserHost': function(server, nick, callback) {
@@ -34,9 +34,16 @@ var nickserv = function(dbot) {
this.commands = {
'~auth': function(event) {
var user = event.params[1] || event.user;
- this.api.auth(event.server, user, function(isAuthed) {
+ this.api.auth(event.server, user, function(isAuthed, account) {
if(isAuthed) {
- event.reply(dbot.t('authed', { 'nick': user }));
+ if(user == account) {
+ event.reply(dbot.t('authed', { 'nick': user }));
+ } else {
+ event.reply(dbot.t('authed_as', {
+ 'nick': user,
+ 'account': account
+ }));
+ }
} else {
event.reply(dbot.t('not_authed', { 'nick': user }));
}
@@ -67,10 +74,10 @@ var nickserv = function(dbot) {
if(event.user == nickserv) {
var info = event.params.match(statusRegex);
if(info && _.has(this.authStack, event.server)) {
- if(info[2] == acceptableState) {
- this.authStack[event.server][info[1]](true);
+ if(info[3] == acceptableState) {
+ this.authStack[event.server][info[1]](true, info[2]);
} else {
- this.authStack[event.server][info[1]](false);
+ this.authStack[event.server][info[2]](false, info[2]);
}
}
}
@@ -88,8 +95,6 @@ var nickserv = function(dbot) {
nick = params[1],
host = params[3];
- console.log(params);
-
if(_.has(this.userStack, event.server) && _.has(this.userStack[event.server], nick)) {
var callback = this.userStack[event.server][nick];
delete this.userStack[event.server][nick];
diff --git a/modules/nickserv/strings.json b/modules/nickserv/strings.json
index 325657f..b62990e 100644
--- a/modules/nickserv/strings.json
+++ b/modules/nickserv/strings.json
@@ -2,7 +2,10 @@
"authed": {
"en": "{nick} is authed with nickserv.",
"fr": "{nick} est authentifié avec nickserv.",
- "it": "{nick} è autenticato con nickserv."
+ "it": "{nick} è autenticato con nickserv."
+ },
+ "authed_as": {
+ "en": "{nick} is authed as {account} with nickserv.",
},
"not_authed": {
"en": "{nick} is not authed with nickserv.",