- Remaining files that were changed due to removal of $noreply or

[infobot.git] / src / IRC / Irc.pl

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index a11f0725dedf67e876818bc56cad0567ee6bf156..c12fe42004db92c2a042aac1bdea70cfaef9ed49 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -10,10 +10,11 @@ if (&IsParam("useStrict")) { use strict; }
 # static scalar variables.
 $mask{ip}      = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
 $mask{host}    = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
-$mask{chan}    = '[\#\&\+]\S*';
+$mask{chan}    = '[\#\&]\S*';
 my $isnick1    = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
 my $isnick2    = '0-9\-';
 $mask{nick}    = "[$isnick1]{1}[$isnick1$isnick2]*";
+$mask{nuh}     = '\S*!\S*\@\S*';
 
 sub ircloop {
     my $error  = 0;
@@ -157,7 +158,7 @@ sub rawout {
 
 sub say {
     my ($msg) = @_;
-    if (!defined $msg or $msg eq $noreply) {
+    if (!defined $msg) {
        $msg ||= "NULL";
        &DEBUG("say: msg == $msg.");
        return;
@@ -184,7 +185,7 @@ sub msg {
        return;
     }
 
-    if (!defined $msg or $msg eq $noreply) {
+    if (!defined $msg) {
        $msg ||= "NULL";
        &DEBUG("msg: msg == $msg.");
        return;
@@ -235,7 +236,9 @@ sub notice{
 
 
 sub DCCBroadcast {
-    my ($txt) = @_;
+    my ($txt,$flag) = @_;
+
+    ### FIXME: flag not supported yet.
 
     foreach (keys %{$dcc{'CHAT'}}) {
        $conn->privmsg($dcc{'CHAT'}{$_}, $txt);
@@ -284,6 +287,10 @@ sub performAddressedReply {
     &performReply(@_);
 }
 
+sub pSReply {
+    &performStrictReply(@_);
+}
+
 # Usage: &performStrictReply($reply);
 sub performStrictReply {
     my ($reply) = @_;
@@ -299,8 +306,6 @@ sub performStrictReply {
     } else {
        &ERROR("pSR: msgType invalid? ($msgType).");
     }
-
-    return '';
 }
 
 sub dccsay {
@@ -513,6 +518,14 @@ sub GetNickInChans {
     return @array;
 }
 
+# Usage: &GetNicksInChan($chan);
+sub GetNicksInChan {
+    my ($chan) = @_;
+    my @array;
+
+    return keys %{ $channels{$chan}{''} };
+}
+
 sub IsNickInChan {
     my ($nick,$chan) = @_;
 
@@ -584,30 +597,38 @@ sub clearChanVars {
 
 sub clearIRCVars {
     &DEBUG("clearIRCVars() called!");
-    %channels = ();
-    @joinchan = split /[\t\s]+/, $param{'join_channels'};
+    undef %channels;
+    undef %floodjoin;
+
+    @joinchan  = &getJoinChans();
 }
 
-sub makeChanList {
-    my ($str)  = @_;
-    my $inverse        = 0;
+sub getJoinChans {
     my @chans;
+    my @skip;
 
-    if ($str eq "ALL") {
-       return(keys %channels);
-    } elsif ($str =~ s/^ALL but //i) {
-       @chans = keys %channels;
-       foreach (split /[\s\t\,]+/, lc $str) {
-           @chans = grep !/^$_$/, @chans;
+    foreach (keys %chanconf) {
+       my $val = $chanconf{$_}{autojoin};
+       my $skip = 0;
+       if (defined $val) {
+           $skip++ if ($val eq "0");
+       } else {
+           $skip++;
        }
-    } else {
-       foreach (split /[\s\t\,]+/, lc $str) {
-           next unless (&validChan($_));
-           push(@chans, $_);
+
+       if ($skip) {
+           push(@skip, $_);
+           next;
        }
+
+       push(@chans, $_);
     }
 
-    @chans;
+    if (scalar @skip) {
+       &status("channels not auto-joining: @skip");
+    }
+
+    return @chans;
 }
 
 sub closeDCC {
@@ -670,4 +691,10 @@ sub joinfloodCheck {
     &DEBUG("jfC: $delete deleted.") if ($delete);
 }
 
+sub getHostMask {
+    my($n) = @_;
+
+    &FIXME("getHostMask...");
+}
+
 1;