diff --git a/lib/commands/get.pm b/lib/commands/get.pm index bc6de5abc68499ecf12fc943b416a1f9d56a34ff..172c6dd8ff9371a4b4eace5d9f73b46143965754 100644 --- a/lib/commands/get.pm +++ b/lib/commands/get.pm @@ -14,7 +14,7 @@ our $irc; our $log; sub exec { - my ($chan, $msg) = @_; + my ($chan, $msg, $chan_src) = @_; my $query = commands::get::query->new( chan => $chan->[0], @@ -83,9 +83,17 @@ sub exec { $content_h{'tags'} = \@tags; my $irc_msg = utils::print::print(\%content_h); - $irc_msg .= ' [' . $rows . ' résultat'; - $irc_msg .= 's' if ($rows > 1); - $irc_msg .= ']'; + + # if in query + if ($chan !~ /^#/) { + $irc_msg .= ' [' . $chan_src->[0] . ']'; + } + else { + $irc_msg .= ' [' . $rows . ' résultat'; + $irc_msg .= 's' if ($rows > 1); + $irc_msg .= ']'; + } + $irc->yield(privmsg => $chan => $irc_msg); # we save the get like a post diff --git a/lib/commands/later.pm b/lib/commands/later.pm index e9675bab069ca3a66f6eab1458ab250c27e30f0b..dd978c17e0b01ad8e710b1b0d5acd9837fefb287 100644 --- a/lib/commands/later.pm +++ b/lib/commands/later.pm @@ -17,7 +17,7 @@ sub exec { $sth->execute($id, $nick, time + $time) or $log->error("Couldn't finish transaction: " . $dbh->errstr); - $kernel->delay_set('_later', $time, $nick, $id); + $kernel->delay_set('_later', $time, $nick, $id, $chan); } 1; diff --git a/lib/sessions/irc.pm b/lib/sessions/irc.pm index 21128f31966d983e47eb28dc35691752c6c378e8..92c227c22f639954fb218a9e9c644267409cebb1 100644 --- a/lib/sessions/irc.pm +++ b/lib/sessions/irc.pm @@ -67,7 +67,7 @@ POE::Session->create( irc_notice => \&on_notice, _flux => \&flux, _later => sub { - sessions::irc::later::consume($_[ARG0], $_[ARG1]) + sessions::irc::later::consume(@_[ARG0, ARG1, ARG2]) } }, ); diff --git a/lib/sessions/irc/later.pm b/lib/sessions/irc/later.pm index 605d10775f793f904ae11a18462c278a474ca364..577f7480caced99497bae47b5f23d937600e0686 100644 --- a/lib/sessions/irc/later.pm +++ b/lib/sessions/irc/later.pm @@ -5,9 +5,9 @@ use commands::get; sub consume { - my ($nick, $id) = @_; + my ($nick, $id, $chan_src) = @_; - my @args = ([$nick], $id); + my @args = ([$nick], $id, $chan_src); commands::get::exec(@args); }