X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Bot.pm;h=2fc95c2ba7b55ba9386709fbf9fa924e233e3cd6;hb=26cc9349b7b35318231d1dc8f236a7ac3dc8dcf2;hp=cbc0c5cd90332910e76871d705cd398bbe36cb4c;hpb=8211693b922ad772efc64463431f667d3baaceea;p=NDIRC.git

diff --git a/Bot.pm b/Bot.pm
index cbc0c5c..2fc95c2 100644
--- a/Bot.pm
+++ b/Bot.pm
@@ -121,13 +121,12 @@ sub _start {
 	));
 
 	$heap->{connector} = POE::Component::IRC::Plugin::Connector->new(
-		servers => [['irc.netgamers.org'], ['underworld.no.eu.netgamers.org']
-			,['firefly.no.eu.netgamers.org'], ['underworld.ca.us.netgamers.org'] ]
+		servers => [['chronos.fr.eu.netgamers.org'], ['underworld.no.eu.netgamers.org']]
 	);
 	$irc->plugin_add( 'Connector' => $heap->{connector} );
 
 	$irc->yield( register => 'all' );
-	$irc->yield( connect => { server => 'irc.netgamers.org' } );
+	#$irc->yield( connect => { server => 'chronos.fr.eu.netgamers.org' } );
 
 	$kernel->delay( refresh => 60 );
 
@@ -142,15 +141,16 @@ sub _start {
 				'name'      => $user,
 				'url'       => 'https://nd.ruin.nu',
 				'version'   => '1.0',
-				'callbacks' => {
-					'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,
+				'logdir'   => '/tmp',
 			));
+
+		$self->discord->gw->on('MESSAGE_CREATE' => sub { $self->discord_message_create(@_) });
+		$self->discord->gw->on('READY'          => sub { $self->discord_ready(@_) });
+		$self->discord->gw->on('GUILD_CREATE'   => sub { $self->discord_guild_create(@_) });
+		$self->discord->gw->on('CHANNEL_CREATE' => sub { $self->discord_channel_create(@_) });
+
 		$self->discord->init();
 	}
 	return;
@@ -255,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);
@@ -339,8 +339,8 @@ sub irc_join {
 }
 
 sub discord_ready {
-	my $self = shift;
-	my $hash = shift;
+	my ($self, $gw, $hash) = @_;
+
 	$self->discord_id($hash->{user}{id});
 	$self->discord_name($hash->{user}{username});
 
@@ -351,8 +351,7 @@ sub discord_message_create {
 }
 
 sub discord_guild_create {
-	my $self = shift;
-	my $hash = shift;
+	my ($self, $gw, $hash) = @_;
 
 	for my $chan (@{$hash->{channels}}) {
 		say localtime(time) . " - $chan->{id} - $chan->{name}";
@@ -361,8 +360,7 @@ sub discord_guild_create {
 }
 
 sub discord_channel_create {
-	my $self = shift;
-	my $chan = shift;
+	my ($self, $gw, $chan) = @_;
 
 	for my $key (keys %{$chan}) {
 		say localtime(time) . " - $key - $chan->{$key}";
@@ -370,6 +368,28 @@ 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";
+
+	$c->dm_reply(1) if $p eq '!';
+
+	return $self->disp->run_command($c,$command,$args);
+}
+
 sub parseCommand {
 	my ($self, $msg, $server, $nick, $address, $channel, $model) = @_;
 
@@ -429,7 +449,7 @@ sub message {
 	my ($self, $msg, @targets) = @_;
 
 	for (@targets) {
-		when (/^D-(\d+)$/) {
+		when (/^D-(\d+)$/i) {
 			$self->discordMessage($1, $msg);
 		}
 		default {