[Erc-commit] [commit][master] Updated OFTC nickserv settings. Fixed bug in erc-nickserv-identification-autodetect.

[mwolson]

commit 9b6fbbc206a8e19982ff0aa453168a05919aea6a
Author: Diane Murray <address@hidden>
Date:   Sun Dec 16 01:14:42 2007 +0100

    Updated OFTC nickserv settings.  Fixed bug in 
erc-nickserv-identification-autodetect.
    
    * erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
    added identified regexp for OFTC.
    (erc-nickserv-identification-autodetect): Make sure success-regex
    is non-nil.

diff --git a/ChangeLog b/ChangeLog
index be111fd..e77c933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-16  Diane Murray  <address@hidden>
+
+       * erc-services.el (erc-nickserv-alist): Removed autodetect regexp,
+       added identified regexp for OFTC.
+       (erc-nickserv-identification-autodetect): Make sure success-regex
+       is non-nil.
+
 2007-12-13  Diane Murray  <address@hidden>
 
        * erc-backend.el (PRIVMSG, QUIT, TOPIC, WALLOPS, 376, 004, 221)
diff --git a/erc-services.el b/erc-services.el
index 099166b..be3fb88 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -227,6 +227,8 @@ Example of use:
      "IDENTIFY" nil nil nil)
     (freenode
      "address@hidden"
+     ;; freenode also accepts a password at login, see the `erc'
+     ;; :password argument.
      "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
      "NickServ"
      "IDENTIFY" nil nil
@@ -249,9 +251,11 @@ Example of use:
      "IDENTIFY" nil "SQUERY" nil)
     (OFTC
      "address@hidden"
-     "type\\s-/msg\\s-NickServ\\s-IDENTIFY\\s-password."
+     ;; OFTC's NickServ doesn't ask you to identify anymore.
+     nil
      "NickServ"
-     "IDENTIFY" nil nil nil)
+     "IDENTIFY" nil nil
+     "You\\s-are\\s-successfully\\s-identified\\s-as\\s-")
     (QuakeNet
      nil nil
      "address@hidden"
@@ -334,6 +338,7 @@ If this is the case, run `erc-nickserv-identified-hook'."
     ;; continue only if we're sure it's the real nickserv for this network
     ;; and it's told us we've successfully identified
     (when (and sender (equal sspec sender)
+              success-regex
               (string-match success-regex msg))
       (erc-log "NickServ IDENTIFY success notification detected")
       (run-hook-with-args 'erc-nickserv-identified-hook network nick)