Merge pull request #162 from vermiculus/comment-enhancement

Comment enhancement

3 files changed, 54 insertions, 25 deletions

diff --git a/sx-compose.el b/sx-compose.el
index 96f47f3..5201435 100644
--- a/sx-compose.el
+++ b/sx-compose.el
@@ -117,9 +117,12 @@ contents to the API, then calls `sx-compose-after-send-functions'."
                               (current-buffer) result)))))
 
 (defun sx-compose-quit (buffer _)
-  "Kill BUFFER."
+  "Close BUFFER's window and kill it."
   (interactive (list (current-buffer) nil))
   (when (buffer-live-p buffer)
+    (let ((w (get-buffer-window buffer)))
+      (when (window-live-p w)
+        (delete-window w)))
     (kill-buffer buffer)))
 
 (defun sx-compose--copy-as-kill (buffer _)
@@ -146,19 +149,22 @@ respectively added locally to `sx-compose-before-send-hook' and
       (error "Invalid PARENT"))
   (let ((is-question
          (and (listp parent)
-              (null (cdr (assoc 'answer_id parent))))))
+              (cdr (assoc 'title parent)))))
     (with-current-buffer (sx-compose--get-buffer-create site parent)
       (sx-compose-mode)
       (setq sx-compose--send-function
             (if (consp parent)
                 (sx-assoc-let parent
-                  (lambda () (sx-method-call (if .title 'questions 'answers)
+                  (lambda () (sx-method-call (cond
+                                         (.title 'questions)
+                                         (.comment_id 'comments)
+                                         (t 'answers))
                           :auth 'warn
                           :url-method "POST"
                           :filter sx-browse-filter
                           :site site
                           :keywords (sx-compose--generate-keywords is-question)
-                          :id (or .answer_id .question_id)
+                          :id (or .comment_id .answer_id .question_id)
                           :submethod 'edit)))
               (lambda () (sx-method-call 'questions
                       :auth 'warn
@@ -256,8 +262,13 @@ the id property."
        site data)))
    (t
     (get-buffer-create
-     (format "*sx draft edit %s %s*"
-       site (sx-assoc-let data (or .answer_id .question_id)))))))
+     (sx-assoc-let data
+       (format "*sx draft edit %s %s %s*"
+         site
+         (cond (.title "question")
+               (.comment_id "comment")
+               (t "answer"))
+         (or .comment_id .answer_id .question_id)))))))
 
 (provide 'sx-compose)
 ;;; sx-compose.el ends here
diff --git a/sx-interaction.el b/sx-interaction.el
index e7a4d94..c6f2639 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -93,10 +93,11 @@ If it's not a question, or if it is read, return DATA."
 If BUFFER is not live, nothing is done."
   (setq buffer (or buffer (current-buffer)))
   (when (buffer-live-p buffer)
-    (cond ((derived-mode-p 'sx-question-list-mode)
-           (sx-question-list-refresh 'redisplay 'no-update))
-          ((derived-mode-p 'sx-question-mode)
-           (sx-question-mode-refresh 'no-update)))))
+    (with-current-buffer buffer
+      (cond ((derived-mode-p 'sx-question-list-mode)
+             (sx-question-list-refresh 'redisplay 'no-update))
+            ((derived-mode-p 'sx-question-mode)
+             (sx-question-mode-refresh 'no-update))))))
 
 (defun sx--copy-data (from to)
   "Copy all fields of alist FORM onto TO.
@@ -215,8 +216,8 @@ TEXT is a string. Interactively, it is read from the minibufer."
                   "Comment text: "
                   (when .comment_id
                     (concat (sx--user-@name .owner) " "))))
-      (while (< (string-width text) 15)
-        (setq text (read-string "Comment text (at least 15 characters): " text))))
+      (while (not (sx--comment-valid-p text 'silent))
+        (setq text (read-string "Comment text (between 16 and 600 characters): " text))))
     ;; If non-interactive, `text' could be anything.
     (unless (stringp text)
       (error "Comment body must be a string"))
@@ -240,6 +241,18 @@ TEXT is a string. Interactively, it is read from the minibufer."
         ;; Display the changes in `data'.
         (sx--maybe-update-display)))))
 
+(defun sx--comment-valid-p (&optional text silent)
+  "Non-nil if TEXT fits stack exchange comment length limits.
+If TEXT is nil, use `buffer-string'. Must have more than 15 and
+less than 601 characters.
+If SILENT is nil, message the user about this limit."
+  (let ((w (string-width (or text (buffer-string)))))
+    (if (and (< 15 w) (< w 601))
+        t
+      (unless silent
+        (message "Comments must be within 16 and 600 characters."))
+      nil)))
+
 (defun sx--get-post (type site id)
   "Find in the database a post identified by TYPE, SITE and ID.
 TYPE is `question' or `answer'. 
@@ -286,11 +299,12 @@ from context at point."
   ;; If we ever make an "Edit" button, first arg is a marker.
   (when (markerp data) (setq data (sx--data-here)))
   (sx-assoc-let data
-    (when .comment_id (sx-user-error "Editing comments is not supported yet"))
     (let ((buffer (current-buffer)))
       (pop-to-buffer
        (sx-compose-create
-        .site data nil
+        .site data
+        ;; Before send hook
+        (when .comment_id (list #'sx--comment-valid-p))
         ;; After send functions
         (list (lambda (_ res)
                 (sx--copy-data (elt res 0) data)
diff --git a/sx-question-print.el b/sx-question-print.el
index 3d698cc..0a6c3a8 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -290,18 +290,22 @@ The comment is indented, filled, and then printed according to
   (sx--wrap-in-overlay
       (list 'sx--data-here comment-data)
     (sx-assoc-let comment-data
-      (insert
+      (when (> .score 0) 
+        (insert (number-to-string .score)
+                (if (eq .upvoted t) "^" "")
+                " "))
+      (insert 
        (format
-        sx-question-mode-comments-format
-        (sx-question-mode--propertize-display-name .owner)
-        (substring
-         ;; We fill with three spaces at the start, so the comment is
-         ;; slightly indented.
-         (sx-question-mode--fill-and-fontify
-          (concat "   " .body_markdown))
-         ;; Then we remove the spaces from the first line, since we'll
-         ;; add the username there anyway.
-         3))))))
+           sx-question-mode-comments-format
+         (sx-question-mode--propertize-display-name .owner)
+         (substring
+          ;; We fill with three spaces at the start, so the comment is
+          ;; slightly indented.
+          (sx-question-mode--fill-and-fontify
+           (concat "   " .body_markdown))
+          ;; Then we remove the spaces from the first line, since we'll
+          ;; add the username there anyway.
+          3))))))
 
 (defun sx-question-mode--insert-header (&rest args)
   "Insert propertized ARGS.