From 69174f9dabbb89bfc95c0bc7aacc5a4ef59d01b7 Mon Sep 17 00:00:00 2001 From: timriker Date: Wed, 28 Dec 2011 21:31:56 +0000 Subject: [PATCH] don't clear channels, minor utf8 tweak git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1915 c11ca15a-4712-0410-83d8-924469b57eb5 --- infobot | 1 + src/IRC/Irc.pl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/infobot b/infobot index 2c58f39..ff2b0a0 100755 --- a/infobot +++ b/infobot @@ -14,6 +14,7 @@ use vars qw($bot_base_dir $bot_src_dir $bot_misc_dir $bot_state_dir # ancient Perl may not like these, but modern systems should have this use open ':utf8'; use open ':std'; +use Encode qw( decode FB_QUIET ); BEGIN { if ( @ARGV and -f $ARGV[0] ) { diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index ccae33b..7b962c8 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -128,6 +128,7 @@ sub irc { if (defined $conns{$mynick}) { # explicit binmode for socket as "use open" does not seem to work here #binmode $conns{$mynick}->{_socket}, ":utf8"; + # This will bomb on non-utf8 input #binmode $conns{$mynick}->{_socket}, ":encoding(UTF-8)"; # TODO: need to input bytes, but output utf8 binmode $conns{$mynick}->{_socket}, ":bytes"; @@ -887,7 +888,8 @@ sub clearChanVars { } sub clearIRCVars { - undef %channels; + # FIXME: only remove channels for current bot! + #undef %channels; undef %floodjoin; $cache{joinTime} = time(); -- 2.39.2