diff options
| -rw-r--r-- | ReleaseNotes.adoc | 9 | ||||
| -rw-r--r-- | src/plugins/trigger/trigger-config.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index 897e8f75d..f9aeaef21 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -23,13 +23,14 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] [[v2.2_default_triggers]] === Default triggers -The existing trigger "cmd_pass" has been updated to hide password in command -`/msg nickserv set password`. +The existing triggers "cmd_pass" and "msg_auth" have been updated to hide +password in command `/msg nickserv set password` and support the option +`-server xxx`. -You can restore the default trigger with the following command: +You can restore the default triggers with the following command: ---- -/trigger restore cmd_pass +/trigger restore cmd_pass msg_auth ---- [[v2.2_irc_signals_tags]] diff --git a/src/plugins/trigger/trigger-config.c b/src/plugins/trigger/trigger-config.c index 8e4ae926a..d12d449fd 100644 --- a/src/plugins/trigger/trigger-config.c +++ b/src/plugins/trigger/trigger-config.c @@ -79,7 +79,7 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] = "5000|input_text_display;5000|history_add;5000|irc_command_auth", "", "==^(" - "(/(msg|m|quote) +nickserv " + "(/(msg|m|quote) +(-server +[^ ]+ +)?nickserv " "+(id|identify|set +password|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+|" "recover +[^ ]+) +)|" "/oper +[^ ]+ +|" @@ -112,8 +112,8 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] = "modifier", "5000|irc_message_auth", "", - "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+|" - "recover +[^ ]+) +)(.*)" + "==^(.*(id|identify|set +password|register|ghost +[^ ]+|release +[^ ]+|" + "regain +[^ ]+|recover +[^ ]+) +)(.*)" "==${re:1}${hide:*,${re:+}}", "", "", |