3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 03:02:48 +01:00

Merge pull request #533 from slingamn/issue407

fix #407
This commit is contained in:
Daniel Oaks 2019-05-29 19:55:13 +10:00 committed by GitHub
commit 6b51bd6f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 73 additions and 18 deletions

View File

@ -590,7 +590,7 @@ func capHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo
rb.Add(nil, server.name, "CAP", details.nick, "NAK", capString)
return false
} else if toAdd.Has(caps.Nope) && !client.registered {
client.Quit(client.t("Requesting the oragono.io/nope CAP is forbidden"), rb.session)
client.Quit(fmt.Sprintf(client.t("Requesting the %s client capability is forbidden"), caps.Nope.Name()), rb.session)
return true
}

View File

@ -1,4 +1,8 @@
{
"$bAMODE$b modifies persistent mode settings for channel members.": "$bAMODE$b modifies persistent mode settings for channel members.",
"$bOP$b makes the given user (or yourself) a channel admin.": "$bOP$b makes the given user (or yourself) a channel admin.",
"$bREGISTER$b lets you own a given channel.": "$bREGISTER$b lets you own a given channel.",
"$bUNREGISTER$b deletes a channel registration.": "$bUNREGISTER$b deletes a channel registration.",
"ChanServ lets you register and manage channels.\n\nTo see in-depth help for a specific ChanServ command, try:\n $b/CS HELP <command>$b\n\nHere are the commands you can use:\n%s": "ChanServ lets you register and manage channels.\n\nTo see in-depth help for a specific ChanServ command, try:\n $b/CS HELP <command>$b\n\nHere are the commands you can use:\n%s",
"Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.": "Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.",
"Syntax: $bOP #channel [nickname]$b\n\nOP makes the given nickname, or yourself, a channel admin. You can only use\nthis command if you're the founder of the channel.": "Syntax: $bOP #channel [nickname]$b\n\nOP makes the given nickname, or yourself, a channel admin. You can only use\nthis command if you're the founder of the channel.",

View File

@ -8,6 +8,7 @@
"AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.": "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.",
"AUTHENTICATE\n\nUsed during SASL authentication. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/extensions/sasl-3.1.html": "AUTHENTICATE\n\nUsed during SASL authentication. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/extensions/sasl-3.1.html",
"AWAY [message]\n\nIf [message] is sent, marks you away. If [message] is not sent, marks you no\nlonger away.": "AWAY [message]\n\nIf [message] is sent, marks you away. If [message] is not sent, marks you no\nlonger away.",
"BRB [message]\n\nDisconnects you from the server, while instructing the server to keep you\npresent for a short time window. During this window, you can either resume\nor reattach to your nickname. If [message] is sent, it is used as your away\nmessage (and as your quit message if you don't return in time).": "BRB [message]\n\nDisconnects you from the server, while instructing the server to keep you\npresent for a short time window. During this window, you can either resume\nor reattach to your nickname. If [message] is sent, it is used as your away\nmessage (and as your quit message if you don't return in time).",
"CAP <subcommand> [:<capabilities>]\n\nUsed in capability negotiation. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/core/capability-negotiation-3.1.html\nhttp://ircv3.net/specs/core/capability-negotiation-3.2.html": "CAP <subcommand> [:<capabilities>]\n\nUsed in capability negotiation. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/core/capability-negotiation-3.1.html\nhttp://ircv3.net/specs/core/capability-negotiation-3.2.html",
"CHANSERV <subcommand> [params]\n\nChanServ controls channel registrations.": "CHANSERV <subcommand> [params]\n\nChanServ controls channel registrations.",
"CHATHISTORY [params]\n\nCHATHISTORY is an experimental history replay command. See these documents:\nhttps://github.com/MuffinMedic/ircv3-specifications/blob/chathistory/extensions/chathistory.md\nhttps://gist.github.com/DanielOaks/c104ad6e8759c01eb5c826d627caf80d": "CHATHISTORY [params]\n\nCHATHISTORY is an experimental history replay command. See these documents:\nhttps://github.com/MuffinMedic/ircv3-specifications/blob/chathistory/extensions/chathistory.md\nhttps://gist.github.com/DanielOaks/c104ad6e8759c01eb5c826d627caf80d",
@ -66,5 +67,6 @@
"WEBIRC <password> <gateway> <hostname> <ip> [:<flags>]\n\nUsed by web<->IRC gateways and bouncers, the WEBIRC command allows gateways to\npass-through the real IP addresses of clients:\nircv3.net/specs/extensions/webirc.html\n\n<flags> is a list of space-separated strings indicating various details about\nthe connection from the client to the gateway, such as:\n\n- tls: this flag indicates that the client->gateway connection is secure": "WEBIRC <password> <gateway> <hostname> <ip> [:<flags>]\n\nUsed by web<->IRC gateways and bouncers, the WEBIRC command allows gateways to\npass-through the real IP addresses of clients:\nircv3.net/specs/extensions/webirc.html\n\n<flags> is a list of space-separated strings indicating various details about\nthe connection from the client to the gateway, such as:\n\n- tls: this flag indicates that the client->gateway connection is secure",
"WHO <name> [o]\n\nReturns information for the given user.": "WHO <name> [o]\n\nReturns information for the given user.",
"WHOIS <client>{,<client>}\n\nReturns information for the given user(s).": "WHOIS <client>{,<client>}\n\nReturns information for the given user(s).",
"WHOWAS <nickname>\n\nReturns historical information on the last user with the given nickname.": "WHOWAS <nickname>\n\nReturns historical information on the last user with the given nickname."
"WHOWAS <nickname>\n\nReturns historical information on the last user with the given nickname.": "WHOWAS <nickname>\n\nReturns historical information on the last user with the given nickname.",
"ZNC <module> [params]\n\nUsed to emulate features of the ZNC bouncer. This command is not intended\nfor direct use by end users.": "ZNC <module> [params]\n\nUsed to emulate features of the ZNC bouncer. This command is not intended\nfor direct use by end users."
}

View File

@ -1,4 +1,13 @@
{
"$bAPPROVE$b approves a user's vhost request.": "$bAPPROVE$b approves a user's vhost request.",
"$bDEL$b deletes a user's vhost.": "$bDEL$b deletes a user's vhost.",
"$bOFF$b disables your vhost, if you have one approved.": "$bOFF$b disables your vhost, if you have one approved.",
"$bON$b enables your vhost, if you have one approved.": "$bON$b enables your vhost, if you have one approved.",
"$bREJECT$b rejects a user's vhost request.": "$bREJECT$b rejects a user's vhost request.",
"$bREQUEST$b requests a new vhost, pending operator approval.": "$bREQUEST$b requests a new vhost, pending operator approval.",
"$bSET$b sets a user's vhost.": "$bSET$b sets a user's vhost.",
"$bSTATUS$b shows your vhost and request status.": "$bSTATUS$b shows your vhost and request status.",
"$bWAITING$b shows a list of pending vhost requests.": "$bWAITING$b shows a list of pending vhost requests.",
"HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).\n\nTo see in-depth help for a specific HostServ command, try:\n $b/HS HELP <command>$b\n\nHere are the commands you can use:\n%s": "HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).\n\nTo see in-depth help for a specific HostServ command, try:\n $b/HS HELP <command>$b\n\nHere are the commands you can use:\n%s",
"Syntax: $bAPPROVE <user>$b\n\nAPPROVE approves a user's vhost request.": "Syntax: $bAPPROVE <user>$b\n\nAPPROVE approves a user's vhost request.",
"Syntax: $bDEL <user>$b\n\nDEL deletes a user's vhost.": "Syntax: $bDEL <user>$b\n\nDEL deletes a user's vhost.",
@ -8,5 +17,5 @@
"Syntax: $bREQUEST <vhost>$b\n\nREQUEST requests that a new vhost by assigned to your account. The request must\nthen be approved by a server operator.": "Syntax: $bREQUEST <vhost>$b\n\nREQUEST requests that a new vhost by assigned to your account. The request must\nthen be approved by a server operator.",
"Syntax: $bSET <user> <vhost>$b\n\nSET sets a user's vhost, bypassing the request system.": "Syntax: $bSET <user> <vhost>$b\n\nSET sets a user's vhost, bypassing the request system.",
"Syntax: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and the status of your most recent\nrequest for a new one. A server operator can view someone else's status.": "Syntax: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and the status of your most recent\nrequest for a new one. A server operator can view someone else's status.",
"Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected.": "Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected."
"Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected.": "Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected.",
}

View File

@ -37,14 +37,16 @@
"An error occurred": "An error occurred",
"Authentication successful": "Authentication successful",
"Bad or unauthorized PROXY command": "Bad or unauthorized PROXY command",
"Bad password": "Bad password",
"Ban - %[1]s - added by %[2]s - %[3]s": "Ban - %[1]s - added by %[2]s - %[3]s",
"Bouncer functionality is currently disabled for your account": "Bouncer functionality is currently disabled for your account",
"Bouncer functionality is currently disabled for your account, but you can opt in": "Bouncer functionality is currently disabled for your account, but you can opt in",
"Bouncer functionality is currently enabled for your account": "Bouncer functionality is currently enabled for your account",
"Bouncer functionality is currently enabled for your account, but you can opt out": "Bouncer functionality is currently enabled for your account, but you can opt out",
"CTCP messages are disabled over Tor": "CTCP messages are disabled over Tor",
"Can't change modes for other users": "Can't change modes for other users",
"Can't view modes for other users": "Can't view modes for other users",
"Cannot join channel (+%s)": "Cannot join channel (+%s)",
"Cannot rename channel": "Cannot rename channel",
"Cannot resume a client with multiple attached sessions": "Cannot resume a client with multiple attached sessions",
"Cannot resume connection": "Cannot resume connection",
"Cannot resume connection from Tor to non-Tor or vice versa": "Cannot resume connection from Tor to non-Tor or vice versa",
"Cannot resume connection, connection registration has already been completed": "Cannot resume connection, connection registration has already been completed",
@ -87,17 +89,19 @@
"End of WHO list": "End of WHO list",
"End of WHOWAS": "End of WHOWAS",
"End of list": "End of list",
"Enforcement method set": "Enforcement method set",
"Erroneous nickname": "Erroneous nickname",
"Error loading account data": "Error loading account data",
"Error reserving nickname": "Error reserving nickname",
"Error while unregistering account": "Error while unregistering account",
"Fake source must be a valid nickname": "Fake source must be a valid nickname",
"First param must be a mask or channel": "First param must be a mask or channel",
"GHOSTed by %s": "GHOSTed by %s",
"Given current server settings, your nickname is enforced with: %s": "Given current server settings, your nickname is enforced with: %s",
"HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.",
"Help not found": "Help not found",
"Hostname: %s": "Hostname: %s",
"I have %[1]d clients and %[2]d servers": "I have %[1]d clients and %[2]d servers",
"I'll be right back": "I'll be right back",
"IP address: %s": "IP address: %s",
"IRC Operators online": "IRC Operators online",
"Input line too long": "Input line too long",
@ -107,7 +111,6 @@
"Invalid CAP subcommand": "Invalid CAP subcommand",
"Invalid account name": "Invalid account name",
"Invalid mode change": "Invalid mode change",
"Invalid parameters": "Invalid parameters",
"Invalid parameters. For usage, do /msg %[1]s HELP %[2]s": "Invalid parameters. For usage, do /msg %[1]s HELP %[2]s",
"Invalid vhost": "Invalid vhost",
"It was rejected for reason: %s": "It was rejected for reason: %s",
@ -130,11 +133,14 @@
"No nickname given": "No nickname given",
"No such account": "No such account",
"No such channel": "No such channel",
"No such module [%s]": "No such module [%s]",
"No such nick": "No such nick",
"No such setting": "No such setting",
"No topic is set": "No topic is set",
"Not enough parameters": "Not enough parameters",
"Only channel founders can change registered channels": "Only channel founders can change registered channels",
"Only the channel founder can do this": "Only the channel founder can do this",
"Oragono does not emulate the ZNC module %s": "Oragono does not emulate the ZNC module %s",
"Oragono is released under the MIT license.": "Oragono is released under the MIT license.",
"Passphrase contains forbidden characters or is otherwise invalid": "Passphrase contains forbidden characters or is otherwise invalid",
"Password changed": "Password changed",
@ -147,13 +153,12 @@
"Received malformed line": "Received malformed line",
"Registered at: %s": "Registered at: %s",
"Registered channel: %s": "Registered channel: %s",
"Registering your account with email address %s": "Registering your account with email address %s",
"Registering your account with no email address": "Registering your account with no email address",
"Registration requires a valid e-mail address": "Registration requires a valid e-mail address",
"Rehashing": "Rehashing",
"Remote servers not yet supported": "Remote servers not yet supported",
"Removed D-Line for %s": "Removed D-Line for %s",
"Removed K-Line for %s": "Removed K-Line for %s",
"Requesting the %s client capability is forbidden": "Requesting the %s client capability is forbidden",
"Resume may have lost up to %d seconds of history": "Resume may have lost up to %d seconds of history",
"SASL authentication aborted": "SASL authentication aborted",
"SASL authentication failed": "SASL authentication failed",
@ -168,6 +173,7 @@
"Session %d:": "Session %d:",
"Some additional message history may have been lost": "Some additional message history may have been lost",
"Successfully approved vhost request for %s": "Successfully approved vhost request for %s",
"Successfully changed your account settings": "Successfully changed your account settings",
"Successfully cleared vhost": "Successfully cleared vhost",
"Successfully disabled your vhost": "Successfully disabled your vhost",
"Successfully enabled your vhost": "Successfully enabled your vhost",
@ -190,10 +196,12 @@
"This ban matches you. To DLINE yourself, you must use the command: /DLINE MYSELF <arguments>": "This ban matches you. To DLINE yourself, you must use the command: /DLINE MYSELF <arguments>",
"This ban matches you. To KLINE yourself, you must use the command: /KLINE MYSELF <arguments>": "This ban matches you. To KLINE yourself, you must use the command: /KLINE MYSELF <arguments>",
"This command has been disabled by the server administrators": "This command has been disabled by the server administrators",
"This feature has been disabled by the server administrators": "This feature has been disabled by the server administrators",
"This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.": "This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.",
"This server was created %s": "This server was created %s",
"This vhost is currently disabled, but can be enabled with /HS ON": "This vhost is currently disabled, but can be enabled with /HS ON",
"Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it": "Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it",
"To change a password, use the PASSWD command. For details, /msg NickServ HELP PASSWD": "To change a password, use the PASSWD command. For details, /msg NickServ HELP PASSWD",
"To confirm account unregistration, type: /NS UNREGISTER %[1]s %[2]s": "To confirm account unregistration, type: /NS UNREGISTER %[1]s %[2]s",
"To confirm channel unregistration, type: /CS UNREGISTER %[1]s %[2]s": "To confirm channel unregistration, type: /CS UNREGISTER %[1]s %[2]s",
"To verify your account, issue one of these commands:": "To verify your account, issue one of these commands:",
@ -219,29 +227,35 @@
"You have been banned from this server (%s)": "You have been banned from this server (%s)",
"You have been marked as being away": "You have been marked as being away",
"You have joined too many channels": "You have joined too many channels",
"You have sent too many registration messages": "You have sent too many registration messages",
"You have too many nicks reserved already (you can remove some with /NS DROP)": "You have too many nicks reserved already (you can remove some with /NS DROP)",
"You may not reregister": "You may not reregister",
"You must be an oper on the channel to register it": "You must be an oper on the channel to register it",
"You must be connected with TLS and a client certificate to do this": "You must be connected with TLS and a client certificate to do this",
"You must be registered to join that channel": "You must be registered to join that channel",
"You must connect with a TLS client certificate to use certfp": "You must connect with a TLS client certificate to use certfp",
"You must log in with SASL to join this server": "You must log in with SASL to join this server",
"You must specify an account": "You must specify an account",
"You must wait an additional %v before making another request": "You must wait an additional %v before making another request",
"You need to either supply a passphrase or be connected via TLS with a client cert": "You need to either supply a passphrase or be connected via TLS with a client cert",
"You need to register before you can use that command": "You need to register before you can use that command",
"You specified too many languages": "You specified too many languages",
"You will not see JOINs and PARTs in autoreplayed history lines": "You will not see JOINs and PARTs in autoreplayed history lines",
"You will receive %d lines of autoreplayed history": "You will receive %d lines of autoreplayed history",
"You will receive the server default of %d lines of autoreplayed history": "You will receive the server default of %d lines of autoreplayed history",
"You will see JOINs and PARTs in autoreplayed history lines": "You will see JOINs and PARTs in autoreplayed history lines",
"You're already logged into an account": "You're already logged into an account",
"You're already opered-up!": "You're already opered-up!",
"You're not a channel operator": "You're not a channel operator",
"You're not logged into an account": "You're not logged into an account",
"You're not on that channel": "You're not on that channel",
"You're now logged in as %s": "You're now logged in as %s",
"Your current nickname enforcement is: %s": "Your current nickname enforcement is: %s",
"Your client does not support BRB": "Your client does not support BRB",
"Your host is %[1]s, running version %[2]s": "Your host is %[1]s, running version %[2]s",
"Your stored nickname enforcement setting is: %s": "Your stored nickname enforcement setting is: %s",
"Your vhost request was approved by an administrator": "Your vhost request was approved by an administrator",
"Your vhost request was rejected by an administrator. The reason given was: %s": "Your vhost request was rejected by an administrator. The reason given was: %s",
"Your vhost request will be reviewed by an administrator": "Your vhost request will be reviewed by an administrator",
"are supported by this server": "are supported by this server",
"can speak these languages": "can speak these languages",
"channels formed": "channels formed",
"has client certificate fingerprint %s": "has client certificate fingerprint %s",
"is a $bBot$b on %s": "is a $bBot$b on %s",

View File

@ -1,16 +1,42 @@
{
"$bAUTOREPLAY-JOINS$b\n'autoreplay-joins' controls whether autoreplayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'on' and 'off'.": "$bAUTOREPLAY-JOINS$b\n'autoreplay-joins' controls whether autoreplayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'on' and 'off'.",
"$bAUTOREPLAY-LINES$b\n'autoreplay-lines' controls the number of lines of channel history that will\nbe replayed to you automatically when joining a channel. Your options are any\npositive number, 0 to disable the feature, and 'default' to use the server\ndefault.": "$bAUTOREPLAY-LINES$b\n'autoreplay-lines' controls the number of lines of channel history that will\nbe replayed to you automatically when joining a channel. Your options are any\npositive number, 0 to disable the feature, and 'default' to use the server\ndefault.",
"$bBOUNCER$b\nIf 'bouncer' is enabled and you are already logged in and using a nick, a\nsecond client of yours that authenticates with SASL and requests the same nick\nis allowed to attach to the nick as well (this is comparable to the behavior\nof IRC \"bouncers\" like ZNC). Your options are 'on' (allow this behavior),\n'off' (disallow it), and 'default' (use the server default value).": "$bBOUNCER$b\nIf 'bouncer' is enabled and you are already logged in and using a nick, a\nsecond client of yours that authenticates with SASL and requests the same nick\nis allowed to attach to the nick as well (this is comparable to the behavior\nof IRC \"bouncers\" like ZNC). Your options are 'on' (allow this behavior),\n'off' (disallow it), and 'default' (use the server default value).",
"$bDROP$b de-links your current (or the given) nickname from your user account.": "$bDROP$b de-links your current (or the given) nickname from your user account.",
"$bENFORCE$b\n'enforce' lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none' [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n or else they will be renamed]\n3. 'strict' [you must already be authenticated to use the nick]\n4. 'default' [use the server default]": "$bENFORCE$b\n'enforce' lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none' [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n or else they will be renamed]\n3. 'strict' [you must already be authenticated to use the nick]\n4. 'default' [use the server default]",
"$bGET$b queries the current values of your account settings": "$bGET$b queries the current values of your account settings",
"$bGHOST$b reclaims your nickname.": "$bGHOST$b reclaims your nickname.",
"$bGROUP$b links your current nickname to your user account.": "$bGROUP$b links your current nickname to your user account.",
"$bIDENTIFY$b lets you login to your account.": "$bIDENTIFY$b lets you login to your account.",
"$bINFO$b gives you information on a user account.": "$bINFO$b gives you information on a user account.",
"$bPASSWD$b lets you change your password.": "$bPASSWD$b lets you change your password.",
"$bREGISTER$b lets you register a user account.": "$bREGISTER$b lets you register a user account.",
"$bSADROP$b forcibly de-links the given nickname from its user account.": "$bSADROP$b forcibly de-links the given nickname from its user account.",
"$bSAGET$b queries the current values of another user's account settings": "$bSAGET$b queries the current values of another user's account settings",
"$bSAREGISTER$b registers an account on someone else's behalf.": "$bSAREGISTER$b registers an account on someone else's behalf.",
"$bSASET$b modifies another user's account settings": "$bSASET$b modifies another user's account settings",
"$bSESSIONS$b lists the sessions attached to a nickname.": "$bSESSIONS$b lists the sessions attached to a nickname.",
"$bSET$b modifies your account settings": "$bSET$b modifies your account settings",
"$bUNREGISTER$b lets you delete your user account.": "$bUNREGISTER$b lets you delete your user account.",
"$bVERIFY$b lets you complete account registration.": "$bVERIFY$b lets you complete account registration.",
"Invalid parameters": "Invalid parameters",
"NickServ lets you register and login to an account.\n\nTo see in-depth help for a specific NickServ command, try:\n $b/NS HELP <command>$b\n\nHere are the commands you can use:\n%s": "NickServ lets you register and login to an account.\n\nTo see in-depth help for a specific NickServ command, try:\n $b/NS HELP <command>$b\n\nHere are the commands you can use:\n%s",
"Syntax $bSET <setting> <value>$b\n\nSet modifies your account settings. The following settings are available:": "Syntax $bSET <setting> <value>$b\n\nSet modifies your account settings. The following settings are available:",
"Syntax: $bDROP [nickname]$b\n\nDROP de-links the given (or your current) nickname from your user account.": "Syntax: $bDROP [nickname]$b\n\nDROP de-links the given (or your current) nickname from your user account.",
"Syntax: $bENFORCE [method]$b\n\nENFORCE lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none' [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n or else they will be renamed]\n3. 'strict' [you must already be authenticated to use the nick]\n4. 'default' [use the server default]\nWith no arguments, queries your current enforcement status.": "Syntax: $bENFORCE [method]$b\n\nENFORCE lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none' [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n or else they will be renamed]\n3. 'strict' [you must already be authenticated to use the nick]\n4. 'default' [use the server default]\nWith no arguments, queries your current enforcement status.",
"Syntax: $bENFORCE [method]$b\n\nENFORCE is an alias for $bGET enforce$b and $bSET enforce$b. See the help\nentry for $bSET$b for more information.": "Syntax: $bENFORCE [method]$b\n\nENFORCE is an alias for $bGET enforce$b and $bSET enforce$b. See the help\nentry for $bSET$b for more information.",
"Syntax: $bGET <setting>$b\n\nGET queries the current values of your account settings. For more information\non the settings and their possible values, see HELP SET.": "Syntax: $bGET <setting>$b\n\nGET queries the current values of your account settings. For more information\non the settings and their possible values, see HELP SET.",
"Syntax: $bGHOST <nickname>$b\n\nGHOST disconnects the given user from the network if they're logged in with the\nsame user account, letting you reclaim your nickname.": "Syntax: $bGHOST <nickname>$b\n\nGHOST disconnects the given user from the network if they're logged in with the\nsame user account, letting you reclaim your nickname.",
"Syntax: $bGROUP$b\n\nGROUP links your current nickname with your logged-in account, so other people\nwill not be able to use it.": "Syntax: $bGROUP$b\n\nGROUP links your current nickname with your logged-in account, so other people\nwill not be able to use it.",
"Syntax: $bIDENTIFY <username> [password]$b\n\nIDENTIFY lets you login to the given username using either password auth, or\ncertfp (your client certificate) if a password is not given.": "Syntax: $bIDENTIFY <username> [password]$b\n\nIDENTIFY lets you login to the given username using either password auth, or\ncertfp (your client certificate) if a password is not given.",
"Syntax: $bINFO [username]$b\n\nINFO gives you information about the given (or your own) user account.": "Syntax: $bINFO [username]$b\n\nINFO gives you information about the given (or your own) user account.",
"Syntax: $bPASSWD <current> <new> <new_again>$b\nOr: $bPASSWD <username> <new>$b\n\nPASSWD lets you change your account password. You must supply your current\npassword and confirm the new one by typing it twice. If you're an IRC operator\nwith the correct permissions, you can use PASSWD to reset someone else's\npassword by supplying their username and then the desired password.": "Syntax: $bPASSWD <current> <new> <new_again>$b\nOr: $bPASSWD <username> <new>$b\n\nPASSWD lets you change your account password. You must supply your current\npassword and confirm the new one by typing it twice. If you're an IRC operator\nwith the correct permissions, you can use PASSWD to reset someone else's\npassword by supplying their username and then the desired password.",
"Syntax: $bREGISTER <username> <email> [password]$b\n\nREGISTER lets you register a user account. If the server allows anonymous\nregistration, you can send an asterisk (*) as the email address.\n\nIf the password is left out, your account will be registered to your TLS client\ncertificate (and you will need to use that certificate to login in future).": "Syntax: $bREGISTER <username> <email> [password]$b\n\nREGISTER lets you register a user account. If the server allows anonymous\nregistration, you can send an asterisk (*) as the email address.\n\nIf the password is left out, your account will be registered to your TLS client\ncertificate (and you will need to use that certificate to login in future).",
"Syntax: $bREGISTER <password> [email]$b\n\nREGISTER lets you register your current nickname as a user account. If the\nserver allows anonymous registration, you can omit the e-mail address.\n\nIf you are currently logged in with a TLS client certificate and wish to use\nit instead of a password to log in, send * as the password.": "Syntax: $bREGISTER <password> [email]$b\n\nREGISTER lets you register your current nickname as a user account. If the\nserver allows anonymous registration, you can omit the e-mail address.\n\nIf you are currently logged in with a TLS client certificate and wish to use\nit instead of a password to log in, send * as the password.",
"Syntax: $bSADROP <nickname>$b\n\nSADROP forcibly de-links the given nickname from the attached user account.": "Syntax: $bSADROP <nickname>$b\n\nSADROP forcibly de-links the given nickname from the attached user account.",
"Syntax: $bSAGET <account> <setting>$b\n\nSAGET queries the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.": "Syntax: $bSAGET <account> <setting>$b\n\nSAGET queries the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.",
"Syntax: $bSAREGISTER <username> <password>$b\n\nSAREGISTER registers an account on someone else's behalf.\nThis is for use in configurations that require SASL for all connections;\nan administrator can set use this command to set up user accounts.": "Syntax: $bSAREGISTER <username> <password>$b\n\nSAREGISTER registers an account on someone else's behalf.\nThis is for use in configurations that require SASL for all connections;\nan administrator can set use this command to set up user accounts.",
"Syntax: $bSASET <account> <setting> <value>$b\n\nSASET modifies the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.": "Syntax: $bSASET <account> <setting> <value>$b\n\nSASET modifies the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.",
"Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS lists information about the sessions currently attached, via\nthe server's bouncer functionality, to your nickname. An administrator\ncan use this command to list another user's sessions.": "Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS lists information about the sessions currently attached, via\nthe server's bouncer functionality, to your nickname. An administrator\ncan use this command to list another user's sessions.",
"Syntax: $bUNREGISTER <username> [code]$b\n\nUNREGISTER lets you delete your user account (or someone else's, if you're an\nIRC operator with the correct permissions). To prevent accidental\nunregistrations, a verification code is required; invoking the command without\na code will display the necessary code.": "Syntax: $bUNREGISTER <username> [code]$b\n\nUNREGISTER lets you delete your user account (or someone else's, if you're an\nIRC operator with the correct permissions). To prevent accidental\nunregistrations, a verification code is required; invoking the command without\na code will display the necessary code.",
"Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification.": "Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification."
"Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification.": "Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification.",
"This nickname is reserved. Please login within %v (using $b/msg NickServ IDENTIFY <password>$b or SASL), or switch to a different nickname.": "This nickname is reserved. Please login within %v (using $b/msg NickServ IDENTIFY <password>$b or SASL), or switch to a different nickname.",
}

View File

@ -97,7 +97,7 @@ if __name__ == '__main__':
matches = re.findall(r'\`([^\`]+)\`', content)
for match in matches:
if '\n' in match and match not in help_strings:
if match not in help_strings:
help_strings.append(match)
print("nickserv help strings:", len(help_strings))
@ -120,7 +120,7 @@ if __name__ == '__main__':
matches = re.findall(r'\`([^\`]+)\`', content)
for match in matches:
if '\n' in match and match not in help_strings:
if match not in help_strings:
help_strings.append(match)
print("chanserv help strings:", len(help_strings))
@ -143,7 +143,7 @@ if __name__ == '__main__':
matches = re.findall(r'\`([^\`]+)\`', content)
for match in matches:
if '\n' in match and match not in help_strings:
if match not in help_strings:
help_strings.append(match)
print("hostserv help strings:", len(help_strings))