X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=e10fb7cc9c72b2ca7719aec07a90b560e9f221a4;hb=513973522ca22a3b51b0dea02094b75b55d0ed96;hp=f4e0e5be6ec9e81f1568b8124ac7fac6fcf4f765;hpb=9e84f393649d1ecbc24a94476352a28f49afa458;p=NDIRC.git

diff --git a/Scans.pm b/Scans.pm
index f4e0e5b..e10fb7c 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -25,13 +25,13 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addScan sendScan/;
+our @EXPORT = qw/addScan addScanGroup sendScan/;
 
 sub addScan {
 	my ($id,$verbose) = @_;
 	DB();
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 48",undef,$id)){
+		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE scan_id = ? AND tick >= tick() - 168",undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
 			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,"type") VALUES (?,tick(),COALESCE(?,'-1'))},
@@ -49,6 +49,27 @@ sub addScan {
 		}
 	}
 }
+sub addScanGroup {
+	my ($id,$verbose) = @_;
+	DB();
+	if (1){
+		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE type = 'group' AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
+			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
+				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,"type",scan) VALUES (?,tick(),'group',COALESCE(?,'-1'))},
+					undef,$id,$user[0]) == 1){
+				if (@user){
+					$ND::server->command("msg $ND::target Added scan group, at tick $user[3]. Points will be added after parsing");
+				}elsif ($verbose){
+					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
+				}
+			}
+		}elsif ($verbose){
+			$ND::server->command("msg $ND::target a scan with that id has already been added within the last 48 ticks");
+		}
+	}
+}
+
 sub sendScan {
 	my ($target,$msg) = @_;
 	DB();