[banaffects][#7] version 1 from banaffects_sd

diff --git a/scripts/banaffects.pl b/scripts/banaffects.pl
index ff36ddb75e3f337e0f5a53938bebf6788fa94827..57a30dc5a0be223f700f7194ff1ba658f6851744 100644 (file)
--- a/scripts/banaffects.pl
+++ b/scripts/banaffects.pl
@@ -3,53 +3,66 @@ use Irssi;
 use Irssi::Irc;
 
 use vars qw($VERSION %IRSSI);
-$VERSION = "0.2";
+$VERSION = "1";
 %IRSSI = (
-    authors     => 'Valentin Batz',
-    contact     => 'senneth@irssi.org',
-    name        => 'banaffects',
-    description => 'shows affected nicks by a ban on a new ban',
-    url                => 'http://www.oberkommando.org/~senneth/irssi/scripts/',
-    licence    => 'GPLv2',
-    revision    => '$LastChangedRevision: 369 $',
-    changed     => '$LastChangedDate: 2006-01-31 22:35:03 +0100 (Di, 31 Jan 2006) $',
-    version    => $VERSION,
+    authors     => 'Valentin Batz, Nico R. Wohlgemuth',
+    contact     => 'senneth@irssi.org, nico@lifeisabug.com',
+    name        => 'banaffects_sd',
+    description => 'Shows affected nicks by a ban on a new ban ' .
+                   'and defends yourself because IRC is serious.',
+    url         => 'http://nico.lifeisabug.com/irssi/scripts/',
+    licence     => 'GPLv2',
+    version     => $VERSION,
 );
 
-Irssi::theme_register([ 'ban_affects', '         %K-%r-%R-%n Ban {hilight $0} affects: {hilight $1-}']);
+Irssi::theme_register([
+   'ban_affects' => 'Ban {hilight $0} set by {hilight $1} affects: {hilight $2-}',
+   'ban_affects_sd', 'Ban affects {hilight you}; taking care of {hilight $0}...'
+]);
 
 sub ban_new() {
-       #print "@_";
-       my ($chan, $ban) = @_;
-       return unless $chan;
-       my $server = $chan->{server};
-       my $banmask = $ban->{ban};
-       my $window = $server->window_find_item($chan->{name});
-       my @matches;
-       foreach my $nick ( sort ( $chan->nicks() ) ) {
-               if (Irssi::mask_match_address( $banmask, $nick->{nick}, $nick->{host} )) {
-                       push (@matches, $nick->{nick});
-               }
-       }
-       my $nicks = join(", ", @matches);
-       $window->printformat(MSGLEVEL_CRAP, 'ban_affects', $banmask, $nicks) if ($nicks ne '');
+   my ($chan, $ban) = @_;
+   return unless $chan;
+   my $server = $chan->{server};
+   my $banmask = $ban->{ban};
+   my $banuser = $ban->{setby};
+   my $ownnick = $server->{nick};
+   my $channel = $chan->{name};
+   my $window = $server->window_find_item($channel);
+   my $selfdefense = 0;
+   my @matches;
+   foreach my $nick ( sort ( $chan->nicks() ) ) {
+      if (Irssi::mask_match_address( $banmask, $nick->{nick}, $nick->{host} )) {
+         push (@matches, $nick->{nick});
+         $selfdefense = 1 if ($nick->{nick} eq $ownnick);
+      }
+   }
+   my $nicks = join(", ", @matches);
+   $window->printformat(MSGLEVEL_CRAP, 'ban_affects', $banmask, $banuser, $nicks) if ($nicks ne '');
+
+   if ($selfdefense && $banuser ne $ownnick && $chan->{chanop}) {
+      my $newbanmask = $chan->ban_get_mask($banuser, 0);
+      my $kickreason = "IRC is serious!";
+      $window->printformat(MSGLEVEL_CRAP, 'ban_affects_sd', $banuser);
+      $server->command("kick $channel $banuser $kickreason");
+      $server->command("mode $channel" . " -b+b " . "$banmask $newbanmask");
+   }
 }
 
 Irssi::signal_add('ban new', \&ban_new);
 
 sub test_ban() {
-       my ($arg, $server, $witem) = @_;
-       return unless (defined $witem && $witem->{type} eq 'CHANNEL');
-       my $chan = $server->channel_find($witem->{name});
-       my @matches;
-       foreach my $nick ( sort ( $chan->nicks() ) ) {
-               if (Irssi::mask_match_address( $arg, $nick->{nick}, $nick->{host} )) {
-                       push (@matches, $nick->{nick});
-               }
-       }
-       my $nicks = join(", ", @matches);
-       $witem->printformat(MSGLEVEL_CRAP, 'ban_affects', $arg, $nicks) if ($nicks ne '');
+   my ($arg, $server, $witem) = @_;
+   return unless (defined $witem && $witem->{type} eq 'CHANNEL');
+   my $chan = $server->channel_find($witem->{name});
+   my @matches;
+   foreach my $nick ( sort ( $chan->nicks() ) ) {
+      if (Irssi::mask_match_address( $arg, $nick->{nick}, $nick->{host} )) {
+         push (@matches, $nick->{nick});
+      }
+   }
+   my $nicks = join(", ", @matches);
+   $witem->printformat(MSGLEVEL_CRAP, 'ban_affects', $arg, $nicks) if ($nicks ne '');
 }
 
-
 Irssi::command_bind('banaffects', \&test_ban);