Perlbot/perlbuut
1
0
Fork 0
mirror of https://github.com/perlbot/perlbuut synced 2025-06-08 01:45:42 -04:00
Code Issues Releases Wiki Activity

Fix unicode finally. FINALLY

Browse source
This commit is contained in:
Ryan Voots 2016-12-04 02:59:20 -05:00
parent f435a4853e
commit b014d89cd4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Bot/BB3/Roles/IRC.pm
View file

@ -8,6 +8,7 @@ use POE::Wheel::Run;
use POE::Filter::Reference; use POE::Filter::Reference;
use POE::Component::IRC::Common qw/parse_user l_irc/; use POE::Component::IRC::Common qw/parse_user l_irc/;
use POE::Component::IRC::State; use POE::Component::IRC::State;
use POE::Component::IRC;
use POE::Component::IRC::Plugin::AutoJoin; use POE::Component::IRC::Plugin::AutoJoin;
use POE::Component::IRC::Plugin::Connector; use POE::Component::IRC::Plugin::Connector;
use POE::Component::IRC::Plugin::NickReclaim; use POE::Component::IRC::Plugin::NickReclaim;
@ -531,6 +532,8 @@ sub plugin_output {
utf8::decode( $text ); utf8::decode( $text );
# $text = unpack "H*", $text;
return unless $text =~ /\S/; return unless $text =~ /\S/;
$text =~ s/.\K\0/\\0/g; # Replace nulls to prevent them truncating strings we attempt to output. $text =~ s/.\K\0/\\0/g; # Replace nulls to prevent them truncating strings we attempt to output.
@ -573,6 +576,7 @@ sub plugin_output {
# Note that in the future we'll probably want to generalize channels # Note that in the future we'll probably want to generalize channels
# that receive multiple lines and those that don't.. # that receive multiple lines and those that don't..
while( length $text ) { while( length $text ) {
$text = Encode::encode( "utf8", $text ); # set it up for raw bytes now
my $substr = substr( $text, 0, 400, '' ); my $substr = substr( $text, 0, 400, '' );
$pci->yield( privmsg => $said->{name} => $substr ); $pci->yield( privmsg => $said->{name} => $substr );
@ -584,6 +588,7 @@ sub plugin_output {
} }
} }
elsif ( $said->{channel} eq '*dcc_chat' ) { elsif ( $said->{channel} eq '*dcc_chat' ) {
$text = Encode::encode( "utf8", $text ); # set it up for raw bytes now
$pci->yield( dcc_chat => $said->{dcc_id} => $text ); $pci->yield( dcc_chat => $said->{dcc_id} => $text );
} }
else { else {
@ -591,8 +596,10 @@ sub plugin_output {
if ($text =~ /^\x00/) { if ($text =~ /^\x00/) {
$text =~ s/^\x00//; $text =~ s/^\x00//;
$text = Encode::encode( "utf8", $text ); # set it up for raw bytes now
$pci->yield( privmsg => $said->{channel} => $text ); $pci->yield( privmsg => $said->{channel} => $text );
} else { } else {
$text = Encode::encode( "utf8", $text ); # set it up for raw bytes now
$pci->yield( privmsg => $said->{channel} => "$said->{name}: $text" ); $pci->yield( privmsg => $said->{channel} => "$said->{name}: $text" );
} }
} }

2
lib/eval.pl
View file

@ -157,7 +157,7 @@ use Tie::Hash::NamedCapture;
uc "\x{666}"; #Attempt to load unicode libraries. uc "\x{666}"; #Attempt to load unicode libraries.
lc "JONQUIÉRE"; lc "JONQUIÉRE";
} }
binmode STDOUT, ":utf8"; # Enable utf8 output. binmode STDOUT, ":encoding(utf8)"; # Enable utf8 output.
#BEGIN{ eval "use PHP::Interpreter;"; } #BEGIN{ eval "use PHP::Interpreter;"; }