Merge pull request #153 from alexjgriffith/explicit-media-toggle

explicit media toggle and small bug fixes

5 files changed, 78 insertions, 24 deletions

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 75cca2f..f519e20 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -107,6 +107,7 @@ Pass response buffer to CALLBACK function."
                   (decode-coding-string
                    (buffer-substring-no-properties (point) (point-max))
                    'utf-8)))
+             (kill-buffer)
              (json-read-from-string json-string)))))
     json-vector))
 
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index a44fb2c..c5b2924 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -55,7 +55,7 @@
   (interactive)
   (mastodon-inspect--dump-json-in-buffer
    (concat "*mastodon-inspect-toot-"
-           (int-to-string (mastodon-tl--property 'toot-id))
+           (mastodon-tl--as-string (mastodon-tl--property 'toot-id))
            "*")
   (mastodon-tl--property 'toot-json)))
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 38aee76..dbc815f 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -62,6 +62,9 @@ keep the timestamps current as time progresses."
   (image-type-available-p 'imagemagick)
   "A boolean value stating whether to show avatars in timelines.")
 
+(defvar mastodon-tl--display-media-p t
+  "A boolean value stating whether to show media in timelines.")
+
 (defvar mastodon-tl--timestamp-next-update nil
   "The timestamp when the buffer should next be scanned to update the timestamps.")
 (make-variable-buffer-local 'mastodon-tl--timestamp-next-update)
@@ -138,7 +141,7 @@ Optionally start from POS."
          (name (cdr (assoc 'display_name account)))
          (avatar-url (cdr (assoc 'avatar account))))
     (concat
-     (when mastodon-tl--show-avatars-p
+     (when (and mastodon-tl--show-avatars-p mastodon-tl--display-media-p)
        (mastodon-media--get-avatar-rendering avatar-url))
      (propertize name 'face 'mastodon-display-name-face)
      (propertize (concat " (@"
@@ -232,8 +235,8 @@ TIME-STAMP is assumed to be in the past."
   "Generate byline for TOOT."
   (let ((id (cdr (assoc 'id toot)))
         (parsed-time (date-to-time (mastodon-tl--field 'created_at toot)))
-        (faved (mastodon-tl--field 'favourited toot))
-        (boosted (mastodon-tl--field 'reblogged toot)))
+        (faved (equal 't (mastodon-tl--field 'favourited toot)))
+        (boosted (equal 't (mastodon-tl--field 'reblogged toot))))
     (propertize
      (concat (propertize "\n | " 'face 'default)
              (when boosted
@@ -289,11 +292,14 @@ also render the html"
                         (lambda (media-attachement)
                           (let ((preview-url
                                  (cdr (assoc 'preview_url media-attachement))))
-                            (mastodon-media--get-media-link-rendering
-                             preview-url)))
+                            (if mastodon-tl--display-media-p
+                                (mastodon-media--get-media-link-rendering
+                                 preview-url)
+                              (concat "Media::" preview-url "\n"))))
                         media-attachements "")))
-    (if (not (equal media-string ""))
-        (concat "\n" media-string ) "")))
+    (if (not (and (not mastodon-tl--display-media-p)
+                  (equal media-string "")))
+        (concat "\n" media-string) "")))
 
 
 (defun mastodon-tl--content (toot)
@@ -324,7 +330,8 @@ also render the html"
   (goto-char (point-min))
   (while (search-forward "\n\n\n | " nil t)
     (replace-match "\n | "))
-  (mastodon-media--inline-images))
+  (when mastodon-tl--display-media-p
+    (mastodon-media--inline-images)))
 
 (defun mastodon-tl--get-update-function (&optional buffer)
   "Get the UPDATE-FUNCTION stored in `mastodon-tl--buffer-spec'"
@@ -354,9 +361,7 @@ also render the html"
                                        "&"
                                      "?")
                                    "max_id="
-                                   (if (numberp id )
-                                       (number-to-string id)
-                                     id)))))
+                                   (mastodon-tl--as-string id)))))
     (mastodon-http--get-json url)))
 
 ;; TODO
@@ -369,9 +374,7 @@ also render the html"
                                       "&"
                                     "?")
                                   "since_id="
-                                  (if (numberp id)
-                                      (number-to-string id)
-                                    id)))))
+                                  (mastodon-tl--as-string id)))))
     (mastodon-http--get-json url)))
 
 (defun mastodon-tl--property (prop &optional backward)
@@ -395,21 +398,47 @@ Move forward (down) the timeline unless BACKWARD is non-nil."
   (goto-char (point-max))
   (mastodon-tl--property 'toot-id t))
 
+(defun mastodon-tl--as-string(numeric)
+  "Convert NUMERIC to string."
+  (cond ((numberp numeric)
+         (number-to-string numeric))
+        ((stringp numeric) numeric)
+        (t (error
+            "Numeric:%s must be either a string or a number"
+            numeric))))
+
+(defun mastodon-tl--toot-id (json)
+  "Find approproiate toot id in JSON.
+
+If the toot has been boosted use the id found in the
+reblog portion of the toot.  Otherwise, use the body of
+the toot.  This is the same behaviour as the mastodon.social
+webapp"
+  (let ((id (cdr (assoc 'id json)))
+        (reblog (cdr (assoc 'reblog json))))
+    (if reblog (cdr (assoc 'id reblog)) id)))
+  
 (defun mastodon-tl--thread ()
   "Open thread buffer for toot under `point'."
   (interactive)
-  (let* ((id (number-to-string (mastodon-tl--property 'toot-id)))
+  (let* ((id (mastodon-tl--as-string (mastodon-tl--toot-id
+                                      (mastodon-tl--property 'toot-json))))
          (url (mastodon-http--api (format "statuses/%s/context" id)))
          (buffer (format "*mastodon-thread-%s*" id))
          (toot (mastodon-tl--property 'toot-json))
          (context (mastodon-http--get-json url)))
     (with-output-to-temp-buffer buffer
       (switch-to-buffer buffer)
+      (mastodon-mode)
+      (setq mastodon-tl--buffer-spec
+            `(buffer-name ,buffer
+                          endpoint ,(format "statuses/%s/context" id)
+                          update-function
+                          (lambda(toot) (message "END of thread."))))
       (mastodon-tl--timeline (vconcat
                               (cdr (assoc 'ancestors context))
                               `(,toot)
-                              (cdr (assoc 'descendants context)))))
-    (mastodon-mode)))
+                              (cdr (assoc 'descendants context)))))))
 
 (defun mastodon-tl--more ()
   "Append older toots to timeline."
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6ec3174..7e2451e 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -70,7 +70,7 @@ Remove MARKER if RM is non-nil."
   "Take ACTION on toot at point, then execute CALLBACK."
   (let* ((id (mastodon-tl--property 'toot-id))
          (url (mastodon-http--api (concat "statuses/"
-                                         (number-to-string id)
+                                         (mastodon-tl--as-string id)
                                          "/"
                                          action))))
     (let ((response (mastodon-http--post url nil nil)))
@@ -79,7 +79,8 @@ Remove MARKER if RM is non-nil."
 (defun mastodon-toot--toggle-boost ()
   "Boost/unboost toot at `point'."
   (interactive)
-  (let* ((id (mastodon-tl--property 'toot-id))
+  (let* ((id (mastodon-tl--as-string
+              (mastodon-tl--property 'toot-id)))
          (boosted (get-text-property (point) 'boosted-p))
          (action (if boosted "unreblog" "reblog"))
          (msg (if boosted "unboosted" "boosted"))
@@ -87,19 +88,20 @@ Remove MARKER if RM is non-nil."
     (mastodon-toot--action action
                            (lambda ()
                              (mastodon-toot--action-success "B" remove)
-                             (message (format "%s #%d" msg id))))))
+                             (message (format "%s #%s" msg id))))))
 
 (defun mastodon-toot--toggle-favourite ()
   "Favourite/unfavourite toot at `point'."
   (interactive)
-  (let* ((id (mastodon-tl--property 'toot-id))
+  (let* ((id (mastodon-tl--as-string
+              (mastodon-tl--property 'toot-id)))
          (faved (get-text-property (point) 'favourited-p))
          (action (if faved "unfavourite" "favourite"))
          (remove (when faved t)))
     (mastodon-toot--action action
                            (lambda ()
                              (mastodon-toot--action-success "F" remove)
-                             (message (format "%sd #%d" action id))))))
+                             (message (format "%s #%s" action id))))))
 
 (defun mastodon-toot--kill ()
   "Kill `mastodon-toot-mode' buffer and window.
@@ -144,7 +146,7 @@ Set `mastodon-toot--content-warning' to nil."
   "Reply to toot at `point'."
   (interactive)
   (let* ((toot (mastodon-tl--property 'toot-json))
-         (id (number-to-string (mastodon-tl--field 'id toot)))
+         (id (mastodon-tl--as-string (mastodon-tl--field 'id toot)))
          (account (mastodon-tl--field 'account toot))
          (user (cdr (assoc 'username account))))
     (mastodon-toot user id)))
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 7d6a08f..5d7699e 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -97,6 +97,28 @@
   (let ((input "foobar</p>"))
     (should (string= (mastodon-tl--remove-html input) "foobar\n\n"))))
 
+(ert-deftest toot-id-boosted ()
+  "If a toot is boostedm, return the reblog id."
+  (should (string= (mastodon-tl--as-string
+                    (mastodon-tl--toot-id mastodon-tl-test-base-boosted-toot))
+                   "4543919")))
+
+(ert-deftest toot-id ()
+  "If a toot is boostedm, return the reblog id."
+  (should (string= (mastodon-tl--as-string
+                    (mastodon-tl--toot-id mastodon-tl-test-base-toot))
+                   "61208")))
+
+(ert-deftest as-string-1 ()
+  "Should accept a string or number and return a string."
+  (let ((id "1000"))
+      (should (string= (mastodon-tl--as-string id) id))))
+
+(ert-deftest as-string-2 ()
+  "Should accept a string or number and return a string."
+  (let ((id 1000))
+      (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
+
 (ert-deftest more-json ()
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))