Merge branch 'develop' into update-meta-fields

6 files changed, 83 insertions, 68 deletions

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 8e75705..4726d29 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -647,7 +647,9 @@ START and END are the boundaries of the link in the toot."
          keymap
          (help-echo (get-text-property start 'help-echo))
          extra-properties
-         (toot-url (mastodon-tl--field 'url toot))
+         ;; handle calling this on non-toots, e.g. for profiles:
+         (toot-url (when (proper-list-p toot)
+                     (mastodon-tl--field 'url toot)))
          (toot-url (when toot-url (url-generic-parse-url toot-url)))
          (toot-instance-url (if toot-url
                                 (concat (url-type toot-url) "://"
@@ -1700,7 +1702,13 @@ For use after e.g. deleting a toot."
          (mastodon-notifications--get))
         ((equal (mastodon-tl--buffer-name)
                 (concat "*mastodon-" (mastodon-auth--get-account-name) "-statuses*"))
-         (mastodon-profile--my-profile))))
+         (mastodon-profile--my-profile))
+        ((save-match-data
+           (string-match
+            "statuses/\\(?2:[[:digit:]]+\\)/context"
+            (mastodon-tl--get-endpoint))
+           (mastodon-tl--thread
+            (match-string 2 (mastodon-tl--get-endpoint)))))))
 
 (defun mastodon-tl--more ()
   "Append older toots to timeline, asynchronously."
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 2f58bfb..5ec58dd 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -462,14 +462,13 @@ REPLY-ID, TOOT-VISIBILITY, and TOOT-CW of deleted toot are preseved."
 (defun mastodon-toot--kill (&optional cancel)
   "Kill `mastodon-toot-mode' buffer and window.
 CANCEL means the toot was not sent, so we save the toot text as a draft."
-  (with-current-buffer (get-buffer "*new toot*")
-    (unless (eq mastodon-toot-current-toot-text nil)
-      (when cancel
-        (cl-pushnew mastodon-toot-current-toot-text
-                    mastodon-toot-draft-toots-list :test 'equal)))
-    ;; prevent some weird bug when cancelling a non-empty toot:
-    (delete #'mastodon-toot-save-toot-text after-change-functions)
-    (kill-buffer-and-window)))
+  (unless (eq mastodon-toot-current-toot-text nil)
+    (when cancel
+      (cl-pushnew mastodon-toot-current-toot-text
+                  mastodon-toot-draft-toots-list :test 'equal)))
+  ;; prevent some weird bug when cancelling a non-empty toot:
+  (delete #'mastodon-toot-save-toot-text after-change-functions)
+  (kill-buffer-and-window))
 
 (defun mastodon-toot--cancel ()
   "Kill new-toot buffer/window. Does not POST content to Mastodon.
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index f5cc4c5..7c87933 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -187,7 +187,10 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications"))
+      (mock (mastodon-profile-fetch-server-account-settings)
+            => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
+
       (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 817e386..640afb7 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -246,6 +246,8 @@ content generation in the function under test."
     (mock (shr-render-region * *) => nil)
     ;; Don't perform the actual update call at the end.
     ;;(mock (mastodon-tl--timeline *))
+    (mock (mastodon-profile-fetch-server-account-settings)
+          => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
 
     (let ((mastodon-tl--show-avatars t)
           (mastodon-tl--display-media-p t)
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index a569c89..bb5d00f 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -206,10 +206,10 @@ a string or a numeric."
               (weeks (n) (* n (days 7)))
               (years (n) (* n (days 365)))
               (format-seconds-since (seconds)
-                (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
-                  (mastodon-tl--relative-time-description timestamp)))
+                                    (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
+                                      (mastodon-tl--relative-time-description timestamp)))
               (check (seconds expected)
-                (should (string= (format-seconds-since seconds) expected))))
+                     (should (string= (format-seconds-since seconds) expected))))
     (check 1 "less than a minute ago")
     (check 59 "less than a minute ago")
     (check 60 "one minute ago")
@@ -245,33 +245,33 @@ a string or a numeric."
                 (weeks (n) (* n (days 7)))
                 (years (n) (* n (days 365.25)))
                 (next-update (seconds-ago)
-                  (let* ((timestamp (time-subtract current-time
-                                                   (seconds-to-time seconds-ago))))
-                    (cdr (mastodon-tl--relative-time-details timestamp current-time))))
+                             (let* ((timestamp (time-subtract current-time
+                                                              (seconds-to-time seconds-ago))))
+                               (cdr (mastodon-tl--relative-time-details timestamp current-time))))
                 (check (seconds-ago)
-                  (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
-                         (at-now (mastodon-tl--relative-time-description timestamp current-time))
-                         (at-one-second-before (mastodon-tl--relative-time-description
-                                                timestamp
-                                                (time-subtract (next-update seconds-ago)
-                                                               (seconds-to-time 1))))
-                         (at-result (mastodon-tl--relative-time-description
-                                     timestamp
-                                     (next-update seconds-ago))))
-                    (when nil  ;; change to t to debug test failures
-                      (prin1 (format "\nFor %s: %s / %s"
-                                     seconds-ago
-                                     (time-to-seconds
-                                      (time-subtract (next-update seconds-ago)
-                                                     timestamp))
-                                     (round
-                                      (time-to-seconds
-                                       (time-subtract (next-update seconds-ago)
-                                                      current-time))))))
-                    ;; a second earlier the description is the same as at current time
-                    (should (string= at-now at-one-second-before))
-                    ;; but at the result time it is different
-                    (should-not (string= at-one-second-before at-result)))))
+                       (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
+                              (at-now (mastodon-tl--relative-time-description timestamp current-time))
+                              (at-one-second-before (mastodon-tl--relative-time-description
+                                                     timestamp
+                                                     (time-subtract (next-update seconds-ago)
+                                                                    (seconds-to-time 1))))
+                              (at-result (mastodon-tl--relative-time-description
+                                          timestamp
+                                          (next-update seconds-ago))))
+                         (when nil  ;; change to t to debug test failures
+                           (prin1 (format "\nFor %s: %s / %s"
+                                          seconds-ago
+                                          (time-to-seconds
+                                           (time-subtract (next-update seconds-ago)
+                                                          timestamp))
+                                          (round
+                                           (time-to-seconds
+                                            (time-subtract (next-update seconds-ago)
+                                                           current-time))))))
+                         ;; a second earlier the description is the same as at current time
+                         (should (string= at-now at-one-second-before))
+                         ;; but at the result time it is different
+                         (should-not (string= at-one-second-before at-result)))))
       (check 0)
       (check 1)
       (check 59)
@@ -309,10 +309,10 @@ a string or a numeric."
       (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
                                          'mastodon-tl--byline-author
                                          'mastodon-tl--byline-boosted))
-	    (handle-location 20))
+	        (handle-location 20))
         (should (string= (substring-no-properties
-			  byline)
-			 "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+			              byline)
+			             "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 "))
         (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
@@ -407,19 +407,19 @@ a string or a numeric."
       (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
 
       (let ((byline (mastodon-tl--byline toot
-					 'mastodon-tl--byline-author
-					 'mastodon-tl--byline-boosted))
-	    (handle1-location 20)
-	    (handle2-location 65))
+					                     'mastodon-tl--byline-author
+					                     'mastodon-tl--byline-boosted))
+	        (handle1-location 20)
+	        (handle2-location 65))
         (should (string= (substring-no-properties byline)
-			 "Account 42 (@acct42@example.space)
+			             "Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 "))
         (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (equal (get-text-property handle1-location 'help-echo byline)
-		       "Browse user profile of @acct42@example.space"))
+		               "Browse user profile of @acct42@example.space"))
         (should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
                     'user-handle))
         (should (equal (get-text-property handle2-location 'help-echo byline)
@@ -819,13 +819,13 @@ constant."
   (let ((now (current-time))
         markers)
     (cl-labels ((insert-timestamp (n)
-                  (insert (format "\nSome text before timestamp %s:" n))
-                  (insert (propertize
-                           (format "timestamp #%s" n)
-                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
-                           'display (format "unset %s" n)))
-                  (push (copy-marker (point)) markers)
-                  (insert " some more text.")))
+                                  (insert (format "\nSome text before timestamp %s:" n))
+                                  (insert (propertize
+                                           (format "timestamp #%s" n)
+                                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
+                                           'display (format "unset %s" n)))
+                                  (push (copy-marker (point)) markers)
+                                  (insert " some more text.")))
       (with-temp-buffer
         (cl-dotimes (n 12) (insert-timestamp (+ n 2)))
         (setq markers (nreverse markers))
@@ -883,6 +883,9 @@ constant."
       (insert "some text before\n")
       (setq toot-start (point))
       (with-mock
+        (mock (mastodon-profile--get-preferences-pref
+               'reading:expand:spoilers)
+              => :json-false)
         (stub create-image => '(image "fake data"))
         (stub shr-render-region => nil) ;; Travis's Emacs doesn't have libxml
         (insert
@@ -892,7 +895,7 @@ constant."
       (add-text-properties
        toot-start toot-end
        (list 'toot-json normal-toot-with-spoiler
-	     'toot-id (cdr (assoc 'id normal-toot-with-spoiler))))
+	         'toot-id (cdr (assoc 'id normal-toot-with-spoiler))))
 
       (goto-char toot-start)
       ;; (should (eq t (looking-at "This is the spoiler warning text")))
@@ -964,28 +967,28 @@ constant."
 (ert-deftest mastodon-tl--extract-hashtag-from-url-mastodon-link ()
   "Should extract the hashtag from a tags url."
   (should (equal (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/tags/foo"
-		  "https://example.org")
-		 "foo")))
+		          "https://example.org/tags/foo"
+		          "https://example.org")
+		         "foo")))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-other-link ()
   "Should extract the hashtag from a tag url."
   (should (equal (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/tag/foo"
-		  "https://example.org")
-		 "foo")))
+		          "https://example.org/tag/foo"
+		          "https://example.org")
+		         "foo")))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-wrong-instance ()
   "Should not find a tag when the instance doesn't match."
   (should (null (mastodon-tl--extract-hashtag-from-url
-		 "https://example.org/tags/foo"
-		 "https://other.example.org"))))
+		         "https://example.org/tags/foo"
+		         "https://other.example.org"))))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-not-tag ()
   "Should not find a hashtag when not a tag url"
   (should (null (mastodon-tl--extract-hashtag-from-url
-		 "https://example.org/@userid"
-		 "https://example.org"))))
+		         "https://example.org/@userid"
+		         "https://example.org"))))
 
 (ert-deftest mastodon-tl--userhandles ()
   "Should recognise userhandles in a toot and add the required properties to it."
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 0c31029..5b95cdc 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -89,7 +89,7 @@ mention string."
         (mastodon-instance-url "https://local.social"))
     (should (string= (mastodon-toot--mentions mastodon-toot-no-mention) ""))))
 
-;; TODO: test y-or-no-p with matodon-toot--cancel
+;; TODO: test y-or-no-p with mastodon-toot--cancel
 (ert-deftest mastodon-toot--kill ()
   "Should kill the buffer when cancelling the toot."
   (with-mock