Convert all input strings to utf-8

diff --git a/Bot.pm b/Bot.pm
index 823daaca3f3096e54c3a405ba66d86fbf03ace6f..b3b4c9d563c73915e09c77a5696a3e7f3af16bb7 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -24,6 +24,7 @@ use feature ':5.10';
 
 use Moose;
 
+use POE::Component::IRC::Common qw/irc_to_utf8/;
 use POE::Session;
 use POE::Component::IRC::Plugin::Logger;
 use POE::Component::IRC::Plugin::BotTraffic;
@@ -203,9 +204,11 @@ sub irc_invite {
 }
 
 sub irc_public {
+       $_[ARG2] = irc_to_utf8 $_[ARG2];
 }
 
 sub irc_msg {
+       $_[ARG2] = irc_to_utf8 $_[ARG2];
 }
 
 sub  refresh {

diff --git a/Delling.pm b/Delling.pm
index 224a6572650bfccd2109e34016d87a8d96ece066..8008e810f2e9523d1bab6f91052817e56b1e9806 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -36,7 +36,7 @@ has hal => (
        lazy_build => 1,
 );
 
-sub irc_public {
+after irc_public => sub {
        my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $channel = $where->[0];
@@ -63,9 +63,9 @@ sub irc_public {
        if ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
                #Command parsed and run successfully
        }
-}
+};
 
-sub irc_msg {
+after irc_msg => sub {
        my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
@@ -79,7 +79,7 @@ sub irc_msg {
        }else{
                $irc->yield(notice => $nick, "unknown command");
        }
-}
+};
 
 sub irc_join {
        my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1];

diff --git a/Eos.pm b/Eos.pm
index 75930997bfb18e63ab2f1085430e1c4bf42009ae..d397244d122d70bda63d17a4cc3cca2cd027cc52 100644 (file)
--- a/Eos.pm
+++ b/Eos.pm
@@ -31,7 +31,7 @@ use ND::DB;
 my ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats});
 my $last_announcement = 0;
 
-sub irc_public {
+after irc_public => sub {
        my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $channel = $where->[0];
@@ -49,10 +49,10 @@ sub irc_public {
        if ($self->parseCommand($msg,$irc,$nick,$address,$channel,DB())){
                #Command parsed and run successfully
        }
-}
+};
 
 
-sub irc_msg {
+after irc_msg => sub {
        my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
@@ -64,7 +64,7 @@ sub irc_msg {
                $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 $nick >> $msg");
                $self->parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$disp->targets->{def},DB());
        }
-}
+};
 
 sub irc_join {
        my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1];