diff options
-rw-r--r-- | journal-content.lisp | 6 | ||||
-rwxr-xr-x | journal.lisp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/journal-content.lisp b/journal-content.lisp index b0b9ce8..65ac245 100644 --- a/journal-content.lisp +++ b/journal-content.lisp @@ -160,8 +160,8 @@ (select 'journal-comment :where [and [= [slot-value 'journal-comment 'entry-id] (id-of journal-entry)] - [not [= [slot-value 'journal-comment 'spam-p] - "t"]]] + [= [slot-value 'journal-comment 'spam-p] + "f"]] :order-by '([date]) :flatp t) (select 'journal-comment @@ -170,7 +170,7 @@ :order-by '([date]) :flatp t)) (if ham-p - (remove-if #'spamp (%comments-about journal-entry)) + (comments-about journal-entry :ordered-p t :ham-p t) (%comments-about journal-entry))) #.(restore-sql-reader-syntax-state))) diff --git a/journal.lisp b/journal.lisp index e1fe6a5..dbadd00 100755 --- a/journal.lisp +++ b/journal.lisp @@ -90,6 +90,7 @@ (let ((number 0)) (dolist (journal-comment (select 'journal-comment + :where [= [slot-value 'journal-comment 'spam-p] "f"] :order-by '(([date] :desc)) :flatp t)) (with-slots (entry uuid date body author website spam-p id) |