Merge pull request 'Merge h_d's cleanups' (#8) from h_d/mastodon.el:cleanups into develop

Reviewed-on: https://git.blast.noho.st/mouse/mastodon.el/pulls/8

1 files changed, 52 insertions, 52 deletions

diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 5f52bb7..fcfaec9 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -72,15 +72,15 @@ Returns a nested list containing user handle, display name, and URL."
   (let* ((url (format "%s/api/v2/search" mastodon-instance-url))
          (buffer (format "*mastodon-search-%s*" query))
          (response (mastodon-http--get-search-json url query))
-         (accts (cdr (assoc 'accounts response)))
-         (tags (cdr (assoc 'hashtags response)))
-         (statuses (cdr (assoc 'statuses response)))
+         (accts (alist-get 'accounts response))
+         (tags (alist-get 'hashtags response))
+         (statuses (alist-get 'statuses response))
          (user-ids (mapcar #'mastodon-search--get-user-info
                            accts)) ; returns a list of three-item lists
          (tags-list (mapcar #'mastodon-search--get-hashtag-info
                             tags))
          ;; (status-list (mapcar #'mastodon-search--get-status-info
-                              ;; statuses))
+         ;; statuses))
          (status-ids-list (mapcar 'mastodon-search--get-id-from-status
                                   statuses))
          (toots-list-json (mapcar #'mastodon-search--fetch-full-status-from-id
@@ -97,66 +97,66 @@ Returns a nested list containing user handle, display name, and URL."
                          " ------------\n\n")
                  'success))
         (mapc (lambda (el)
-              (insert (propertize (car el) 'face 'mastodon-display-name-face)
-                      " : \n : "
-                      (propertize (concat "@" (car (cdr el)))
-                                  'face 'mastodon-handle-face
-                                  'mouse-face 'highlight
-		                  'mastodon-tab-stop 'user-handle
-		                  'keymap mastodon-tl--link-keymap
-                                  'mastodon-handle (concat "@" (car (cdr el)))
-		                  'help-echo (concat "Browse user profile of @" (car (cdr el))))
-                      " : \n"
-                      "\n"))
-            user-ids)
-      ;; hashtag results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " HASHTAGS\n"
-                       " ------------\n\n")
-               'success))
-      (mapc (lambda (el)
-              (insert " : #"
-                      (propertize (car el)
-                                  'mouse-face 'highlight
-                                  'mastodon-tag (car el)
-                                  'mastodon-tab-stop 'hashtag
-                                  'help-echo (concat "Browse tag #" (car el))
-                                  'keymap mastodon-tl--link-keymap)
-                      " : \n\n"))
-            tags-list)
-      ;; status results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " STATUSES\n"
-                       " ------------\n")
-               'success))
-      (mapc 'mastodon-tl--toot toots-list-json)
-      (goto-char (point-min))))))
+                (insert (propertize (car el) 'face 'mastodon-display-name-face)
+                        " : \n : "
+                        (propertize (concat "@" (car (cdr el)))
+                                    'face 'mastodon-handle-face
+                                    'mouse-face 'highlight
+		                    'mastodon-tab-stop 'user-handle
+		                    'keymap mastodon-tl--link-keymap
+                                    'mastodon-handle (concat "@" (car (cdr el)))
+		                    'help-echo (concat "Browse user profile of @" (car (cdr el))))
+                        " : \n"
+                        "\n"))
+              user-ids)
+        ;; hashtag results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " HASHTAGS\n"
+                         " ------------\n\n")
+                 'success))
+        (mapc (lambda (el)
+                (insert " : #"
+                        (propertize (car el)
+                                    'mouse-face 'highlight
+                                    'mastodon-tag (car el)
+                                    'mastodon-tab-stop 'hashtag
+                                    'help-echo (concat "Browse tag #" (car el))
+                                    'keymap mastodon-tl--link-keymap)
+                        " : \n\n"))
+              tags-list)
+        ;; status results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " STATUSES\n"
+                         " ------------\n")
+                 'success))
+        (mapc 'mastodon-tl--toot toots-list-json)
+        (goto-char (point-min))))))
 
 (defun mastodon-search--get-user-info (account)
   "Get user handle, display name and account URL from ACCOUNT."
-  (list (cdr (assoc 'display_name account))
-        (cdr (assoc 'acct account))
-        (cdr (assoc 'url account))))
+  (list (alist-get 'display_name account)
+        (alist-get 'acct account)
+        (alist-get 'url account)))
 
 (defun mastodon-search--get-hashtag-info (tag)
   "Get hashtag name and URL from TAG."
-  (list (cdr (assoc 'name tag))
-        (cdr (assoc 'url tag))))
+  (list (alist-get 'name tag)
+        (alist-get 'url tag)))
 
 (defun mastodon-search--get-status-info (status)
   "Get ID, timestamp, content, and spoiler from STATUS."
-  (list (cdr (assoc 'id status))
-        (cdr (assoc 'created_at status))
-        (cdr (assoc 'spoiler_text status))
-        (cdr (assoc 'content status))))
+  (list (alist-get 'id status)
+        (alist-get 'created_at status)
+        (alist-get 'spoiler_text status)
+        (alist-get 'content status)))
 
 (defun mastodon-search--get-id-from-status (status)
-    "Fetch the id from a STATUS returned by a search call to the server.
+  "Fetch the id from a STATUS returned by a search call to the server.
 
 We use this to fetch the complete status from the server."
-  (cdr (assoc 'id status)))
+  (alist-get 'id status))
 
 (defun mastodon-search--fetch-full-status-from-id (id)
   "Fetch the full status with id ID from the server.
@@ -164,7 +164,7 @@ We use this to fetch the complete status from the server."
 This allows us to access the full account etc. details and to
 render them properly."
   (let* ((url (concat mastodon-instance-url "/api/v1/statuses/" (mastodon-tl--as-string id)))
-        (json (mastodon-http--get-json url)))
+         (json (mastodon-http--get-json url)))
     json))
 
 (provide 'mastodon-search)