GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow adding channels as factoid adlib modifier

This commit is contained in:
Pragmatic Software 2015-10-05 02:11:52 -07:00
parent 2c59908ee8
commit 54b8750d1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/Factoids.pm
View File

@ -356,7 +356,7 @@ sub find_factoid {
sub expand_factoid_vars { sub expand_factoid_vars {
my ($self, $from, $action) = @_; my ($self, $from, $action) = @_;
while ($action =~ /(?<!\\)\$([a-zA-Z0-9_:\-]+)/g) { while ($action =~ /(?<!\\)\$([a-zA-Z0-9_:\-#]+)/g) {
my $v = $1; my $v = $1;
next if $v =~ m/^(nick|channel|randomnick|args|arg\[.+\])$/; # don't override special variables next if $v =~ m/^(nick|channel|randomnick|args|arg\[.+\])$/; # don't override special variables
@ -365,7 +365,7 @@ sub expand_factoid_vars {
$modifier = $1; $modifier = $1;
} }
if ($modifier =~ m/^:(#.*|global)$/i) { if ($modifier =~ m/^:(#[^:]+|global)/i) {
$from = $1; $from = $1;
$from = '.*' if lc $from eq 'global'; $from = '.*' if lc $from eq 'global';
} }

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 1268, BUILD_REVISION => 1269,
BUILD_DATE => "2015-10-05", BUILD_DATE => "2015-10-05",
}; };