Bot message sending restructure

[NDIRC.git] / Bot.pm

diff --git a/Bot.pm b/Bot.pm
index 0d517867f3dd39869ec9a4e542ca0afee753b0c6..cbc0c5cd90332910e76871d705cd398bbe36cb4c 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -91,11 +91,16 @@ sub _default {
        return 0;
 }
 
+my $irc;
+sub irc {
+       return $irc;
+}
+
 sub _start {
        my ($self,$kernel,$heap,$session) = @_[OBJECT,KERNEL,HEAP,SESSION];
 
        # retrieve our component's object from the heap where we stashed it
-       my $irc = $heap->{irc};
+       $irc = $heap->{irc};
        $kernel->sig( DIE => 'sig_DIE' );
        $kernel->sig( USR1 => 'sig_usr1' );
        $kernel->sig( USR2 => 'sig_usr2' );
@@ -404,6 +409,7 @@ sub parseCommand {
                        disp => $self->disp,
                        model => $model,
                        server => $server,
+                       bot => $self,
                        reply_string => $reply_string,
                });
 
@@ -415,19 +421,39 @@ sub toTarget {
 
        return unless exists $self->targets->{$target};
 
-       my $session = $poe_kernel->get_active_session();
-       my $heap = $session->get_heap();
-       my $irc = $heap->{irc};
+       $self->message($msg, @{$self->targets->{$target}});
+
+}
 
+sub message {
+       my ($self, $msg, @targets) = @_;
 
-       for (@{$self->targets->{$target}}) {
-               when (/^#/) {
-                       $irc->yield(privmsg => $_, $msg);
+       for (@targets) {
+               when (/^D-(\d+)$/) {
+                       $self->discordMessage($1, $msg);
                }
-               when (/^d-(\d+)/i) {
-                       $self->discord->send_message($1, $msg );
+               default {
+                       $self->ircMessage(privmsg => $_, $msg);
                }
        }
 }
 
+sub ircMessage {
+       my ($self, $command, $target, $msg) = @_;
+
+       $msg =~ s`<b>(.*?)</b>`${\(chr(2))}$1${\(chr(15))}`gi;
+       $msg =~ s`<c(\d+)>(.*?)</c>`${\(chr(3))}$1$2${\(chr(15))}`gi;
+
+       $self->irc->yield($command, $target, $msg);
+}
+
+sub discordMessage {
+       my ($self, $target, $msg) = @_;
+
+       $msg =~ s`<b>(.*?)</b>`**$1**`gi;
+       $msg =~ s`<c(\d+)>(.*?)</c>`*$2*`gi;
+
+       $self->discord->send_message($target, $msg );
+}
+
 1;