From 2f014ba2f051fda2120057fa28b8ad7c3e7302a7 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sat, 2 Sep 2017 00:14:13 -0700 Subject: [PATCH] Use /say on returns whose first word is a variable --- PBot/AntiFlood.pm | 8 +++--- PBot/BlackList.pm | 6 ++-- PBot/BotAdminCommands.pm | 2 +- PBot/FactoidCommands.pm | 62 ++++++++++++++++++++-------------------- PBot/Factoids.pm | 4 +-- PBot/MessageHistory.pm | 10 +++---- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm index c1651f64..2820cd78 100644 --- a/PBot/AntiFlood.pm +++ b/PBot/AntiFlood.pm @@ -184,9 +184,9 @@ sub whitelist { if (not defined $value) { $value = $self->{whitelist}->hash->{$channel}->{$mask}->{$flag}; if (not defined $value) { - return "$flag is not set."; + return "/say $flag is not set."; } else { - return "$flag is set to $value"; + return "/say $flag is set to $value"; } } @@ -229,7 +229,7 @@ sub whitelist { $self->{whitelist}->hash->{$channel}->{$mask}->{created_on} = gettimeofday; $self->{whitelist}->save; - return "$mask whitelisted in channel $channel"; + return "/say $mask whitelisted in channel $channel"; } when ("remove") { my ($channel, $mask) = split / /, $args, 2; @@ -246,7 +246,7 @@ sub whitelist { delete $self->{whitelist}->hash->{$channel}->{$mask}; delete $self->{whitelist}->hash->{$channel} if keys %{ $self->{whitelist}->hash->{$channel} } == 0; $self->{whitelist}->save; - return "$mask whitelist removed from channel $channel"; + return "/say $mask whitelist removed from channel $channel"; } default { return "Unknown command '$command'; commands are: list/show, add, remove"; diff --git a/PBot/BlackList.pm b/PBot/BlackList.pm index 6dd415ab..06c27517 100644 --- a/PBot/BlackList.pm +++ b/PBot/BlackList.pm @@ -203,7 +203,7 @@ sub blacklist { $self->{pbot}->{logger}->log("$nick!$user\@$host added [$mask] to blacklist for channel [$channel]\n"); $self->add($channel, $mask); - return "$mask blacklisted in channel $channel"; + return "/say $mask blacklisted in channel $channel"; } when("remove") { my ($mask, $channel) = split / /, $args, 2; @@ -213,12 +213,12 @@ sub blacklist { if(exists $self->{blacklist}->{$channel} and not exists $self->{blacklist}->{$channel}->{$mask}) { $self->{pbot}->{logger}->log("$nick attempt to remove nonexistent [$mask][$channel] from blacklist\n"); - return "$mask not found in blacklist for channel $channel (use `blacklist list` to display blacklist)"; + return "/say $mask not found in blacklist for channel $channel (use `blacklist list` to display blacklist)"; } $self->remove($channel, $mask); $self->{pbot}->{logger}->log("$nick!$user\@$host removed [$mask] from blacklist for channel [$channel]\n"); - return "$mask removed from blacklist for channel $channel"; + return "/say $mask removed from blacklist for channel $channel"; } default { return "Unknown command '$command'; commands are: list/show, add, remove"; diff --git a/PBot/BotAdminCommands.pm b/PBot/BotAdminCommands.pm index 265da55a..77e12ca4 100644 --- a/PBot/BotAdminCommands.pm +++ b/PBot/BotAdminCommands.pm @@ -261,7 +261,7 @@ sub evalcmd { } $ret =~ s/ at \(eval \d+\) line 1.//; } - return "$ret $result"; + return "/say $ret $result"; } sub reload { diff --git a/PBot/FactoidCommands.pm b/PBot/FactoidCommands.pm index bc465fba..40340d92 100644 --- a/PBot/FactoidCommands.pm +++ b/PBot/FactoidCommands.pm @@ -190,10 +190,10 @@ sub find_factoid_with_optional_channel { if (not @factoids or not $factoids[0]) { if ($needs_disambig) { - return "$from_trigger not found"; + return "/say $from_trigger not found"; } else { $from_chan = 'global channel' if $from_chan eq '.*'; - return "$from_trigger not found in $from_chan"; + return "/say $from_trigger not found in $from_chan"; } } @@ -209,7 +209,7 @@ sub find_factoid_with_optional_channel { } } if (not defined $channel) { - return "$from_trigger found in multiple channels: " . (join ', ', sort map { $_->[0] eq '.*' ? 'global' : $_->[0] } @factoids) . "; use `$command $from_trigger` to disambiguate."; + return "/say $from_trigger found in multiple channels: " . (join ', ', sort map { $_->[0] eq '.*' ? 'global' : $_->[0] } @factoids) . "; use `$command $from_trigger` to disambiguate."; } } else { foreach my $factoid (@factoids) { @@ -227,7 +227,7 @@ sub find_factoid_with_optional_channel { $from_chan = '.*' if $channel eq 'global'; if ($explicit and $channel =~ /^#/ and $from_chan =~ /^#/ and $channel ne $from_chan) { - return "$trigger belongs to $channel, not $from_chan. Please switch to or explicitly specify $channel."; + return "/say $trigger belongs to $channel, not $from_chan. Please switch to or explicitly specify $channel."; } return ($channel, $trigger, $remaining_args); @@ -579,7 +579,7 @@ sub factmove { } if($factoids->{$found_src_channel}->{$found_source}->{'locked'}) { - return "$found_source is locked; unlock before moving."; + return "/say $found_source is locked; unlock before moving."; } my ($found_target_channel, $found_target) = $self->{pbot}->{factoids}->find_factoid($target_channel, $target, undef, 1, 1); @@ -660,12 +660,12 @@ sub add_regex { if(defined $trigger) { $self->{pbot}->{logger}->log("$nick!$user\@$host attempt to overwrite $trigger\n"); - return "$trigger already exists for channel $channel."; + return "/say $trigger already exists for channel $channel."; } $self->{pbot}->{factoids}->add_factoid('regex', $from, "$nick!$user\@$host", $keyword, $text); $self->{pbot}->{logger}->log("$nick!$user\@$host added [$keyword] => [$text]\n"); - return "$keyword added."; + return "/say $keyword added."; } sub factadd { @@ -697,19 +697,19 @@ sub factadd { my ($channel, $trigger) = $self->{pbot}->{factoids}->find_factoid($from_chan, $keyword, undef, 1, 1); if(defined $trigger) { $self->{pbot}->{logger}->log("$nick!$user\@$host attempt to overwrite $keyword\n"); - return "$keyword already exists for " . ($from_chan eq '.*' ? 'the global channel' : $from_chan) . "."; + return "/say $keyword already exists for " . ($from_chan eq '.*' ? 'the global channel' : $from_chan) . "."; } ($channel, $trigger) = $self->{pbot}->{factoids}->find_factoid('.*', $keyword, undef, 1, 1); if(defined $trigger and $self->{pbot}->{factoids}->{factoids}->hash->{'.*'}->{$trigger}->{'nooverride'}) { $self->{pbot}->{logger}->log("$nick!$user\@$host attempt to override $keyword\n"); - return "$keyword already exists for the global channel and cannot be overridden for " . ($from_chan eq '.*' ? 'the global channel' : $from_chan) . "."; + return "/say $keyword already exists for the global channel and cannot be overridden for " . ($from_chan eq '.*' ? 'the global channel' : $from_chan) . "."; } $self->{pbot}->{factoids}->add_factoid('text', $from_chan, "$nick!$user\@$host", $keyword, $text); $self->{pbot}->{logger}->log("$nick!$user\@$host added [$from_chan] $keyword => $text\n"); - return "$keyword added to " . ($from_chan eq '.*' ? 'global channel' : $from_chan) . "."; + return "/say $keyword added to " . ($from_chan eq '.*' ? 'global channel' : $from_chan) . "."; } sub factrem { @@ -732,11 +732,11 @@ sub factrem { if($factoids->{$channel}->{$trigger}->{type} eq 'module') { $self->{pbot}->{logger}->log("$nick!$user\@$host attempted to remove $trigger [not factoid]\n"); - return "$trigger is not a factoid."; + return "/say $trigger is not a factoid."; } if ($channel =~ /^#/ and $from_chan =~ /^#/ and $channel ne $from_chan) { - return "$trigger belongs to $channel, but this is $from_chan. Please switch to $channel or /msg to remove this factoid."; + return "/say $trigger belongs to $channel, but this is $from_chan. Please switch to $channel or /msg to remove this factoid."; } my ($owner) = $factoids->{$channel}->{$trigger}->{'owner'} =~ m/([^!]+)/; @@ -748,13 +748,13 @@ sub factrem { } if($factoids->{$channel}->{$trigger}->{'locked'}) { - return "$trigger is locked; unlock before deleting."; + return "/say $trigger is locked; unlock before deleting."; } $self->{pbot}->{logger}->log("$nick!$user\@$host removed [$channel][$trigger][" . $factoids->{$channel}->{$trigger}->{action} . "]\n"); $self->{pbot}->{factoids}->remove_factoid($channel, $trigger); $self->log_factoid($channel, $trigger, "$nick!$user\@$host", "deleted", 1); - return "$trigger removed from " . ($channel eq '.*' ? 'the global channel' : $channel) . "."; + return "/say $trigger removed from " . ($channel eq '.*' ? 'the global channel' : $channel) . "."; } sub histogram { @@ -782,7 +782,7 @@ sub histogram { $i++; last if $i >= 10; } - return "$factoid_count factoids, top 10 submitters:\n$text"; + return "/say $factoid_count factoids, top 10 submitters:\n$text"; } sub factshow { @@ -834,7 +834,7 @@ sub factlog { 'h' => \$show_hostmask, 't' => \$actual_timestamp); - return "$getopt_error -- $usage" if defined $getopt_error; + return "/say $getopt_error -- $usage" if defined $getopt_error; return "Too many arguments -- $usage" if @$args > 2; return "Missing argument -- $usage" if not @$args; @@ -894,22 +894,22 @@ sub factinfo { # factoid if($factoids->{$channel}->{$trigger}->{type} eq 'text') { - return "$trigger: Factoid submitted by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago], " . (defined $factoids->{$channel}->{$trigger}->{edited_by} ? "last edited by $factoids->{$channel}->{$trigger}->{edited_by} on " . localtime($factoids->{$channel}->{$trigger}->{edited_on}) . " [" . ago(gettimeofday - $factoids->{$channel}->{$trigger}->{edited_on}) . "], " : "") . "referenced " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; + return "/say $trigger: Factoid submitted by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago], " . (defined $factoids->{$channel}->{$trigger}->{edited_by} ? "last edited by $factoids->{$channel}->{$trigger}->{edited_by} on " . localtime($factoids->{$channel}->{$trigger}->{edited_on}) . " [" . ago(gettimeofday - $factoids->{$channel}->{$trigger}->{edited_on}) . "], " : "") . "referenced " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; } # module if($factoids->{$channel}->{$trigger}->{type} eq 'module') { my $module_repo = $self->{pbot}->{registry}->get_value('general', 'module_repo'); $module_repo .= "$factoids->{$channel}->{$trigger}->{workdir}/" if exists $factoids->{$channel}->{$trigger}->{workdir}; - return "$trigger: Module loaded by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago] -> $module_repo" . $factoids->{$channel}->{$trigger}->{action} . ", used " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; + return "/say $trigger: Module loaded by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago] -> $module_repo" . $factoids->{$channel}->{$trigger}->{action} . ", used " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; } # regex if($factoids->{$channel}->{$trigger}->{type} eq 'regex') { - return "$trigger: Regex created by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago], " . (defined $factoids->{$channel}->{$trigger}->{edited_by} ? "last edited by $factoids->{$channel}->{$trigger}->{edited_by} on " . localtime($factoids->{$channel}->{$trigger}->{edited_on}) . " [" . ago(gettimeofday - $factoids->{$channel}->{$trigger}->{edited_on}) . "], " : "") . " used " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; + return "/say $trigger: Regex created by " . $factoids->{$channel}->{$trigger}->{owner} . " for $chan on " . localtime($factoids->{$channel}->{$trigger}->{created_on}) . " [$created_ago], " . (defined $factoids->{$channel}->{$trigger}->{edited_by} ? "last edited by $factoids->{$channel}->{$trigger}->{edited_by} on " . localtime($factoids->{$channel}->{$trigger}->{edited_on}) . " [" . ago(gettimeofday - $factoids->{$channel}->{$trigger}->{edited_on}) . "], " : "") . " used " . $factoids->{$channel}->{$trigger}->{ref_count} . " times (last by " . $factoids->{$channel}->{$trigger}->{ref_user} . (exists $factoids->{$channel}->{$trigger}->{last_referenced_on} ? " on " . localtime($factoids->{$channel}->{$trigger}->{last_referenced_on}) . " [$ref_ago]" : "") . ")"; } - return "$arguments is not a factoid or a module"; + return "/say $arguments is not a factoid or a module"; } sub top20 { @@ -1009,9 +1009,9 @@ sub count { if($i > 0) { my $percent = int($i / $total * 100); $percent = 1 if $percent == 0; - return "$arguments has submitted $i factoids out of $total ($percent"."%)"; + return "/say $arguments has submitted $i factoids out of $total ($percent"."%)"; } else { - return "$arguments hasn't submitted any factoids"; + return "/say $arguments hasn't submitted any factoids"; } } @@ -1159,12 +1159,12 @@ sub factchange { if (not @factoids or not $factoids[0]) { $from_chan = 'global channel' if $from_chan eq '.*'; - return "$keyword not found in $from_chan"; + return "/say $keyword not found in $from_chan"; } if (@factoids > 1) { if (not grep { $_->[0] eq $from_chan } @factoids) { - return "$from_trigger found in multiple channels: " . (join ', ', sort map { $_->[0] eq '.*' ? 'global' : $_->[0] } @factoids) . "; use `factchange $from_trigger` to disambiguate."; + return "/say $from_trigger found in multiple channels: " . (join ', ', sort map { $_->[0] eq '.*' ? 'global' : $_->[0] } @factoids) . "; use `factchange $from_trigger` to disambiguate."; } else { foreach my $factoid (@factoids) { if ($factoid->[0] eq $from_chan) { @@ -1178,22 +1178,22 @@ sub factchange { } if (not defined $trigger) { - return "$keyword not found in channel $from_chan."; + return "/say $keyword not found in channel $from_chan."; } $from_chan = '.*' if $from_chan eq 'global'; if ($channel =~ /^#/ and $from_chan =~ /^#/ and $channel ne $from_chan) { - return "$trigger belongs to $channel, but this is $from_chan. Please switch to $channel or use /msg to change this factoid."; + return "/say $trigger belongs to $channel, but this is $from_chan. Please switch to $channel or use /msg to change this factoid."; } my $admininfo = $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host"); if ($factoids->{$channel}->{$trigger}->{'locked'}) { - return "$trigger is locked and cannot be changed." if not defined $admininfo; + return "/say $trigger is locked and cannot be changed." if not defined $admininfo; if (exists $factoids->{$channel}->{$trigger}->{'effective-level'} and $admininfo->{level} < $factoids->{$channel}->{$trigger}->{'effective-level'}) { - return "$trigger is locked with an effective-level higher than your level and cannot be changed."; + return "/say $trigger is locked with an effective-level higher than your level and cannot be changed."; } } @@ -1256,14 +1256,14 @@ sub unload_module { if(not defined $arguments) { return "Usage: unload "; } elsif(not exists $factoids->{'.*'}->{$arguments}) { - return "$arguments not found."; + return "/say $arguments not found."; } elsif($factoids->{'.*'}->{$arguments}{type} ne 'module') { - return "$arguments is not a module."; + return "/say $arguments is not a module."; } else { delete $factoids->{'.*'}->{$arguments}; $self->{pbot}->{factoids}->save_factoids(); $self->{pbot}->{logger}->log("$nick!$user\@$host unloaded module $arguments\n"); - return "$arguments unloaded."; + return "/say $arguments unloaded."; } } diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm index 501868de..ebcc43d8 100644 --- a/PBot/Factoids.pm +++ b/PBot/Factoids.pm @@ -261,7 +261,7 @@ sub export_factoids { close(FILE); #$self->{pbot}->{logger}->log("$i factoids exported to path: " . $self->export_path . ", site: " . $self->export_site . "\n"); - return "$i factoids exported to " . $self->export_site; + return "/say $i factoids exported to " . $self->export_site; } sub find_factoid { @@ -874,7 +874,7 @@ sub interpreter { return "/say $nick: My effective-level isn't high enough to do that."; } } else { - return "$keyword is $action"; + return "/say $keyword is $action"; } } } elsif($self->{factoids}->hash->{$channel}->{$keyword}->{type} eq 'regex') { diff --git a/PBot/MessageHistory.pm b/PBot/MessageHistory.pm index a07c441f..61195fba 100644 --- a/PBot/MessageHistory.pm +++ b/PBot/MessageHistory.pm @@ -99,7 +99,7 @@ sub aka_link { } if ($self->{database}->link_alias($id, $alias, $type)) { - return "$source " . ($type == $self->{database}->{alias_type}->{WEAK} ? "weakly" : "strongly") . " linked to $target."; + return "/say $source " . ($type == $self->{database}->{alias_type}->{WEAK} ? "weakly" : "strongly") . " linked to $target."; } else { return "Link failed."; } @@ -126,7 +126,7 @@ sub aka_unlink { } if ($self->{database}->unlink_alias($id, $alias)) { - return "$source unlinked from $target."; + return "/say $source unlinked from $target."; } else { return "Unlink failed."; } @@ -160,7 +160,7 @@ sub list_also_known_as { 'nt' => \$dont_use_aliases_table, 'i' => \$show_id); - return "$getopt_error -- $usage" if defined $getopt_error; + return "/say $getopt_error -- $usage" if defined $getopt_error; return "Too many arguments -- $usage" if @$args > 1; return "Missing argument -- $usage" if @$args != 1; @@ -251,7 +251,7 @@ sub recall_message { 'count|n:i' => \$recall_count, 'context|x:s' => \$recall_context); - return "$getopt_error -- $usage" if defined $getopt_error; + return "/say $getopt_error -- $usage" if defined $getopt_error; my $channel_arg = 1 if defined $recall_channel; my $history_arg = 1 if defined $recall_history; @@ -342,7 +342,7 @@ sub recall_message { if ($count == 0) { return "I have no messages for $recall_nick."; } else { - return "$result."; + return "/say $result."; } } else { return "Please choose a history between 1 and $max_messages";