close discussions on "approved" submissions

scc · Jun 21, 2007 · 4bffe77 · 4bffe77
1 parent 74a38f5
commit 4bffe77
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/Slash/DB/Static/MySQL/MySQL.pm b/Slash/DB/Static/MySQL/MySQL.pm
@@ -184,15 +184,30 @@ sub updateArchivedDiscussions {
 	my $days_to_archive = getCurrentStatic('archive_delay');
 	return 0 if !$days_to_archive;
 
-	# Close discussions.
+	# Close old discussions
-	return $self->sqlUpdate(
+	my $count = $self->sqlUpdate(
 		"discussions",
 		{ type => 'archived' },
 		"TO_DAYS(NOW()) - TO_DAYS(ts) > $days_to_archive
 		 AND type = 'open'
 		 AND flags != 'delete'
 		 AND archivable = 'yes'"
 	);
+
+	# Close expired submission discussions
+	$count += $self->sqlUpdate(
+		"firehose, discussions",
+		{ 'firehose.type' => 'archived' },
+		"firehose.type = 'submission'
+		 AND firehose.accepted = 'yes'
+		 AND firehose.discussion IS NOT NULL
+		 AND discussions.id = firehose.discussion
+		 AND discussions.type = 'open'
+		 AND discussions.flags != 'delete'
+		 AND discussions.archivable = 'yes'"
+	);
+
+	return $count;
 }