Merge branch 'per-window-debug' into weechat

[videosite.git] / videosite-irssi.pl

diff --git a/videosite-irssi.pl b/videosite-irssi.pl
index 390e26c..2e5a0ec 100644 (file)
--- a/videosite-irssi.pl
+++ b/videosite-irssi.pl
@@ -211,7 +211,8 @@ sub videosite_hook {
     my ($cmdline, $server, $witem) = @_;
     my %event = (
         message => $cmdline,
-        ewpf => sub { defined($witem)?$witem->print($_[0]):Irssi::print($_[0]) },
+        ewpf => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) },
+        window => defined($witem)?$witem->{server}->{real_address} . "/" . $witem->{name}:"",
     );
 
     libvideosite::handle_command(\%event);
@@ -223,10 +224,11 @@ sub videosite_hook {
 #
 sub message_hook {
     my ($server, $msg, $nick, $userhost, $channel) = @_;
-    my $evitem = $server->window_item_find($channel);
+    my $witem = $server->window_item_find($channel);
     my %event = (
         message => $msg,
-        ewpf => sub { defined($evitem)?$evitem->print($_[0]):Irssi::print($_[0]) },
+        ewpf => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) },
+        window => defined($witem)?$witem->{server}->{real_address} . "/" . $witem->{name}:"",
     );
 
     libvideosite::check_for_link(\%event);
@@ -261,7 +263,6 @@ sub videosite_reset {
         module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') },
         quote => sub { s/%/%%/g; return $_ },
         reload => \&videosite_reset,
-        _debug => sub { 1 },
     })) {
         Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
         return 0;