-- separator for profile/tl funs in other files

6 files changed, 79 insertions, 79 deletions

diff --git a/README.org b/README.org
index b6425de..6e8dc07 100644
--- a/README.org
+++ b/README.org
@@ -211,7 +211,7 @@ You can download and use your instance's custom emoji
 **** draft toots
 
 - Compose buffer text is saved as you type, kept in =mastodon-toot-current-toot-text=.
-- =mastodon-toot-save-draft=: save the current toot as a draft.
+- =mastodon-toot--save-draft=: save the current toot as a draft.
 - =mastodon-toot-open-draft-toot=: Open a compose buffer and insert one of your draft toots.
 - =mastodon-toot-delete-draft-toot=: Delete a draft toot.
 - =mastodon-toot-delete-all-drafts=: Delete all your drafts.
@@ -220,18 +220,18 @@ You can download and use your instance's custom emoji
 
 - =mastodon-url-lookup=: Attempt to load URL in =mastodon.el=. URL may be the one at point or provided in the minibuffer. Should also work if =mastodon.el= is not yet loaded.
 
-- =mastodon-tl-view-instance-description=: View information about the instance that the author of the toot at point is on.
-- =mastodon-tl-view-own-instance=: View information about your own instance.
+- =mastodon-tl--view-instance-description=: View information about the instance that the author of the toot at point is on.
+- =mastodon-tl--view-own-instance=: View information about your own instance.
 - =mastodon-search-trending-tags=: View a list of trending hashtags on your instance.
 
-- =mastodon-profile-update-display-name=: Update the display name for your account.
+- =mastodon-profile--update-display-name=: Update the display name for your account.
 - =mastodon-profile-update-user-profile-note=: Update your bio note.
-- =mastodon-profile-update-meta-fields=: Update your metadata fields.
+- =mastodon-profile--update-meta-fields=: Update your metadata fields.
 - =mastodon-profile-set-default-toot-visibility=: Set the default visibility for your toots.
-- =mastodon-profile-account-locked-toggle=: Toggle the locked status of your account. Locked accounts have to manually approve follow requests.
-- =mastodon-profile-account-discoverable-toggle=: Toggle the discoverable status of your account. Non-discoverable accounts are not listed in the profile directory.
-- =mastodon-profile-account-bot-toggle=: Toggle whether your account is flagged as a bot.
-- =mastodon-profile-account-sensitive-toggle=: Toggle whether your posts are marked as sensitive (nsfw) by default.
+- =mastodon-profile--account-locked-toggle=: Toggle the locked status of your account. Locked accounts have to manually approve follow requests.
+- =mastodon-profile--account-discoverable-toggle=: Toggle the discoverable status of your account. Non-discoverable accounts are not listed in the profile directory.
+- =mastodon-profile--account-bot-toggle=: Toggle whether your account is flagged as a bot.
+- =mastodon-profile--account-sensitive-toggle=: Toggle whether your posts are marked as sensitive (nsfw) by default.
 
 *** Customization
 
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 0ef64e2..5d1a86e 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -100,7 +100,7 @@
                        ("-" "zoom out" 'image-decrease-size)
                        ("u" "copy URL" 'shr-maybe-probe-and-copy-url))
                       ("Profile view"
-                       ("C-c C-c" "Cycle profile views" mastodon-profile-account-view-cycle))
+                       ("C-c C-c" "Cycle profile views" mastodon-profile--account-view-cycle))
                       ("Quit"
                        ("q" "Quit mastodon and bury buffer." kill-this-buffer)
                        ("Q" "Quit mastodon buffer and kill window." kill-buffer-and-window)))))))
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 6c2ccf6..69c188d 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -76,9 +76,9 @@
 (autoload 'mastodon-toot "mastodon")
 (autoload 'mastodon-profile--get-source-pref "mastodon-profile")
 (autoload 'mastodon-profile--update-preference "mastodon-profile")
-(autoload 'mastodon-profile-fetch-server-account-settings "mastodon-profile")
+(autoload 'mastodon-profile--fetch-server-account-settings "mastodon-profile")
 (autoload 'mastodon-tl--render-text "mastodon-tl")
-(autoload 'mastodon-profile-fetch-server-account-settings-maybe "mastodon-profile")
+(autoload 'mastodon-profile--fetch-server-account-settings-maybe "mastodon-profile")
 (autoload 'mastodon-http--build-array-args-alist "mastodon-http")
 (autoload 'mastodon-tl--get-endpoint "mastodon-tl")
 
@@ -502,10 +502,10 @@ If toot is not empty, prompt to save text as a draft."
   (if (mastodon-toot-empty-p)
       (mastodon-toot--kill)
     (when (y-or-n-p "Save draft toot?")
-      (mastodon-toot-save-draft))
+      (mastodon-toot--save-draft))
     (mastodon-toot--kill)))
 
-(defun mastodon-toot-save-draft ()
+(defun mastodon-toot--save-draft ()
   "Save the current compose toot text as a draft.
 Pushes `mastodon-toot-current-toot-text' to
 `mastodon-toot-draft-toots-list'."
@@ -1338,7 +1338,7 @@ a draft into the buffer."
       (insert initial-text))))
 
 ;;;###autoload
-(add-hook 'mastodon-toot-mode-hook #'mastodon-profile-fetch-server-account-settings-maybe)
+(add-hook 'mastodon-toot-mode-hook #'mastodon-profile--fetch-server-account-settings-maybe)
 
 (define-minor-mode mastodon-toot-mode
   "Minor mode to capture Mastodon toots."
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 707ce82..055de21 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -91,7 +91,7 @@
 (when (require 'lingva nil :no-error)
   (autoload 'mastodon-toot--translate-toot-text "mastodon-toot"))
 (autoload 'mastodon-search--trending-tags "mastodon-search")
-(autoload 'mastodon-profile-fetch-server-account-settings "mastodon-profile")
+(autoload 'mastodon-profile--fetch-server-account-settings "mastodon-profile")
 
 (defgroup mastodon nil
   "Interface with Mastodon."
@@ -324,7 +324,7 @@ not, just browse the URL in the normal fashion."
                                     (mastodon-toot--enable-custom-emoji)))))
 
 ;;;###autoload
-(add-hook 'mastodon-mode-hook #'mastodon-profile-fetch-server-account-settings)
+(add-hook 'mastodon-mode-hook #'mastodon-profile--fetch-server-account-settings)
 
 (define-derived-mode mastodon-mode special-mode "Mastodon"
   "Major mode for Mastodon, the federated microblogging network."
diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index 7c87933..bc70e49 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -187,11 +187,11 @@
   "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-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 ""))
+     (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))))
+     (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 267e48b..9d1ec72 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -227,64 +227,64 @@ help identify when things change unexpectedly.
 TODO: Consider separating the data retrieval and the actual
 content generation in the function under test."
   (with-mock
-    ;; Don't start any image loading:
-    (mock (mastodon-media--inline-images * *) => nil)
-    (if (version< emacs-version "27.1")
-        (mock (image-type-available-p 'imagemagick) => t)
-      (mock (image-transforms-p) => t))
-    (mock (mastodon-http--get-json "https://instance.url/api/v1/accounts/1/statuses")
-          =>
-          gargon-statuses-json)
-    (mock (mastodon-profile--get-statuses-pinned *)
-          =>
-          [])
-    (mock (mastodon-profile--relationships-get "1")
-          =>
-          '(((id . "1") (following . :json-false) (showing_reblogs . :json-false) (notifying . :json-false) (followed_by . :json-false) (blocking . :json-false) (blocked_by . :json-false) (muting . :json-false) (muting_notifications . :json-false) (requested . :json-false) (domain_blocking . :json-false) (endorsed . :json-false) (note . ""))))
-    ;; Let's not do formatting as that makes it hard to not rely on
-    ;; window width and reflowing the text.
-    (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 ""))
+   ;; Don't start any image loading:
+   (mock (mastodon-media--inline-images * *) => nil)
+   (if (version< emacs-version "27.1")
+       (mock (image-type-available-p 'imagemagick) => t)
+     (mock (image-transforms-p) => t))
+   (mock (mastodon-http--get-json "https://instance.url/api/v1/accounts/1/statuses")
+         =>
+         gargon-statuses-json)
+   (mock (mastodon-profile--get-statuses-pinned *)
+         =>
+         [])
+   (mock (mastodon-profile--relationships-get "1")
+         =>
+         '(((id . "1") (following . :json-false) (showing_reblogs . :json-false) (notifying . :json-false) (followed_by . :json-false) (blocking . :json-false) (blocked_by . :json-false) (muting . :json-false) (muting_notifications . :json-false) (requested . :json-false) (domain_blocking . :json-false) (endorsed . :json-false) (note . ""))))
+   ;; Let's not do formatting as that makes it hard to not rely on
+   ;; window width and reflowing the text.
+   (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)
-          (mastodon-instance-url "https://instance.url"))
-      (mastodon-profile--make-author-buffer gargron-profile-json)
+   (let ((mastodon-tl--show-avatars t)
+         (mastodon-tl--display-media-p t)
+         (mastodon-instance-url "https://instance.url"))
+     (mastodon-profile--make-author-buffer gargron-profile-json)
 
-      (should
-       (equal
-        (buffer-substring-no-properties (point-min) (point-max))
-        (concat
-         "\n"
-         "[img] [img] \n"
-         "Eugen\n"
-         "@Gargron\n"
-         " ------------\n"
-         "<p>Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.</p>\n"
-         "_ Patreon __ :: <a href=\"https://www.patreon.com/mastodon\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span></a>_ Homepage _ :: <a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span></a>\n"
-         " ------------\n"
-         " TOOTS: 70741 | FOLLOWERS: 470905 | FOLLOWING: 451\n"
-         " ------------\n"
-         "\n"
-         " ------------\n"
-         "     TOOTS   \n"
-         " ------------\n"
-         "\n"
-         "<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p> \n"
-         "  Eugen (@Gargron) 2021-11-11 11:11:11\n"
-         "  ------------\n"
-         "\n"
-         "\n"
-         "<p><span class=\"h-card\"><a href=\"https://social.bau-ha.us/@CCC\" class=\"u-url mention\">@<span>CCC</span></a></span> At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p> \n"
-         "  Eugen (@Gargron) 2021-11-11 00:00:00\n"
-         "  ------------\n"
-         "\n"
-         )))
+     (should
+      (equal
+       (buffer-substring-no-properties (point-min) (point-max))
+       (concat
+        "\n"
+        "[img] [img] \n"
+        "Eugen\n"
+        "@Gargron\n"
+        " ------------\n"
+        "<p>Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.</p>\n"
+        "_ Patreon __ :: <a href=\"https://www.patreon.com/mastodon\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span></a>_ Homepage _ :: <a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span></a>\n"
+        " ------------\n"
+        " TOOTS: 70741 | FOLLOWERS: 470905 | FOLLOWING: 451\n"
+        " ------------\n"
+        "\n"
+        " ------------\n"
+        "     TOOTS   \n"
+        " ------------\n"
+        "\n"
+        "<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p> \n"
+        "  Eugen (@Gargron) 2021-11-11 11:11:11\n"
+        "  ------------\n"
+        "\n"
+        "\n"
+        "<p><span class=\"h-card\"><a href=\"https://social.bau-ha.us/@CCC\" class=\"u-url mention\">@<span>CCC</span></a></span> At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p> \n"
+        "  Eugen (@Gargron) 2021-11-11 00:00:00\n"
+        "  ------------\n"
+        "\n"
+        )))
 
-      ;; Until the function gets refactored this creates a non-temp
-      ;; buffer with Gargron's statuses which we want to delete (if
-      ;; the tests succeed).
-      (kill-buffer))))
+     ;; Until the function gets refactored this creates a non-temp
+     ;; buffer with Gargron's statuses which we want to delete (if
+     ;; the tests succeed).
+     (kill-buffer))))