Minor discord fixes

[NDIRC.git] / Bot.pm

diff --git a/Bot.pm b/Bot.pm
index 9bf39f9ae09c612b88bdca9100558b1a4f505955..e20412974d739aed53fcab70262188d564a3bc3f 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -26,6 +26,7 @@ use Moose;
 
 use POE::Component::IRC::Common qw/irc_to_utf8/;
 use POE::Session;
+use POE::Kernel;
 use POE::Component::IRC::Plugin::Logger;
 use POE::Component::IRC::Plugin::BotTraffic;
 use POE::Component::IRC::Plugin::Connector;
@@ -36,7 +37,7 @@ use Mojo::Discord;
 use Mojo::IOLoop;
 
 use NDIRC::Dispatcher;
-use NDIRC::Context;
+use NDIRC::IrcContext;
 
 use IO::File;
 
@@ -67,6 +68,12 @@ has discord_channels => (
        default => sub { {} }
 );
 
+has targets => (
+       is => 'ro',
+       isa => 'HashRef[ArrayRef[Str]]',
+       default => sub{ {} },
+);
+
 # We registered for all events, this will produce some debug info.
 sub _default {
        my ($event, $args) = @_[ARG0 .. $#_];
@@ -84,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' );
@@ -134,6 +146,7 @@ sub _start {
                                        'READY'          => sub { $self->discord_ready(@_) },
                                        'MESSAGE_CREATE' => sub { $self->discord_message_create(@_) },
                                        'GUILD_CREATE' => sub { $self->discord_guild_create(@_) },
+                                       'CHANNEL_CREATE' => sub { $self->discord_channel_create(@_) },
                                },
                                'reconnect' => 1,
                                'verbose'   => 1,
@@ -234,13 +247,16 @@ sub _build_disp {
                $disp->load(@commands);
        }
 
+       %{$self->targets} = ();
        my $channels = new IO::File 'channels' or die $!;;
        while (<$channels>){
                my ($chan, @types) = split /\s+/;
                say "$chan - @types";
                if ($chan =~ /^(.*):(.*)$/){
                        $chan = $1;
-                       $disp->set_target($2,$chan);
+                       $self->targets->{$2} = [] unless exists $self->targets->{$2};
+                       push @{$self->targets->{$2}},lc $chan;
+                       say "$2 - @{$self->targets->{$2}}";
                }
                $disp->add_channel($chan,\@types);
        }
@@ -339,11 +355,41 @@ sub discord_guild_create {
        my $hash = shift;
 
        for my $chan (@{$hash->{channels}}) {
-               say localtime(time) . "$chan->{id} - $chan->{name}";
-               $self->discord_channels->{$chan->{id}} = $chan->{name};
+               say localtime(time) . " - $chan->{id} - $chan->{name}";
+               $self->discord_channels->{$chan->{id}} = $chan;
        }
 }
 
+sub discord_channel_create {
+       my $self = shift;
+       my $chan = shift;
+
+       for my $key (keys %{$chan}) {
+               say localtime(time) . " - $key - $chan->{$key}";
+       }
+       $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) = @_;
 
@@ -376,17 +422,58 @@ sub parseCommand {
        }
 
        $address =~ s/.*@(.*)/$1/;
-       my $c = NDIRC::Context->new({
+       my $c = NDIRC::IrcContext->new({
                        host => $address,
                        nick => $nick,
                        channel => $channel,
                        disp => $self->disp,
                        model => $model,
                        server => $server,
+                       bot => $self,
                        reply_string => $reply_string,
                });
 
        return $self->disp->run_command($c,$command,$args);
 }
 
+sub toTarget {
+       my ($self, $target, $msg) = @_;
+
+       return unless exists $self->targets->{$target};
+
+       $self->message($msg, @{$self->targets->{$target}});
+
+}
+
+sub message {
+       my ($self, $msg, @targets) = @_;
+
+       for (@targets) {
+               when (/^D-(\d+)$/i) {
+                       $self->discordMessage($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;