From e6dc8053bfb94063268fa56404ff076208dc6dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sun, 21 May 2023 10:16:25 +0200
Subject: [PATCH] commands: Fix build logic when listing expired/future draft
 content

Fixes #10972
---
 commands/list.go              | 16 +++++++++++++---
 testscripts/commands/list.txt | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/commands/list.go b/commands/list.go
index 1ce45987b..05739c7a9 100644
--- a/commands/list.go
+++ b/commands/list.go
@@ -73,7 +73,11 @@ func newListCommand() *listCommand {
 							p.PublishDate().Format(time.RFC3339)}
 
 					}
-					return list(cd, r, createRecord, "buildDrafts", true)
+					return list(cd, r, createRecord,
+						"buildDrafts", true,
+						"buildFuture", true,
+						"buildExpired", true,
+					)
 				},
 			},
 			&simpleCommand{
@@ -91,7 +95,10 @@ func newListCommand() *listCommand {
 						}
 
 					}
-					return list(cd, r, createRecord, "buildFuture", true)
+					return list(cd, r, createRecord,
+						"buildFuture", true,
+						"buildDrafts", true,
+					)
 				},
 			},
 			&simpleCommand{
@@ -109,7 +116,10 @@ func newListCommand() *listCommand {
 						}
 
 					}
-					return list(cd, r, createRecord, "buildExpired", true)
+					return list(cd, r, createRecord,
+						"buildExpired", true,
+						"buildDrafts", true,
+					)
 				},
 			},
 			&simpleCommand{
diff --git a/testscripts/commands/list.txt b/testscripts/commands/list.txt
index 68d1097d7..2e64389fa 100644
--- a/testscripts/commands/list.txt
+++ b/testscripts/commands/list.txt
@@ -3,17 +3,23 @@
 hugo list drafts
 ! stderr .
 stdout 'draft.md,2019-01-01T00:00:00Z'
+stdout 'draftexpired.md,2018-01-01T00:00:00Z'
+stdout 'draftfuture.md,2030-01-01T00:00:00Z'
 
 hugo list future
 stdout 'future.md,2030-01-01T00:00:00Z'
+stdout 'draftfuture.md,2030-01-01T00:00:00Z'
 
 hugo list expired
 stdout 'expired.md,2018-01-01T00:00:00Z'
+stdout 'draftexpired.md,2018-01-01T00:00:00Z'
 
 hugo list all
 stdout 'future.md,2030-01-01T00:00:00Z'
 stdout 'draft.md,2019-01-01T00:00:00Z'
 stdout 'expired.md,2018-01-01T00:00:00Z'
+stdout 'draftexpired.md,2018-01-01T00:00:00Z'
+stdout 'draftfuture.md,2030-01-01T00:00:00Z'
 
 -- hugo.toml --
 baseURL = "https://example.org/"
@@ -31,4 +37,15 @@ expiryDate: 2019-01-01
 -- content/future.md --
 ---
 date: 2030-01-01
+---
+-- content/draftfuture.md --
+---
+date: 2030-01-01
+draft: true
+---
+-- content/draftexpired.md --
+---
+date: 2018-01-01
+expiryDate: 2019-01-01
+draft: true
 ---
\ No newline at end of file