X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Delling.pm;h=bed84f4bf3843cf3c3e2a2450aeab82603aee99a;hb=b8bf12b07ac296bd878c20951ee6435515bae169;hp=fe35fe131562ee1fecbb8d3f25b3cc82ad0a5ce2;hpb=dcb7d5ee3791ae43e7fcaf3639ce5b70f6c659ab;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index fe35fe1..bed84f4 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -103,7 +103,7 @@ WHERE u.hostmask = $1 AND channel = $2 AND flag IN ('o','v');
 		$irc->yield(mode => $channel, $mode, @who) if $mode;
 	}
 
-	if (lc $channel ~~ lc $self->targets->{members}){
+	if (lc $channel ~~ @{$self->targets->{members}}){
 		if (time - $last_announcement < 1){
 			$last_announcement = time;
 			return;
@@ -115,14 +115,14 @@ FROM users u WHERE hostmask = ?
 		}, undef, $address);
 		if ($user){
 			unless ($user->{password}) {
-				$irc->yield(privmsg => $self->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
+				$irc->yield(privmsg => $channel, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
 			}
 			if ($tick > 12 && not defined $user->{pid}){
-				$irc->yield(privmsg => $self->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
+				$irc->yield(privmsg => $channel, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
 			}
 
 			if (not defined $user->{last_forum_visit}){
-				$irc->yield(privmsg => $self->targets->{members}, "$nick: Go read the forum! https://nd.ruin.nu/forum");
+				$irc->yield(privmsg => $channel, "$nick: Go read the forum! https://nd.ruin.nu/forum");
 			}else {
 				my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid});
 				if ($unread && $unread->{new}){
@@ -175,7 +175,7 @@ sub refresh {
 	}
 	if (defined $row[1] && $stattick != $row[1]){
 		$stattick = $row[1];
-		$self->toTarget(members => "New tick: $stattick");
+		$self->toTarget(spam => "New tick: $stattick");
 	}
 	my $ircreqs = $dbh->prepare(q{SELECT id,username,message,channel FROM irc_requests NATURAL JOIN users WHERE not sent});
 	my $upircreq = $dbh->prepare(q{UPDATE irc_requests SET sent = TRUE WHERE id = ?});
@@ -183,7 +183,7 @@ sub refresh {
 	while (my $req = $ircreqs->fetchrow_hashref){
 		if ($req->{channel} eq 'def'){
 			$self->toTarget(def => "<c04>## $req->{username} via webbie ## >></c> $req->{message}");
-			#$self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$dbh);
+			$self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ','#def-ndawn',$dbh);
 		}else{
 			$self->toTarget($req->{channel} => "<$req->{username} via webbie> $req->{message}");
 		}
@@ -220,8 +220,7 @@ after _start => sub {
 };
 
 after discord_message_create => sub {
-	my $self = shift;
-	my $hash = shift;
+	my ($self, $gw, $hash) = @_;
 
 	my $author = $hash->{author};
 	my $msg = $hash->{content};
@@ -237,16 +236,10 @@ after discord_message_create => sub {
 
 	say localtime(time) . " - $channel_id $channel $author_name $author_id";
 
-	my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
-
-
-	return 0 unless $self->disp->has_command($command,$channel);
-
-	say localtime(time) . " - $msg";
-
 	my $c = NDIRC::DiscordContext->new({
 			discord_id => $author_name,
 			channel_id => $channel_id,
+			author_id => $author_id,
 			channel => $channel,
 			disp => $self->disp,
 			model => DB(),
@@ -254,7 +247,7 @@ after discord_message_create => sub {
 			discord => $self->discord,
 		});
 
-	return $self->disp->run_command($c,$command,$args);
+	return $self->handleCommand($c,$msg);
 
 };