X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/90e75ffdc0f15901c10a282093f6a0e388324640..73ac2ca6bf965e933233aacdf2c6a56a2d041b81:/src/nickserv.help

diff --git a/src/nickserv.help b/src/nickserv.help
index 0838e63..a44308a 100644
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -108,6 +108,8 @@
                 "  $bPASS$b       Change your account's password.",
                 "  $bADDMASK$b    Add a hostmask to your account.",
                 "  $bDELMASK$b    Remove a hostmask from your account.",
+                "  $bADDSSLFP$b   Add an SSL fingerprint to your account.",
+                "  $bDELSSLFP$b   Remove an SSL fingerprint from your account.",
                 "  $bSET$b        Set per-account options.",
                 "  $bGHOST$b      Disconnects your old clients",
                 "  $bACCOUNT FLAGS$b Definition for each account flag"
@@ -129,6 +131,8 @@
                 "  $bPASS$b       Change your account's password.",
                 "  $bADDMASK$b    Add a hostmask to your account.",
                 "  $bDELMASK$b    Remove a hostmask from your account.",
+                "  $bADDSSLFP$b   Add an SSL fingerprint to your account.",
+                "  $bDELSSLFP$b   Remove an SSL fingerprint from your account.",
                 "  $bSET$b        Set per-account options.",
                 "  $bRENAME$b     Renames an account",
                 "  $bACCOUNT FLAGS$b Definition for each account flag"
@@ -167,6 +171,8 @@
                 "*$bOUNREGNICK$b  Remove a nick from someone's account.",
                 " $bOADDMASK$b    Add a mask to someone's account.",
                 " $bODELMASK$b    Remove a mask from someone's account.",
+                " $bOADDSSLFP$b   Add an SSL fingerprint to someone's account.",
+                " $bODELSSLFP$b   Remove an SSL fingerprint from someone's account.",
                 " $bOADDIGNORE$b  Add an ignore to someone's account.",
                 " $bODELIGNORE$b  Remove an ignore from someone's account.",
                 " $bMERGEDB$b     Load a database into memory."
@@ -175,15 +181,17 @@
 
 "OUNREGISTER" {
         "/services/nickserv/disable_nicks" (
-        "/msg $N OUNREGISTER <nick|*account>",
+        "/msg $N OUNREGISTER <nick|*account> [FORCE]",
         "Un-registers the specified account.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
+        "Without FORCE only accounts that are inactive and have no special flags can be unregistered.",
         "$uSee Also:$u oregister"
         );
         "!/services/nickserv/disable_nicks" (
-        "/msg $N OUNREGISTER <nick|*account>",
+        "/msg $N OUNREGISTER <nick|*account> [FORCE]",
         "Un-registers the specified account, and any nicks that have been registered to that account.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
+        "Without FORCE only accounts that are inactive and have no special flags can be unregistered.",
         "$uSee Also:$u oregister, oregnick, ounregnick"
         );
 };
@@ -328,9 +336,8 @@
 
 "AUTH" {
         "/services/nickserv/email_enabled" (
-        "/msg $N@$s AUTH [account] <password>",
+        "/msg $N@$s AUTH <account> <password>",
         "Authenticates yourself with $b$N$b to the specified account. You must use $bauth$b before you have any access to network services, including channels that are registered with $b$C$b.",
-        "If you omit the account, it uses your current nick as your account name.",
         "$uSee Also:$u pass, resetpass, authcookie",
         );
         "!/services/nickserv/email_enabled" (
@@ -382,24 +389,24 @@
         "$uSee Also:$u oaddmask");
 "OREGISTER" {
         "/services/nickserv/disable_nicks" {
-                "/services/nickserv/email_enabled" (
+                "/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> <email> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u ounregister, oaddmask, oset"
                 );
-                "!/services/nickserv/email_enabled" (
+                "!/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u ounregister, oaddmask, oset"
                 );
         };
         "!/services/nickserv/disable_nicks" {
-                "/services/nickserv/email_enabled" (
+                "/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> <email> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u oregnick, ounregister, ounregnick, oaddmask, oset"
                 );
-                "!/services/nickserv/email_enabled" (
+                "!/services/nickserv/email_required" (
                 "/msg $N@$s OREGISTER <account> <password> [user@host] [nick]",
                 "Registers an account for nick with $b$N$b using the specified account name, password, email address and user@host. If the nick of an online user is specified, then they will be logged in, and that user's user@host is used if you don't specify one.  If no nickname or hostmask is used, it uses a default hostmask, or adds one when they first authenticate.",
                 "$uSee Also:$u oregnick, ounregister, ounregnick, oaddmask, oset"
@@ -414,7 +421,7 @@
           "$bLEVEL$b: Sets $O access level.",
           "$bEPITHET$b: The description shown for the user's access in /whois.",
           "$bNOTE$b: Adds a note to the user's account.",
-          "$bTITLE$b: The title the user will get (in there hostname) when +x.",
+          "$bTITLE$b: The title the user will get (in their hostname) when +x.",
           "$bFAKEHOST$b: The fake hostname the user will get when +x.",
           "..or anything $bset$b can change.",
           "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
@@ -424,7 +431,7 @@
 "ODELCOOKIE" {
         "/services/nickserv/email_enabled" (
         "/msg $N ODELCOOKIE <nick|*account>",
-        "Requests that $N cancels the cookie of the specified account.",
+        "Requests that $N cancel the cookie of the specified account.",
         );
 };
 
@@ -544,12 +551,12 @@
         "$uSee Also:$u accountinfo, nickinfo, userinfo"
         );
 };
-"SET LANGUAGE" ("/msg $S SET LANGUAGE <langname>",
+"SET LANGUAGE" ("/msg $N SET LANGUAGE <langname>",
         "Sets the language that $S and other services will use when sending you messages.",
         "If a particular message is not available in your language, it will use the closest match it has.",
         "Supported languages are: ${modcmd:languages}",
         "$uSee Also:$u set");
-"SET STYLE" ("/msg $S SET STYLE <style>",
+"SET STYLE" ("/msg $N SET STYLE <style>",
         "Sets the output style that $S and other services will use when sending you messages.",
         "The style can be:.",
         "   Normal    - userlist has ----- seprators and does not show numeric levels.",
@@ -605,6 +612,7 @@
         "  SEEN       - Accounts not seen for at least this long",
         "  ACCOUNTMASK - A glob that must match the account name",
         "  EMAIL      - A glob that must match the account's email address",
+        "  TITLE      - A glob that must match the account's title",
         "  HOSTMASK SUPERSET - Account matches if someone with this hostmask can auth to the account",
         "  HOSTMASK EXACT - Account matches if this exact hostmask is in list",
         "  HOSTMASK SUBSET - Account matches if this mask \"covers\" one in their userlist",
@@ -622,6 +630,7 @@
         "  SEEN       - Accounts not seen for at least this long",
         "  ACCOUNTMASK - A glob that must match the account name",
         "  EMAIL      - A glob that must match the account's email address",
+        "  TITLE      - A glob that must match the account's title",
         "  NICKMASK   - A glob that must match a nick registered to the account",
         "  HOSTMASK SUPERSET - Account matches if someone with this hostmask can auth to the account",
         "  HOSTMASK EXACT - Account matches if this exact hostmask is in list",
@@ -674,3 +683,22 @@
         "Removes a hostmask from the specified account's ignore list.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
         "$uSee Also:$u oaddignore");
+
+"ADDSSLFP" ("/msg $N ADDSSLFP [fingerprint]",
+        "Adds the specified SSL fingerprint to the account you are authenticated to with $b$N$b.  If no SSL fingerprint is given, it uses your current SSL fingerprint if available.",
+        "$uSee Also:$u auth, delsslfp");
+
+"DELSSLFP" ("/msg $N DELSSLFP [fingerprint]",
+        "Removes the specified SSL fingerprint to the account you are authenticated to with $b$N$b.  If no SSL fingerprint is given, it uses your current SSL fingerprint if available.",
+        "$uSee Also:$u addsslfp");
+
+"OADDSSLFP" ("/msg $N OADDSSLFP <nick|*account> <fingerprint>",
+        "Adds an SSL fingerprint to the specified account.",
+        "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
+        "$uSee Also:$u odelsslfp");
+
+"ODELSSLFP" ("/msg $N ODELSSLFP <nick|*account> <fingerprint>",
+        "Removes an SSL fingerprint from the specified account.",
+        "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
+        "$uSee Also:$u oaddsslfp");
+