- use dccsay

- show flags on dcc chat connection.
- set type on on_dcc*

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@202 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 6bba1fd8dab6b2d313ba778adc44a851676670fa..9b11e7aba9fee5975f2672cb7ff81a5d75102887 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -58,7 +58,7 @@ sub on_chat {
        $msgType        = 'chat';
     }
 
-    if (!exists $dcc{'CHAT'}{$nick}) {
+    if (!exists $dcc{'CHATvrfy'}{$nick}) {
        $userHandle     = &verifyUser($who, $nuh);
        my $crypto      = $userList{$userHandle}{'pass'};
        my $success     = 0;
@@ -77,15 +77,19 @@ sub on_chat {
        } else {
            &status("DCC CHAT: incorrect pass; closing connection.");
            &DEBUG("chat: sock => '$sock'.");
-###        $sock->close();
+           $sock->close();
+           delete $dcc{'CHAT'}{$nick};
            &DEBUG("chat: after closing sock. FIXME");
            ### BUG: close seizes bot. why?
        }
 
        if ($success) {
            &status("DCC CHAT: user $nick is here!");
-           $dcc{'CHAT'}{$nick} = $sock;
            &DCCBroadcast("$nick ($uh) has joined the chat arena.");
+           $dcc{'CHATvrfy'}{$nick} = 1;
+           if ($userHandle ne "default") {
+               &dccsay($nick,"Flags: $userList{$userHandle}{'flags'}");
+           }
        }
 
        return;
@@ -149,6 +153,7 @@ sub on_dcc {
 
     # pity Net::IRC doesn't store nuh. Here's a hack :)
     $self->whois($nick);
+    $type ||= "???";
 
     if ($type eq 'SEND') {     # GET for us.
        # incoming DCC SEND. we're receiving a file.
@@ -169,7 +174,7 @@ sub on_dcc {
        &DEBUG("starting chat.");
        $self->new_chat($event);
     } else {
-       &status("${b_green}DCC $type$ob unknown ...");
+       &WARN("${b_green}DCC $type$ob (1)");
     }
 }
 
@@ -194,7 +199,7 @@ sub on_dcc_close {
        &status("${b_green}DCC CHAT$ob close from $b_cyan$nick$ob");
        delete $dcc{'CHAT'}{$nick};
     } else {
-       &status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob");
+       &status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob (2)");
     }
 }
 
@@ -205,16 +210,20 @@ sub on_dcc_open {
     my $sock = ($event->to)[0];
     $msgType = 'chat';
 
+    $type ||= "???";
+
     if ($type eq 'SEND') {
        &status("${b_green}DCC lGET$ob established with $b_cyan$nick$ob");
     } elsif ($type eq 'CHAT') {
-       &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob ($nuh{$nick})");
+       &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob $b_yellow($ob$nuh{$nick}$b_yellow)$ob");
        $userHandle     = &verifyUser($nick, $nuh{lc $nick});
        my $crypto      = $userList{$userHandle}{'pass'};
+       $dcc{'CHAT'}{$nick} = $sock;
+
        if (defined $crypto) {
-           $self->privmsg($sock,"Enter Password, $userHandle.");
+           &dccsay($nick,"Enter Password, $userHandle.");
        } else {
-           $self->privmsg($sock,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+           &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
        }
     } elsif ($type eq 'SEND') {
        &DEBUG("Starting DCC receive.");
@@ -222,7 +231,7 @@ sub on_dcc_open {
            &DEBUG("  => '$_'.");
        }
     } else {
-       &status("${b_green}DCC $type$ob unknown ...");
+       &WARN("${b_green}DCC $type$ob (3)");
     }
 }