X-Git-Url: https://git.donarmstrong.com/?p=infobot.git;a=blobdiff_plain;f=src%2FIRC%2FIrc.pl;h=51b35a9ff17a6c0774d1542ca9af579a373ff082;hp=6ac662e3a7d9c958ba0cf5ddb6966ada09f1bedb;hb=d2f87ccd1d5f93afedc8f9f13b9f35260328614a;hpb=106e9bcd5c2fa278a719abce24c65cae455ee8c8

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 6ac662e..51b35a9 100644
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -126,7 +126,11 @@ sub irc {
 	    }
 	    if (defined $conns{$mynick}) {
 		# explicit binmode for socket as "use open" does not seem to work here
-		binmode $conns{$mynick}->{_socket}, ":utf8";
+		#binmode $conns{$mynick}->{_socket}, ":utf8";
+		#binmode $conns{$mynick}->{_socket}, ":encoding(UTF-8)";
+		# TODO: need to input bytes, but output utf8
+		binmode $conns{$mynick}->{_socket}, ":bytes";
+		binmode $conns{$mynick}->socket, ":bytes";
 
 		$conns{$mynick}->maxlinelen($maxlinelen);
 
@@ -901,9 +905,9 @@ sub getJoinChans {
     # Display 'Chans:' only if more than $show seconds since last display
     if ( time() - $lastChansTime > $show ) {
         $lastChansTime = time();
-    }
-    else {
-        $show = 0;    # Don't display since < 15min since last
+    } else {
+	# Don't display since < 15min since last
+        $show = 0;
     }
 
     # can't join any if not connected
@@ -926,28 +930,25 @@ sub getJoinChans {
                 $chanconf{$_}{autojoin} = $val;
             }
             $skip++ if ( lc $val ne lc $nick );
-        }
-        else {
+        } else {
             $skip++;
         }
 
         if ($skip) {
             push( @skip, $_ );
-        }
-        else {
+        } else {
             if ( defined $channels{$_} or exists $channels{$_} ) {
                 push( @in, $_ );
-            }
-            else {
+            } else {
                 push( @join, $_ );
             }
         }
     }
 
     my $str;
-    $str .= ' in:' . join( ',',   sort @in )   if scalar @in;
-    $str .= ' skip:' . join( ',', sort @skip ) if scalar @skip;
     $str .= ' join:' . join( ',', sort @join ) if scalar @join;
+    $str .= ' in:' . join( ',',   sort @in )   if scalar @in;
+    $str .= ' skip:' . scalar @skip if scalar @skip;
 
     &status("Chans: ($nick)$str") if ($show);