indentation and stale TODOs

2 files changed, 39 insertions, 40 deletions

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 086dcec..a3a0a95 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -262,43 +262,43 @@ item uploaded, and `mastodon-toot--update-status-fields' is run."
   (let* ((file (file-name-nondirectory filename))
          (request-backend 'curl))
     (request
-     url
-     :type "POST"
-     :params `(("description" . ,caption))
-     :files `(("file" . (,file :file ,filename
-                               :mime-type "multipart/form-data")))
-     :parser 'json-read
-     :headers `(("Authorization" . ,(concat "Bearer "
-                                            (mastodon-auth--access-token))))
-     :sync nil
-     :success (cl-function
-               (lambda (&key data &allow-other-keys)
-                 (when data
-                   (push (alist-get 'id data)
-                         mastodon-toot--media-attachment-ids) ; add ID to list
-                   (message "%s file %s with id %S and caption '%s' uploaded!"
-                            (capitalize (alist-get 'type data))
-                            file
-                            (alist-get 'id data)
-                            (alist-get 'description data))
-                   (mastodon-toot--update-status-fields))))
-     :error (cl-function
-             (lambda (&key error-thrown &allow-other-keys)
-               (cond
-                ;; handle curl errors first (eg 26, can't read file/path)
-                ;; because the '=' test below fails for them
-                ;; they have the form (error . error message 24)
-                ((not (proper-list-p error-thrown)) ; not dotted list
-		 (message "Got error: %s. Shit went south." (cdr error-thrown)))
-                ;; handle mastodon api errors
-                ;; they have the form (error http 401)
-		((= (car (last error-thrown)) 401)
-                 (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
-                ((= (car (last error-thrown)) 422)
-                 (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
-                (t
-                 (message "Got error: %s Shit went south"
-                          error-thrown))))))))
+      url
+      :type "POST"
+      :params `(("description" . ,caption))
+      :files `(("file" . (,file :file ,filename
+                                :mime-type "multipart/form-data")))
+      :parser 'json-read
+      :headers `(("Authorization" . ,(concat "Bearer "
+                                             (mastodon-auth--access-token))))
+      :sync nil
+      :success (cl-function
+                (lambda (&key data &allow-other-keys)
+                  (when data
+                    (push (alist-get 'id data)
+                          mastodon-toot--media-attachment-ids) ; add ID to list
+                    (message "%s file %s with id %S and caption '%s' uploaded!"
+                             (capitalize (alist-get 'type data))
+                             file
+                             (alist-get 'id data)
+                             (alist-get 'description data))
+                    (mastodon-toot--update-status-fields))))
+      :error (cl-function
+              (lambda (&key error-thrown &allow-other-keys)
+                (cond
+                 ;; handle curl errors first (eg 26, can't read file/path)
+                 ;; because the '=' test below fails for them
+                 ;; they have the form (error . error message 24)
+                 ((not (proper-list-p error-thrown)) ; not dotted list
+		          (message "Got error: %s. Shit went south." (cdr error-thrown)))
+                 ;; handle mastodon api errors
+                 ;; they have the form (error http 401)
+		         ((= (car (last error-thrown)) 401)
+                  (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
+                 ((= (car (last error-thrown)) 422)
+                  (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
+                 (t
+                  (message "Got error: %s Shit went south"
+                           error-thrown))))))))
 
 (provide 'mastodon-http)
 ;;; mastodon-http.el ends here
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index ace15b2..9715a6c 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -186,7 +186,6 @@ with the image."
 MEDIA-TYPE is a symbol and either 'avatar or 'media-link.
 START is the position where we start loading the image.
 REGION-LENGTH is the range from start to propertize."
-  ;; TODO: Cache the avatars
   (let ((image-options (when (or (image-type-available-p 'imagemagick)
                                  (image-transforms-p)) ; inbuilt scaling in 27.1
                          (cond
@@ -196,8 +195,8 @@ REGION-LENGTH is the range from start to propertize."
                            `(:max-height ,mastodon-media--preview-max-height))))))
     (let ((buffer (current-buffer))
           (marker (copy-marker start))
-	  ;; Keep url.el from spamming us with messages about connecting to hosts:
-	  (url-show-status nil))
+	      ;; Keep url.el from spamming us with messages about connecting to hosts:
+	      (url-show-status nil))
       (condition-case nil
           ;; catch any errors in url-retrieve so as to not abort
           ;; whatever called us