From 45e19c655dbc5edd733d574b53384ffcc8655d78 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Tue, 11 Sep 2018 22:53:35 +1200 Subject: Map: Allow currying, fix bug with comma parsing --- Plugin/Map.pm | 4 ++-- TODO | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Plugin/Map.pm b/Plugin/Map.pm index fb37e64..665f41f 100644 --- a/Plugin/Map.pm +++ b/Plugin/Map.pm @@ -46,7 +46,7 @@ sub parse_list { $nest--; } - if ($c eq "," || ($nest == 0 and $c eq "]")) { + if (($nest == 1 and $c eq ",") || ($nest == 0 and $c eq "]")) { my $item = substr($input, $item_i, $i - $item_i); $item =~ s/^\s+|\s+$//g; push @res, $item; @@ -66,7 +66,7 @@ sub parse_list { sub map { my ($self, $irc, $logger, $who, $where, $rest, @arguments) = @_; - my ($command, $subjects_raw) = ($rest =~ /^(.+?)\s+(.*)$/); + my ($command, $subjects_raw) = ($rest =~ /^(.+)\s+(\[.*\])$/); return "Syntax: map command [item1, item2, ...]" unless $command and $subjects_raw; diff --git a/TODO b/TODO index 74b0cb7..a986fc8 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -* add currying support to Map.pm * add section to config file for each module + allow whitelisting and blacklisting under each module, per-channel e.g. "use url_title everywhere except channel ##bar where a bot already -- cgit v1.1