pleroma

commit: e216603477e2c393a586f7eb0bc8183e73bf4cd7
parent 510a7b64f1354d4313ab565d557f422b7e059432
Author: NEETzsche <neetzsche@tutanota.com>
Date:   Wed, 29 Nov 2023 07:55:44 -0700

Change url to externalLink as requested by hj here: https://shigusegubu.club/notice/AcIjZjackKAt6e522a

Diffstat:
M
lib/pleroma/web/api_spec/operations/pleroma_scrobble_operation.ex
8
++++----
M
lib/pleroma/web/common_api/activity_draft.ex
2
+-
M
lib/pleroma/web/pleroma_api/views/scrobble_view.ex
2
+-
M
test/pleroma/web/pleroma_api/controllers/scrobble_controller_test.exs
8
++++----

4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/pleroma/web/api_spec/operations/pleroma_scrobble_operation.ex b/lib/pleroma/web/api_spec/operations/pleroma_scrobble_operation.ex
@@ -59,7 +59,7 @@ defmodule Pleroma.Web.ApiSpec.PleromaScrobbleOperation do
         album: %Schema{type: :string, description: "The album of the media playing"},
         artist: %Schema{type: :string, description: "The artist of the media playing"},
         length: %Schema{type: :integer, description: "The length of the media playing"},
-        url: %Schema{type: :string, description: "A URL referencing the media playing"},
+        externalLink: %Schema{type: :string, description: "A URL referencing the media playing"},
         visibility: %Schema{
           allOf: [VisibilityScope],
           default: "public",
@@ -71,7 +71,7 @@ defmodule Pleroma.Web.ApiSpec.PleromaScrobbleOperation do
         "artist" => "Some Artist",
         "album" => "Some Album",
         "length" => 180_000,
-        "url" => "https://www.last.fm/music/Some+Artist/_/Some+Title"
+        "externalLink" => "https://www.last.fm/music/Some+Artist/_/Some+Title"
       }
     }
   end
@@ -85,7 +85,7 @@ defmodule Pleroma.Web.ApiSpec.PleromaScrobbleOperation do
         title: %Schema{type: :string, description: "The title of the media playing"},
         album: %Schema{type: :string, description: "The album of the media playing"},
         artist: %Schema{type: :string, description: "The artist of the media playing"},
-        url: %Schema{type: :string, description: "A URL referencing the media playing"},
+        externalLink: %Schema{type: :string, description: "A URL referencing the media playing"},
         length: %Schema{
           type: :integer,
           description: "The length of the media playing",
@@ -100,7 +100,7 @@ defmodule Pleroma.Web.ApiSpec.PleromaScrobbleOperation do
         "artist" => "Some Artist",
         "album" => "Some Album",
         "length" => 180_000,
-        "url" => "https://www.last.fm/music/Some+Artist/_/Some+Title",
+        "externalLink" => "https://www.last.fm/music/Some+Artist/_/Some+Title",
         "created_at" => "2019-09-28T12:40:45.000Z"
       }
     }
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
@@ -83,7 +83,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
   defp listen_object(draft) do
     object =
       draft.params
-      |> Map.take([:album, :artist, :title, :length, :url])
+      |> Map.take([:album, :artist, :title, :length, :externalLink])
       |> Map.new(fn {key, value} -> {to_string(key), value} end)
       |> Map.put("type", "Audio")
       |> Map.put("to", draft.to)
diff --git a/lib/pleroma/web/pleroma_api/views/scrobble_view.ex b/lib/pleroma/web/pleroma_api/views/scrobble_view.ex
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleView do
       title: object.data["title"] |> HTML.strip_tags(),
       artist: object.data["artist"] |> HTML.strip_tags(),
       album: object.data["album"] |> HTML.strip_tags(),
-      url: object.data["url"],
+      externalLink: object.data["externalLink"],
       length: object.data["length"]
     }
   end
diff --git a/test/pleroma/web/pleroma_api/controllers/scrobble_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/scrobble_controller_test.exs
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
           "artist" => "lain",
           "album" => "lain radio",
           "length" => "180000",
-          "url" => "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+1"
+          "externalLink" => "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+1"
         })
 
       assert %{"title" => "lain radio episode 1"} = json_response_and_validate_schema(conn, 200)
@@ -35,7 +35,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
           title: "lain radio episode 1",
           artist: "lain",
           album: "lain radio",
-          url: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+1"
+          externalLink: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+1"
         })
 
       {:ok, _activity} =
@@ -43,7 +43,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
           title: "lain radio episode 2",
           artist: "lain",
           album: "lain radio",
-          url: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+2"
+          externalLink: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+2"
         })
 
       {:ok, _activity} =
@@ -51,7 +51,7 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleControllerTest do
           title: "lain radio episode 3",
           artist: "lain",
           album: "lain radio",
-          url: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+3"
+          externalLink: "https://www.last.fm/music/lain/lain+radio/lain+radio+episode+3"
         })
 
       conn = get(conn, "/api/v1/pleroma/accounts/#{user.id}/scrobbles")