use Module::Load;
use XML::Simple;
use JSON -support_by_pp;
+use Carp;
+
+$SIG{ __DIE__ } = sub { Carp::confess( @_ ) };
#
# List of foreground colors. This list is not complete, it just
my ($cmdline, $server, $witem) = @_;
my %event = (
message => $cmdline,
- ewpf => sub { defined($witem)?$witem->print($_[0]):Irssi::print($_[0]) },
+ io => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) },
+ window => defined($witem)?$witem->{server}->{real_address} . "/" . $witem->{name}:"",
);
libvideosite::handle_command(\%event);
#
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]) },
+ io => 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);
}
sub videosite_reset {
+ my $libpath;
+
+ # Find out the script directory, and add it to @INC.
+ # This is necessary to find libvideosite.pm
+ $libpath = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
+
+ # If the library is already loaded unload it
+ foreach (keys(%INC)) {
+ if ($INC{$_} eq File::Spec->catfile($libpath, 'libvideosite.pm')) {
+ delete($INC{$_});
+ }
+ }
+
+ push(@INC, $libpath);
+ load 'libvideosite';
+
unless(libvideosite::register_api({
io => sub { Irssi::print($_[0]) },
config_init => \&config_init,
config_get => \&config_get,
config_set => \&config_set,
config_has => \&config_has,
- config_save => \&config_save,
+ config_save => sub { 1 },
config_del => \&config_del,
color => \&colorpair,
module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') },
quote => sub { s/%/%%/g; return $_ },
- _debug => sub { 1 },
+ reload => \&videosite_reset,
})) {
Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
return 0;
}
sub videosite_init {
- # Find out the script directory, and add it to @INC.
- # This is necessary to find libvideosite.pm
-
- push(@INC, File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts'));
- load 'libvideosite';
if (videosite_reset()) {
signal_add_last("message public", sub { message_hook(@_) });
signal_add_last("message own_public", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
- signal_add_last("message private", sub { message_hooK($_[0], $_[1], $_[2], $_[3], $_[2]) });
+ signal_add_last("message private", sub { message_hook($_[0], $_[1], $_[2], $_[3], $_[2]) });
signal_add_last("message own_private", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
signal_add_last("message irc action", sub { message_hook(@_) });
signal_add_last("message irc own_action", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });