diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2023-05-16 21:34:30 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2023-05-16 21:34:30 +0200 |
| commit | 6d32a99d50e8dc6235bcf9b90cfdc3bc69424a9d (patch) | |
| tree | 0193db3cfac1ade1ac677b6334ef7f49d30d4cc8 /src | |
| parent | 1f21cdc0bd89a326fc7e682c5de0b433846a48de (diff) | |
| download | weechat-6d32a99d50e8dc6235bcf9b90cfdc3bc69424a9d.zip | |
trigger: make default triggers compatible with multiline input (closes #1935)
Changed triggers:
- cmd_pass
- cmd_pass_register
- server_pass
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/trigger/trigger-config.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/trigger/trigger-config.c b/src/plugins/trigger/trigger-config.c index a430ba9d8..700febc26 100644 --- a/src/plugins/trigger/trigger-config.c +++ b/src/plugins/trigger/trigger-config.c @@ -99,21 +99,21 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] = "5000|input_text_display;5000|history_add;5000|irc_command_auth", "", "s==^(" - "(/(msg|m|quote) +(-server +[^ ]+ +)?nickserv +(" + "(/(msg|m|quote) +(-server +[^ \\n]+ +)?nickserv +(" "id|" "identify|" "set +password|" - "ghost +[^ ]+|" - "release +[^ ]+|" - "regain +[^ ]+|" - "recover +[^ ]+|" - "setpass +[^ ]+" + "ghost +[^ \\n]+|" + "release +[^ \\n]+|" + "regain +[^ \\n]+|" + "recover +[^ \\n]+|" + "setpass +[^ \\n]+" ") +)|" - "/oper +[^ ]+ +|" + "/oper +[^ \\n]+ +|" "/quote +pass +|" - "/secure +(passphrase|decrypt|set +[^ ]+) +" + "/secure +(passphrase|decrypt|set +[^ \\n]+) +" ")" - "(.*)" + "([^\\n]*)" "==${re:1}${hide:*,${re:+}}", "", "", @@ -126,7 +126,8 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] = "modifier", "5000|input_text_display;5000|history_add;5000|irc_command_auth", "", - "s==^(/(msg|m|quote) +(-server +[^ ]+ +)?nickserv +register +)([^ ]+)(.*)" + "s==^(/(msg|m|quote) +(-server +[^ \\n]+ +)?nickserv +register +)" + "([^ \\n]+)([^\\n]*)" "==${re:1}${hide:*,${re:4}}${re:5}", "", "", @@ -172,7 +173,7 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] = "modifier", "5000|input_text_display;5000|history_add", "", - "s==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)" + "s==^(/(server|connect) [^\\n]*-(sasl_)?password=)([^ \\n]+)([^\\n]*)" "==${re:1}${hide:*,${re:4}}${re:5}" "", "", |