Start gutting check_for_link()

diff --git a/videosite.pl b/videosite.pl
index 58ff284..ec65194 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -14,6 +14,8 @@ use vars qw($VERSION %IRSSI);
 use XML::Simple;
 use Data::Dumper;
 use File::Spec;
+delete($INC{'BettIrssi.pm'});
+use BettIrssi qw(_bcb _bcs);
 
 my @grabbers;
 my @getters;
@@ -33,19 +35,19 @@ my $PARAMS = {
 my $debug = 0;
 
 # "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
-signal_add_last("message public" => sub {check_for_link(\@_,1,4,2,0);});
+signal_add_last(_bcs("message public" => sub {check_for_link(@_)}));
 # "message own_public", SERVER_REC, char *msg, char *target
-signal_add_last("message own_public" => sub {check_for_link(\@_,1,2,-1,0);});
+signal_add_last(_bcs("message own_public" => sub {check_for_link(@_)}));
 
 # "message private", SERVER_REC, char *msg, char *nick, char *address
-signal_add_last("message private" => sub {check_for_link(\@_,1,-1,2,0);});
+signal_add_last(_bcs("message private" => sub {check_for_link(@_)}));
 # "message own_private", SERVER_REC, char *msg, char *target, char *orig_target
-signal_add_last("message own_private" => sub {check_for_link(\@_,1,2,-1,0);});
+signal_add_last(_bcs("message own_private" => sub {check_for_link(@_)}));
 
 # "message irc action", SERVER_REC, char *msg, char *nick, char *address, char *target
-signal_add_last("message irc action" => sub {check_for_link(\@_,1,4,2,0);});
+signal_add_last(_bcs("message irc action" => sub {check_for_link(@_)}));
 # "message irc own_action", SERVER_REC, char *msg, char *target
-signal_add_last("message irc own_action" => sub {check_for_link(\@_,1,2,-1,0);});
+signal_add_last(_bcs("message irc own_action" => sub {check_for_link(@_)}));
 
 # For tab completion
 signal_add_first('complete word', \&sig_complete);
@@ -125,22 +127,14 @@ sub write_debug {
 }
 
 sub check_for_link {
-    my ($signal,$parammessage,$paramchannel,$paramnick,$paramserver) = @_;
-    my $server = $signal->[$paramserver];
-    my $target = $signal->[$paramchannel];
-    my $message = ($parammessage == -1) ? '' : $signal->[$parammessage];
+    by $event = shift;
+    my $message = $event->message();
+    my $witem = $event->channel();
     my $g;
     my $m;
     my $p;
 
 
-    my $witem;
-    if (defined $server) {
-        $witem = $server->window_item_find($target);
-    } else {
-        $witem = Irssi::window_item_find($target);
-    }
-
     # Look if we should ignore this line
     if ($message =~ m,(?:\s|^)/nosave(?:\s|$),) {
         return;