Merge branch 'develop' into echo-faves-in-thread

1 files changed, 29 insertions, 24 deletions

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 8d2df60..2ff7f83 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -468,24 +468,27 @@ If media items have been attached and uploaded with
                                             (symbol-name t)))
                           ("spoiler_text" . ,spoiler)))
          (args-media (when mastodon-toot--media-attachments
-                       (if (= (length mastodon-toot--media-attachments)
-                              (length mastodon-toot--media-attachment-ids))
-                       ;; (mastodon-toot--upload-attached-media)
-                       ;; moved upload to mastodon-toot--attach-media
                            (mapcar (lambda (id)
                                      (cons "media_ids[]" id))
-                                   mastodon-toot--media-attachment-ids)
-                         (message "Looks like something went wrong with your uploads. Maybe you want to try again."))))
+                                   mastodon-toot--media-attachment-ids)))
          (args (append args-media args-no-media)))
-    (if (> (length toot) (string-to-number mastodon-toot--max-toot-chars))
-        (message "Looks like your toot is longer than that maximum allowed length.")
-      (if empty-toot-p
-          (message "Empty toot. Cowardly refusing to post this.")
-        (let ((response (mastodon-http--post endpoint args nil)))
-          (mastodon-http--triage response
-                                 (lambda ()
-                                   (mastodon-toot--kill)
-                                   (message "Toot toot!"))))))))
+    (cond ((and mastodon-toot--media-attachments
+                ;; make sure we have media args
+                ;; and the same num of ids as attachments
+                (or (not args-media)
+                    (not (= (length mastodon-toot--media-attachments)
+                            (length mastodon-toot--media-attachment-ids)))))
+           (message "Something is wrong with your uploads. Wait for them to complete or try again."))
+          ((> (length toot) (string-to-number mastodon-toot--max-toot-chars))
+           (message "Looks like your toot is longer than that maximum allowed length."))
+          (empty-toot-p
+           (message "Empty toot. Cowardly refusing to post this."))
+          (t
+           (let ((response (mastodon-http--post endpoint args nil)))
+             (mastodon-http--triage response
+                                    (lambda ()
+                                      (mastodon-toot--kill)
+                                      (message "Toot toot!"))))))))
 
 (defun mastodon-toot--process-local (acct)
   "Add domain to local ACCT and replace the curent user name with \"\".
@@ -629,15 +632,17 @@ File is actually attached to the toot upon posting."
   (when (>= (length mastodon-toot--media-attachments) 4)
     ;; Only a max. of 4 attachments are allowed, so pop the oldest one.
     (pop mastodon-toot--media-attachments))
-  (setq mastodon-toot--media-attachments
-        (nconc mastodon-toot--media-attachments
-               `(((:contents . ,(mastodon-http--read-file-as-string file))
-                  (:content-type . ,content-type)
-                  (:description . ,description)
-                  (:filename . ,file)))))
-  (mastodon-toot--refresh-attachments-display)
-  ;; upload only most recent attachment:
-  (mastodon-toot--upload-attached-media (car (last mastodon-toot--media-attachments))))
+  (if (file-directory-p file)
+      (message "Looks like you chose a directory not a file.")
+    (setq mastodon-toot--media-attachments
+          (nconc mastodon-toot--media-attachments
+                 `(((:contents . ,(mastodon-http--read-file-as-string file))
+                    (:content-type . ,content-type)
+                    (:description . ,description)
+                    (:filename . ,file)))))
+    (mastodon-toot--refresh-attachments-display)
+    ;; upload only most recent attachment:
+    (mastodon-toot--upload-attached-media (car (last mastodon-toot--media-attachments)))))
 
 (defun mastodon-toot--upload-attached-media (attachment)
   "Upload a single attachment using `mastodon-http--post-media-attachment'.