X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Eos.pm;h=079b7c9012ddc7acdc00a6f3c54bb369669b8bf5;hp=325f69591eee73b1428af2be9d23d6cc010a0c8b;hb=0d63bf9da52cdfe2c9d8850b690032ff539b6398;hpb=5f2c0808b406a1c97a4cf07d1c7c51d574b4a6f6

diff --git a/Eos.pm b/Eos.pm
index 325f695..079b7c9 100644
--- a/Eos.pm
+++ b/Eos.pm
@@ -58,8 +58,9 @@ sub irc_msg {
 	if (parseCommand($msg,$irc,$nick,$address,'pm',$heap->{disp},DB())){
 		#Command parsed and run successfully
 	}else{
-		$irc->yield(privmsg => $ND::defchan, chr(3)."04 $nick >> $msg");
-		parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$ND::defchan,$heap->{disp},DB());
+		my $disp = $heap->{disp};
+		$irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 $nick >> $msg");
+		parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$disp->targets->{def},$heap->{disp},DB());
 	}
 }
 
@@ -67,10 +68,11 @@ sub irc_join {
 	my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
 	my ($nick,$username,$address) = ( split /[!@]/, $who );
 	my $irc = $sender->get_heap();
+	my $disp = $heap->{disp};
 
 	my $dbh = DB();
 
-	if ($channel =~ /^$ND::memchan$/i){
+	if (lc $channel ~~ lc $disp->targets->{members}){
 		if (time - $last_announcement < 1){
 			$last_announcement = time;
 			return;
@@ -82,14 +84,14 @@ FROM users u WHERE hostmask = ?
 		}, undef, $address);
 		if ($user){
 			if ($user->{password} eq ''){
-				$irc->yield(privmsg => $ND::memchan, "$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 => $disp->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");
 			}
 			if ($tick > 36 && not defined $user->{pid}){
-				$irc->yield(privmsg => $ND::memchan, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
+				$irc->yield(privmsg => $disp->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
 			}
 
 			if (not defined $user->{last_forum_visit}){
-				$irc->yield(privmsg => $ND::memchan, "$nick: Go read the forum! https://nd.ruin.nu/forum");
+				$irc->yield(privmsg => $disp->targets->{members}, "$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}){
@@ -111,28 +113,27 @@ sub refresh {
 	print 'Time: ' . time() . ' Lag: ' . $heap->{connector}->lag() . "\n";
 
 	my $irc = $heap->{irc};
+	my $disp = $heap->{disp};
 	my $dbh = DB();
 
 	my @row = $dbh->selectrow_array(q{SELECT tick(), max(tick) FROM planet_stats});
 	if ($tick != $row[0]){
 		$tick = $row[0];
-		$irc->yield(privmsg => $ND::defchan, "New tick: $tick");
+		$irc->yield(privmsg => $disp->targets->{def}, "New tick: $tick");
 	}
 	if (defined $row[1] && $stattick != $row[1]){
 		$stattick = $row[1];
-		$irc->yield(privmsg => $ND::memchan, "New tick: $stattick");
+		$irc->yield(privmsg => $disp->targets->{members}, "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 = ?});
 	$ircreqs->execute;
 	while (my $req = $ircreqs->fetchrow_hashref){
 		if ($req->{channel} eq 'def'){
-			$irc->yield(privmsg => $ND::defchan, chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}");
-			parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$ND::defchan,$heap->{disp},$dbh);
-		}elsif($req->{channel} eq 'scan'){
-			$irc->yield(privmsg => $ND::scanchan, "<$req->{username} via webbie> $req->{message}");
-		}elsif($req->{channel} eq 'members'){
-			$irc->yield(privmsg => $ND::memchan, "<$req->{username} via webbie> $req->{message}");
+			$irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}");
+			parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$heap->{disp},$dbh);
+		}elsif(exists $disp->targets->{$req->{channel}}){
+			$irc->yield(privmsg => $disp->targets->{$req->{channel}}, "<$req->{username} via webbie> $req->{message}");
 		}
 		$upircreq->execute($req->{id});
 	}
@@ -152,7 +153,7 @@ GROUP BY username,call,tick,dm.fleet,p.value
 	my $updefmis = $dbh->prepare(q{UPDATE defense_missions SET announced = TRUE WHERE fleet = ?});
 	$defmissions->execute();
 	while (my $mission = $defmissions->fetchrow_hashref){
-		$irc->yield(privmsg => $ND::defchan, chr(3)."06 $mission->{username} sent def to call $mission->{call}, $mission->{value}% of value (tick $mission->{tick}) https://nd.ruin.nu/calls/edit/$mission->{call}");
+		$irc->yield(privmsg => $disp->targets->{def}, chr(3)."06 $mission->{username} sent def to call $mission->{call}, $mission->{value}% of value (tick $mission->{tick}) https://nd.ruin.nu/calls/edit/$mission->{call}");
 		$updefmis->execute($mission->{fleet});
 	}
 }