From 5f4b2989a125578f1a37e63433318ef580b08fd3 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Thu, 21 Nov 2024 20:21:14 -0800 Subject: [PATCH] Factoids: `fact` no longer adds ref channel to output --- lib/PBot/Core/Commands/Factoids.pm | 1 + lib/PBot/Core/Factoids/Interpreter.pm | 5 ++--- lib/PBot/VERSION.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/PBot/Core/Commands/Factoids.pm b/lib/PBot/Core/Commands/Factoids.pm index 15317f4d..a414bd96 100644 --- a/lib/PBot/Core/Commands/Factoids.pm +++ b/lib/PBot/Core/Commands/Factoids.pm @@ -84,6 +84,7 @@ sub cmd_call_factoid($self, $context) { $context->{keyword} = $trigger; $context->{trigger} = $trigger; $context->{ref_from} = $channel; + $context->{no_ref_from} = 1; $context->{arguments} = $args // ''; $context->{root_keyword} = $trigger; diff --git a/lib/PBot/Core/Factoids/Interpreter.pm b/lib/PBot/Core/Factoids/Interpreter.pm index b8863be6..440e085b 100644 --- a/lib/PBot/Core/Factoids/Interpreter.pm +++ b/lib/PBot/Core/Factoids/Interpreter.pm @@ -20,11 +20,10 @@ sub interpreter($self, $context) { # trace context and context's contents if ($self->{pbot}->{registry}->get_value('general', 'debugcontext')) { use Data::Dumper; - $Data::Dumper::Sortkeys = sub { [sort grep { not /(?:cmdlist|arglist)/ } keys %$context] }; + $Data::Dumper::Sortkeys = 1; $Data::Dumper::Indent = 2; $self->{pbot}->{logger}->log("Factoids::interpreter\n"); $self->{pbot}->{logger}->log(Dumper $context); - $Data::Dumper::Sortkeys = 1; } if (not length $context->{keyword}) { @@ -302,7 +301,7 @@ sub handle_action($self, $context, $action) { my $ref_from = ''; - unless ($context->{pipe} or $context->{subcmd}) { + unless ($context->{no_ref_from} or $context->{pipe} or $context->{subcmd}) { $ref_from = $context->{ref_from} ? "[$context->{ref_from}] " : ''; } diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm index 58ac0169..cf39cc1f 100644 --- a/lib/PBot/VERSION.pm +++ b/lib/PBot/VERSION.pm @@ -25,7 +25,7 @@ use PBot::Imports; # These are set by the /misc/update_version script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 4854, + BUILD_REVISION => 4855, BUILD_DATE => "2024-11-21", };