utf8 by default

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

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index ced6f28e5ab81b4c5de1c4b1a12f2fd4f9b4cb50..6ac662e3a7d9c958ba0cf5ddb6966ada09f1bedb 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -19,9 +19,6 @@ use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
 use vars qw($b_blue $ob);
 use vars qw(@ircServers);
 
-#use open ':utf8';
-#use open ':std';
-
 $nickserv = 0;
 
 # It's probably closer to 510, but let's be cautious until we calculate it extensively.
@@ -105,7 +102,7 @@ sub irc {
 
     my %args = (
         Nick    => $param{'ircNick'},
-        Server  => $server,
+        Server  => $resolve,
         Port    => $port,
         Ircname => $param{'ircName'},
     );
@@ -128,6 +125,9 @@ sub irc {
                &ERROR('If this is still a problem, please contact the maintainer.');
            }
            if (defined $conns{$mynick}) {
+               # explicit binmode for socket as "use open" does not seem to work here
+               binmode $conns{$mynick}->{_socket}, ":utf8";
+
                $conns{$mynick}->maxlinelen($maxlinelen);
 
                # handler stuff.
@@ -151,15 +151,12 @@ sub irc {
                $conns{$mynick}->add_global_handler( 'nick',      \&on_nick );
                $conns{$mynick}->add_global_handler( 'quit',      \&on_quit );
                $conns{$mynick}->add_global_handler( 'notice',    \&on_notice );
-               $conns{$mynick}
-                 ->add_global_handler( 'whoischannels', \&on_whoischannels );
-               $conns{$mynick}
-                 ->add_global_handler( 'useronchannel', \&on_useronchannel );
+               $conns{$mynick}->add_global_handler( 'whoischannels', \&on_whoischannels );
+               $conns{$mynick}->add_global_handler( 'useronchannel', \&on_useronchannel );
                $conns{$mynick}->add_global_handler( 'whois',      \&on_whois );
                $conns{$mynick}->add_global_handler( 'other',      \&on_other );
                $conns{$mynick}->add_global_handler( 'disconnect', \&on_disconnect );
-               $conns{$mynick}
-                 ->add_global_handler( [ 251, 252, 253, 254, 255 ], \&on_init );
+               $conns{$mynick}->add_global_handler( [ 251, 252, 253, 254, 255 ], \&on_init );
 
                #       $conns{$mynick}->add_global_handler(302, \&on_init); # userhost
                $conns{$mynick}->add_global_handler( 303, \&on_ison );         # notify.
@@ -738,23 +735,20 @@ sub invite {
 # Usage: &joinNextChan();
 sub joinNextChan {
     my $joined = 0;
-    #foreach ( sort keys %conns ) {
-        #$conn = $conns{$mynick};
-       if (defined $conn) {
-           my $mynick = $conn->nick();
-           my @join   = getJoinChans(1);
-
-           if ( scalar @join ) {
-               my $chan = shift @join;
-               &joinchan($chan);
-
-               if ( my $i = scalar @join ) {
-                   &status("joinNextChan: $mynick $i chans to join.");
-               }
-               $joined = 1;
+    if (defined $conn) {
+       my $mynick = $conn->nick();
+       my @join   = getJoinChans(1);
+
+       if ( scalar @join ) {
+           my $chan = shift @join;
+           &joinchan($chan);
+
+           if ( my $i = scalar @join ) {
+               &status("joinNextChan: $mynick $i chans to join.");
            }
+           $joined = 1;
        }
-    #}
+    }
     return if $joined;
 
     if ( exists $cache{joinTime} ) {