eleksir/hexchat-scripts
1
Fork 0
Code Activity

now lists handled more correctly

Browse Source
This commit is contained in:
eleksir
2016-10-15 09:40:23 +03:00
parent 96f3c61317
commit 889b1ec6c7
1 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
notifications.pl
View File

@@ -1,11 +1,14 @@
# TODO: handle quotes in "/notify add netname network" with space containing entities
use strict; use strict;
use warnings "all"; use warnings "all";
use HexChat qw(:all); use HexChat qw(:all);
use threads; use threads;
use threads::shared; use threads::shared;
use MIME::Base64;
sub loadliststatus($); sub loadliststatus($);
sub loadlist($); sub loadlist($);
sub savelist(@);
sub savesetting(@); sub savesetting(@);
sub notify(@); sub notify(@);
sub hookfn; sub hookfn;
@@ -23,7 +26,7 @@ my $help = 'Usage:
/notify show - shows whitelists and their statuses /notify show - shows whitelists and their statuses
'; ';
register($script_name, '0.7.2', 'Sends *nix desktop notifications', \&freehooks); register($script_name, '0.8', 'Sends *nix desktop notifications', \&freehooks);
HexChat::print("$script_name loaded\n"); HexChat::print("$script_name loaded\n");
my @hooks; my @hooks;
@@ -52,7 +55,7 @@ sub hookfn {
$flag = 0 if (($nicklist != 0) or ($chanlist != 0) or ($netlist != 0)); $flag = 0 if (($nicklist != 0) or ($chanlist != 0) or ($netlist != 0));
if ($nicklist != 0) { if ($nicklist != 0) {
my @nicklist = split(/ /, loadlist('nicks')); my @nicklist = loadlist('nicks');
foreach (@nicklist) { foreach (@nicklist) {
next unless(defined($_)); next unless(defined($_));
@@ -62,7 +65,7 @@ sub hookfn {
} }
if (($chanlist != 0) and ($flag == 0)) { if (($chanlist != 0) and ($flag == 0)) {
my @chanlist = split(/ /, loadlist('chans')); my @chanlist = loadlist('chans');
foreach (@chanlist) { foreach (@chanlist) {
next unless(defined($_)); next unless(defined($_));
@@ -72,7 +75,7 @@ sub hookfn {
} }
if (($netlist != 0) and ($flag == 0)) { if (($netlist != 0) and ($flag == 0)) {
my @netlist = split(/ /, loadlist('nets')); my @netlist = loadlist('nets');
foreach (@netlist) { foreach (@netlist) {
next unless(defined($_)); next unless(defined($_));
@@ -136,7 +139,7 @@ sub notify_cmd {
if ($cmd eq 'info') { if ($cmd eq 'info') {
my $network = HexChat::get_info('network') // 'unknown'; my $network = HexChat::get_info('network') // 'unknown';
HexChat::print("Network name for whitelist: $network\n"); HexChat::printf("Network name for whitelist: %s\n", $network);
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} elsif ($cmd eq 'status') { } elsif ($cmd eq 'status') {
my $nicklist = loadliststatus('nicklist'); my $nicklist = loadliststatus('nicklist');
@@ -202,7 +205,7 @@ sub notify_cmd {
$str .= "Nicks whitelist: enabled\n"; $str .= "Nicks whitelist: enabled\n";
} }
$str .= "Whitelisted nicks = " . loadlist('nicks') ."\n"; $str .= "Whitelisted nicks = " . join( ', ', loadlist('nicks')) ."\n";
if (loadliststatus('chanlist') == 0) { if (loadliststatus('chanlist') == 0) {
$str .= "Channel whitelist: disabled\n"; $str .= "Channel whitelist: disabled\n";
@@ -210,7 +213,7 @@ sub notify_cmd {
$str .= "Channel whitelist: enabled\n"; $str .= "Channel whitelist: enabled\n";
} }
$str .= "Whitelisted channels = " . loadlist('chans') . "\n"; $str .= "Whitelisted channels = " . join( ', ', loadlist('chans')) . "\n";
if (loadliststatus('netlist') == 0) { if (loadliststatus('netlist') == 0) {
$str .= "Networks whitelist: disabled\n"; $str .= "Networks whitelist: disabled\n";
@@ -218,7 +221,7 @@ sub notify_cmd {
$str .= "Networks whitelist: enabled\n"; $str .= "Networks whitelist: enabled\n";
} }
$str .= "Whitelisted networks = " . loadlist('nets') . "\n"; $str .= "Whitelisted networks = " . join( ', ', loadlist('nets')) . "\n";
HexChat::print($str); HexChat::print($str);
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
@@ -226,31 +229,31 @@ sub notify_cmd {
my $str = ''; my $str = '';
if ((defined($entity)) and (defined($value))) { if ((defined($entity)) and (defined($value))) {
if ($entity eq 'nick') { if ($entity eq 'nick') {
my $nicks .= loadlist('nicks') . " $value"; my @nicks = (loadlist('nicks'), $value);
unless (defined(savesetting('nicks', $nicks))) { unless (defined(savelist('nicks', @nicks))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Nicks whitelist now: $nicks\n"); HexChat::printf("Nicks whitelist now: %s\n", join(', ', @nicks));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} elsif ($entity eq 'chan') { } elsif ($entity eq 'chan') {
my $chans .= loadlist('chans') . " $value"; my @chans = (loadlist('chans'), $value);
unless (defined(savesetting('chans', $chans))) { unless (defined(savelist('chans', @chans))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Channels whitelist now: $chans\n"); HexChat::printf("Channels whitelist now: %s\n", join(', ', @chans));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} elsif ($entity eq 'net') { } elsif ($entity eq 'net') {
my $nets .= loadlist('nets') . " $value"; my @nets = (loadlist('nets'), $value);
unless (defined(savesetting('nets', $nets))) { unless (defined(savelist('nets', @nets))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Networks whitelist now: $nets\n"); HexChat::printf("Networks whitelist now: %s\n", join(', ', @nets));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
} }
@@ -259,56 +262,57 @@ sub notify_cmd {
} elsif ($cmd eq 'del') { } elsif ($cmd eq 'del') {
if ((defined($entity)) and (defined($value))) { if ((defined($entity)) and (defined($value))) {
if ($entity eq 'nick') { if ($entity eq 'nick') {
my @nicklist = split(/ /, loadlist('nicks')); my @list = loadlist('nicks');
my @nicklist;
for (my $i = 0; $i < @nicklist; $i++) { foreach (@list) {
$nicklist[$i] = '' if ($nicklist[$i] eq $value); next if ($_ eq $value);
push @nicklist, $_;
} }
my $nicks = join(' ', @nicklist); @list = -1; undef @list;
$nicks =~ s/ +/ /g;
unless (defined(savesetting('nicks', $nicks))) { unless (defined(savelist('nicks', @nicklist))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Nicks whitelist now: $nicks\n"); HexChat::printf("Nicks whitelist now: %s\n", join(', ', @nicklist));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
if ($entity eq 'chan') { if ($entity eq 'chan') {
my @chanlist = split(/ /, loadlist('chans')); my @list = loadlist('chans');
my @chanlist;
for (my $i = 0; $i < @chanlist; $i++) { foreach (@list) {
$chanlist[$i] = '' if ($chanlist[$i] eq $value); next if($_ eq $value);
push @chanlist, $_;
} }
my $chans = join(' ', @chanlist); @list = -1; undef @list;
$chans =~ s/ +/ /g;
unless (defined(savesetting('chans', $chans))) { unless (defined(savelist('chans', @chanlist))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Channels whitelist now: $chans\n"); HexChat::printf("Channels whitelist now: %s\n", join(', ', @chanlist));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
if ($entity eq 'net') { if ($entity eq 'net') {
my @netlist = split(/ /, loadlist('nets')); my @list = loadlist('nets');
my @netlist;
for (my $i = 0; $i < @netlist; $i++) { foreach (@list) {
$netlist[$i] = '' if ($netlist[$i] eq $value); next if($_ eq $value);
push @netlist, $value;
} }
my $nets = join(' ', @netlist); unless (defined(savelist('nets', @netlist))) {
$nets =~ s/ +/ /g;
unless (defined(savesetting('nets', $nets))) {
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
HexChat::print("Networks whitelist now: $nets\n"); HexChat::printf("Networks whitelist now: %s\n", join(', ', @netlist));
return HexChat::EAT_ALL; return HexChat::EAT_ALL;
} }
@@ -339,12 +343,20 @@ sub loadlist($){
my $val = HexChat::plugin_pref_get($setting); my $val = HexChat::plugin_pref_get($setting);
unless (defined($val)) { unless (defined($val)) {
savesetting($setting, ''); savesetting($setting, encode_base64(''));
$val = ''; $val = '';
} }
undef $setting; my @values = map { decode_base64($_); } split(/ /, $val);
return $val; undef $setting; undef $val;
return @values;
}
sub savelist(@) {
my $setting = shift;
my @list = map { encode_base64($_); } @_;
my $value = join(' ', @list);
return savesetting($setting, $value);
} }
sub savesetting(@) { sub savesetting(@) {
@@ -352,7 +364,7 @@ sub savesetting(@) {
my $value = shift; my $value = shift;
if (HexChat::plugin_pref_set($setting, $value) == 0) { if (HexChat::plugin_pref_set($setting, $value) == 0) {
HexChat::print("Unable to save settings for $script_name\n"); HexChat::printf("Unable to save settings for %s\n", $script_name);
return undef; return undef;
} }