branch: elpa/mastodon
commit b7f58adadeed443b7d1b7fd6f8830a13b5429f53
Author: Slava Barinov <[email protected]>
Commit: Slava Barinov <[email protected]>
tl: support nil as display_name
Some servers return no value instead of empty string when display_name is
not
set which results into nil argument passed to propertize.
---
lisp/mastodon-profile.el | 3 ++-
lisp/mastodon-tl.el | 3 ++-
test/mastodon-tl-tests.el | 47 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 95d275d253..177179fdf1 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -693,7 +693,8 @@ MAX-ID is a flag to include the max_id pagination
parameter."
(mastodon-profile--image-from-account account 'avatar_static)
(mastodon-profile--image-from-account account 'header_static)
"\n"
- (propertize .display_name 'face 'mastodon-display-name-face)
+ (when .display_name
+ (propertize .display_name 'face 'mastodon-display-name-face))
;; roles
(when .roles
(concat " " (mastodon-profile--render-roles .roles)))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index f6700ed391..c5e4461d01 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -637,7 +637,8 @@ is extracted from it."
(let ((data (or (alist-get 'account toot)
toot))) ;; grouped nofifs use account data directly
(let-alist data
- (propertize (if (not (string-empty-p .display_name))
+ (propertize (if (and .display_name
+ (not (string-empty-p .display_name)))
.display_name
.username)
'face 'mastodon-display-name-face
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index a4f6fa8249..6078cf2927 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -110,6 +110,35 @@
(reblogged)))
"A sample reblogged/boosted toot (parsed json)")
+(defconst mastodon-tl-test-empty-display-name
+ '((id . 61208)
+ (created_at . "2017-04-24T19:01:02.000Z")
+ (in_reply_to_id)
+ (in_reply_to_account_id)
+ (sensitive . :json-false)
+ (spoiler_text . "")
+ (visibility . "public")
+ (account (id . 42)
+ (username . "acct42")
+ (acct . "[email protected]")
+ (display_name . nil)
+ (locked . :json-false)
+ (created_at . "2017-04-01T00:00:00.000Z")
+ (followers_count . 99)
+ (following_count . 13)
+ (statuses_count . 101)
+ (note . "E"))
+ (media_attachments . ())
+ (mentions . ())
+ (tags . ())
+ (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
+ (url . "https://example.space/users/acct42/updates/123456789";)
+ (content . "<p>Just some text</p>")
+ (reblogs_count . 0)
+ (favourites_count . 0)
+ (reblog))
+ "A sample toot (parsed json)")
+
(defconst mastodon-tl--follow-notify-true-response
"HTTP/1.1 200 OK
Date: Mon, 20 Dec 2021 13:42:29 GMT
@@ -532,6 +561,24 @@ Strict-Transport-Security: max-age=31536000
"7 years, 4 months ago"
(plist-get properties 'display)))))))
+(ert-deftest mastodon-tl--byline-no-displayname ()
+ "Should not fail when display_name is nil."
+ (let* ((mastodon-tl--show-avatars-p nil)
+ (toot (cons '(reblogged . t) mastodon-tl-test-empty-display-name))
+ (timestamp (cdr (assoc 'created_at toot))))
+ (with-mock
+ (mock (date-to-time timestamp) => '(22782 21551))
+ (mock (mastodon-tl--symbol 'boost) => "B")
+ (mock (mastodon-tl--toot-stats toot) => "")
+ (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551))
=> "2999-99-99 00:11:22")
+
+ (should (string= (substring-no-properties
+ (mastodon-tl--byline toot))
+ (concat "(B) acct42 (@[email protected]) 2999-99-99
00:11:22
+ "
+ mastodon-tl--horiz-bar "
+"))))))
+
(ert-deftest mastodon-tl--consider-timestamp-for-updates-no-active-callback ()
"Should update the timestamp update variables as expected."
