Minor discord fixes

[NDIRC.git] / Bot.pm

diff --git a/Bot.pm b/Bot.pm
index 0d517867f3dd39869ec9a4e542ca0afee753b0c6..e20412974d739aed53fcab70262188d564a3bc3f 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' );
@@ -250,7 +255,7 @@ sub _build_disp {
                if ($chan =~ /^(.*):(.*)$/){
                        $chan = $1;
                        $self->targets->{$2} = [] unless exists $self->targets->{$2};
-                       push @{$self->targets->{$2}},$chan;
+                       push @{$self->targets->{$2}},lc $chan;
                        say "$2 - @{$self->targets->{$2}}";
                }
                $disp->add_channel($chan,\@types);
@@ -365,6 +370,26 @@ sub discord_channel_create {
        $self->discord_channels->{$chan->{id}} = $chan;
 }
 
+sub handleCommand {
+       my ($self, $c, $msg) = @_;
+
+       my ($p,$command,$args) = ($msg =~ /^([.])(\S+)(?: (.+))?/);
+
+       if ($msg =~ m{https?://[\w.]+/.+?scan(_id|_grp)?=(\w+)}){
+               if (!$command || $command =~ m{^https?://}){
+                       ($p,$command,$args) = ('.','addscan',$msg);
+               }elsif($command ne 'addscan'){
+                       $self->handleCommand ($c, ".addscan $msg")
+               }
+       }
+
+       return 0 unless $self->disp->has_command($command,$c->channel);
+
+       say localtime(time) . " - $msg";
+
+       return $self->disp->run_command($c,$command,$args);
+}
+
 sub parseCommand {
        my ($self, $msg, $server, $nick, $address, $channel, $model) = @_;
 
@@ -404,6 +429,7 @@ sub parseCommand {
                        disp => $self->disp,
                        model => $model,
                        server => $server,
+                       bot => $self,
                        reply_string => $reply_string,
                });
 
@@ -415,19 +441,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+)$/i) {
+                       $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;