From 57b44cc65d33c9bcb7f1ffcd91778689d30f9a5b Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 5 Oct 2009 17:21:28 +0200 Subject: [PATCH] Convert all input strings to utf-8 --- Bot.pm | 3 +++ Delling.pm | 8 ++++---- Eos.pm | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Bot.pm b/Bot.pm index 823daac..b3b4c9d 100644 --- 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 224a657..8008e81 100644 --- 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 7593099..d397244 100644 --- 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]; -- 2.39.2