refactor(syndicator-mastodon): remove ‘toot’

Author: paulrobertlloyd

packages/syndicator-mastodon/lib/mastodon.js

@@ -11,22 +11,22 @@ export const mastodon = ({ accessToken, characterLimit, serverUrl }) => ({
 
   /**
    * Post a favourite
-   * @param {string} tootUrl - URL of toot to favourite
+   * @param {string} statusUrl - URL of status to favourite
    * @returns {Promise<string>} Mastodon status URL
    */
-  async postFavourite(tootUrl) {
-    const statusId = getStatusIdFromUrl(tootUrl);
+  async postFavourite(statusUrl) {
+    const statusId = getStatusIdFromUrl(statusUrl);
     const { data } = await this.client().favouriteStatus(statusId);
     return data.url;
   },
 
   /**
    * Post a reblog
-   * @param {string} tootUrl - URL of toot to reblog
+   * @param {string} statusUrl - URL of status to reblog
    * @returns {Promise<string>} Mastodon status URL
    */
-  async postReblog(tootUrl) {
-    const statusId = getStatusIdFromUrl(tootUrl);
+  async postReblog(statusUrl) {
+    const statusId = getStatusIdFromUrl(statusUrl);
     const { data } = await this.client().reblogStatus(statusId);
     return data.url;
   },
@@ -76,7 +76,7 @@ export const mastodon = ({ accessToken, characterLimit, serverUrl }) => ({
    * Post to Mastodon
    * @param {object} properties - JF2 properties object
    * @param {string} me - Publication URL
-   * @returns {Promise<string|boolean>} URL of syndicated toot
+   * @returns {Promise<string|boolean>} URL of syndicated status
    */
   async post(properties, me) {
     let mediaIds = [];

packages/syndicator-mastodon/lib/utils.js

@@ -50,14 +50,14 @@ export const createStatus = (properties, options = {}) => {
     parameters.media_ids = mediaIds;
   }
 
-  // If post is in reply to a toot, add respective parameter
+  // If post is in reply to a status, add respective parameter
   if (properties["in-reply-to"]) {
     const inReplyTo = properties["in-reply-to"];
     const inReplyToHostname = new URL(inReplyTo).hostname;
     const serverHostname = new URL(serverUrl).hostname;
 
     if (inReplyToHostname === serverHostname) {
-      // Reply to toot
+      // Reply to status
       const statusId = getStatusIdFromUrl(inReplyTo);
       parameters.in_reply_to_status_id = statusId;
     } else {

packages/syndicator-mastodon/tests/unit/mastodon.js

@@ -24,7 +24,7 @@ test.beforeEach((t) => {
     },
     status: "Toot",
     statusId: "1234567890987654321",
-    tootUrl: "https://mastodon.example/@username/1234567890987654321",
+    statusUrl: "https://mastodon.example/@username/1234567890987654321",
   };
 });
 
@@ -34,7 +34,7 @@ test("Posts a favourite", async (t) => {
     .reply(200, t.context.apiResponse);
 
   const result = await mastodon(t.context.options).postFavourite(
-    t.context.tootUrl
+    t.context.statusUrl
   );
 
   t.is(result, `https://mastodon.example/@username/${t.context.statusId}`);
@@ -46,7 +46,7 @@ test("Throws error posting a favourite", async (t) => {
     .reply(404, { message: "Not found" });
 
   await t.throwsAsync(
-    mastodon(t.context.options).postFavourite(t.context.tootUrl),
+    mastodon(t.context.options).postFavourite(t.context.statusUrl),
     {
       message: "Request failed with status code 404",
     }
@@ -59,7 +59,7 @@ test("Posts a reblog", async (t) => {
     .reply(200, t.context.apiResponse);
 
   const result = await mastodon(t.context.options).postReblog(
-    t.context.tootUrl
+    t.context.statusUrl
   );
 
   t.is(result, `https://mastodon.example/@username/${t.context.statusId}`);
@@ -71,7 +71,7 @@ test("Throws error posting a reblog", async (t) => {
     .reply(404, { message: "Not found" });
 
   await t.throwsAsync(
-    mastodon(t.context.options).postReblog(t.context.tootUrl),
+    mastodon(t.context.options).postReblog(t.context.statusUrl),
     {
       message: "Request failed with status code 404",
     }
@@ -156,14 +156,14 @@ test("Returns false passing an object to media upload function", async (t) => {
   t.falsy(result);
 });
 
-test("Posts a favourite of a toot to Mastodon", async (t) => {
+test("Posts a favourite of a Mastodon status to Mastodon", async (t) => {
   nock(t.context.options.serverUrl)
     .post(`/api/v1/statuses/${t.context.statusId}/favourite`)
     .reply(200, t.context.apiResponse);
 
   const result = await mastodon(t.context.options).post(
     {
-      "like-of": t.context.tootUrl,
+      "like-of": t.context.statusUrl,
     },
     t.context.me
   );
@@ -182,14 +182,14 @@ test("Doesn’t post a favourite of a URL to Mastodon", async (t) => {
   t.falsy(result);
 });
 
-test("Posts a repost of a toot to Mastodon", async (t) => {
+test("Posts a repost of a Mastodon status to Mastodon", async (t) => {
   nock(t.context.options.serverUrl)
     .post(`/api/v1/statuses/${t.context.statusId}/reblog`)
     .reply(200, t.context.apiResponse);
 
   const result = await mastodon(t.context.options).post(
     {
-      "repost-of": t.context.tootUrl,
+      "repost-of": t.context.statusUrl,
     },
     t.context.me
   );
@@ -218,7 +218,7 @@ test("Posts a quote status to Mastodon", async (t) => {
       content: {
         html: "<p>Someone else who likes cheese sandwiches.</p>",
       },
-      "repost-of": t.context.tootUrl,
+      "repost-of": t.context.statusUrl,
       "post-type": "repost",
     },
     t.context.me

packages/syndicator-mastodon/tests/unit/utils.js

@@ -7,13 +7,6 @@ import {
   htmlToStatusText,
 } from "../../lib/utils.js";
 
-test.beforeEach((t) => {
-  t.context = {
-    me: "https://website.example",
-    tootUrl: "https://mastodon.example/@username/1234567890987654321",
-  };
-});
-
 test("Creates a status with article post name and URL", (t) => {
   const result = createStatus(
     JSON.parse(getFixture("jf2/article-content-provided-html-text.jf2")),
@@ -73,7 +66,7 @@ test("Creates a reblog with status URL and post content", (t) => {
 
   t.is(
     result.status,
-    `Someone else who likes cheese sandwiches. ${t.context.tootUrl}`
+    `Someone else who likes cheese sandwiches. https://mastodon.example/@username/1234567890987654321`
   );
 });