Fix Xchat::XPI::Events::{delay,filter} not passing the right arguments

[perl/scripts/xchat.git] / Xchat / XPI / Events.pm

diff --git a/Xchat/XPI/Events.pm b/Xchat/XPI/Events.pm
index b0211c2bf8927f8d4ede911a6dcfc82df298c5d3..d851caaeb961d04e705cd3753527ff4d627cd006 100644 (file)
--- a/Xchat/XPI/Events.pm
+++ b/Xchat/XPI/Events.pm
@@ -3,51 +3,56 @@ package Xchat::XPI::Events;
 use strict;
 use warnings;
 
-use Xchat qw/:all/;
+use Xchat qw<:all>;
 
-use lib get_info 'xchatdir';
-use Xchat::XPI;
-
-use constant {
- DEFAULT_DELAY => 1000
-};
+use constant DEFAULT_DELAY => 1000;
 
 our $VERSION = '0.04';
 
+sub _delay_cb {
+ my ($cb, @args) = @{$_[0]};
+
+ $cb->(@args);
+
+ return REMOVE;
+}
+
 sub delay {
- my $d = shift;
- $d = (defined $d) ? int $d : DEFAULT_DELAY;
- return hook_timer $d, sub {
-  my ($cb, $data) = @{$_[0]};
-  &$cb($data);
-  return REMOVE;
- }, { data => \@_ };
+ my $delay = shift;
+
+ if (defined $delay) {
+  $delay = int $delay;
+ } else {
+  $delay = DEFAULT_DELAY;
+ }
+
+ hook_timer $delay, \&_delay_cb, { data => \@_ };
 }
 
-my %reorder;
+sub _filter_cb {
+ my @args      = @{$_[0]};
+ my ($cb, $to) = @{$_[1]};
 
-sub filter {
- return unless @_ == 3;
- not defined and return for @_;
- my ($cb, $to) = @_[1, 2];
- return hook_print $_[0], sub {
-  my @args = @{$_[0]};
-  if ($cb->(@args)) {
-   $reorder{$to}->(@args) if exists $reorder{$to};
-   emit_print $to, @args;
-   return EAT_ALL;
-  } else {
-   return EAT_NONE;
-  }
+ if ($cb->(@args)) {
+  emit_print $to, @args;
+  return EAT_ALL;
+ } else {
+  return EAT_NONE;
  }
 }
 
-use base qw/Exporter/;
+sub filter {
+ my $from = shift;
+
+ hook_print $from, \&_filter_cb, { data => \@_ };
+}
+
+use base qw<Exporter>;
 
 our @EXPORT         = ();
 our %EXPORT_TAGS    = (
- 'funcs'  => [ qw/delay filter/ ],
- 'consts' => [ qw/DEFAULT_DELAY/ ]
+ 'funcs'  => [ qw<delay filter>  ],
+ 'consts' => [ qw<DEFAULT_DELAY> ],
 );
 our @EXPORT_OK      = map { @$_ } values %EXPORT_TAGS;
 $EXPORT_TAGS{'all'} = [ @EXPORT_OK ];