Merge pull request #184 from vermiculus/fix-mark-read-logic

Fix mark read logic

2 files changed, 24 insertions, 1 deletions

diff --git a/sx-question.el b/sx-question.el
index 85d3cc5..44dad07 100644
--- a/sx-question.el
+++ b/sx-question.el
@@ -118,7 +118,8 @@ See `sx-question--user-read-list'."
            ;; Question already present.
            ((setq cell (assoc .question_id site-cell))
             ;; Current version is newer than cached version.
-            (when (> .last_activity_date (cdr cell))
+            (when (or (not (numberp (cdr cell)))
+                      (> .last_activity_date (cdr cell)))
               (setcdr cell .last_activity_date)))
            ;; Question wasn't present.
            (t
diff --git a/test/test-state.el b/test/test-state.el
new file mode 100644
index 0000000..7af4a64
--- /dev/null
+++ b/test/test-state.el
@@ -0,0 +1,22 @@
+(defmacro with-question-data (cell id &rest body)
+  (declare (indent 2))
+  `(let ((,cell '((question_id . ,id)
+                  (site_par . "emacs")
+                  (last_activity_date . 1234123456))))
+     ,@body))
+
+(ert-deftest test-question-mark-read ()
+  "00ccd139248e782cd8316eff65c26aed838c7e46"
+  (with-question-data q 10
+    ;; Check basic logic.
+    (should (sx-question--mark-read q))
+    (should (sx-question--read-p q))
+    (should (not (setcdr (assq 10 (cdr (assoc "emacs" sx-question--user-read-list))) nil)))
+    ;; Don't freak out because the cdr was nil.
+    (should (not (sx-question--read-p q)))
+    (should (sx-question--mark-read q)))
+  (should
+   (with-question-data q nil
+     ;; Don't freak out because question_id was nil.
+     (sx-question--mark-read q))))
+