summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Benkard <code@mail.matthias.benkard.de>2009-10-07 23:09:05 +0200
committerMatthias Benkard <code@mail.matthias.benkard.de>2009-10-07 23:09:05 +0200
commit642111b90390a96992ffac160e402cfbed309e08 (patch)
tree419e9da504875d7e82339054d70b5bd13d0d37bf
parent2a9daa9f73c6b6a9663a69799c4f22e8b0afcd87 (diff)
Only show comments that have been marked as non-spam.
Ignore-this: a4902d3cf1e4596c928d5c3ba8b6990c darcs-hash:78d565dad4cfbfdd9a515c96086c8100dee6022d
-rw-r--r--journal-content.lisp6
-rwxr-xr-xjournal.lisp1
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)