diff --git a/lib/last_fm/artist.ex b/lib/last_fm/artist.ex index d8f7c83f..188d494f 100644 --- a/lib/last_fm/artist.ex +++ b/lib/last_fm/artist.ex @@ -10,7 +10,6 @@ defmodule LastFm.Artist do bio: String.t(), image: String.t(), play_count: non_neg_integer(), - on_tour: boolean(), base_url: String.t(), image_data_hash: String.t() | nil } @@ -23,7 +22,6 @@ defmodule LastFm.Artist do field :bio, :string field :image, :string field :play_count, :integer, default: 0 - field :on_tour, :boolean, default: false field :base_url, :string field :image_data_hash, :string end @@ -37,7 +35,6 @@ defmodule LastFm.Artist do bio: api_response["bio"]["content"] || "", image: get_image(api_response), play_count: get_play_count(api_response), - on_tour: api_response["ontour"] == "1", base_url: api_response["url"] } end @@ -52,17 +49,11 @@ defmodule LastFm.Artist do :bio, :image, :play_count, - :on_tour, :base_url ]) |> validate_required([:name]) end - @spec events_url(t()) :: String.t() - def events_url(artist) do - artist.base_url <> "/+events" - end - defp get_image(api_response) do api_response["image"] |> Enum.find(%{"#text" => nil}, fn i -> i["size"] == "medium" end) diff --git a/lib/music_library_web/live/artist_live/show.ex b/lib/music_library_web/live/artist_live/show.ex index 475d01b0..4fa8d3cb 100644 --- a/lib/music_library_web/live/artist_live/show.ex +++ b/lib/music_library_web/live/artist_live/show.ex @@ -18,21 +18,6 @@ defmodule MusicLibraryWeb.ArtistLive.Show do """ end - attr :lastfm_artist_info, :map, required: true - - defp on_tour_link(assigns) do - ~H""" - - <.badge variant="soft" class="mr-2">{gettext("On Tour")} - - """ - end - attr :play_count, :integer, required: true defp play_count(assigns) do @@ -241,7 +226,6 @@ defmodule MusicLibraryWeb.ArtistLive.Show do {gettext("Error loading play count")} - <.on_tour_link lastfm_artist_info={lastfm_artist_info} /> <.play_count play_count={lastfm_artist_info.play_count} /> diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 635e026d..cff60a37 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -346,11 +346,6 @@ msgstr "" msgid "A->Z" msgstr "" -#: lib/music_library_web/live/artist_live/show.ex -#, elixir-autogen, elixir-format -msgid "On Tour" -msgstr "" - #: lib/music_library_web/components/record_components.ex #, elixir-autogen, elixir-format msgid "1 record" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 0f0ee26a..6c4cd050 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -346,11 +346,6 @@ msgstr "" msgid "A->Z" msgstr "" -#: lib/music_library_web/live/artist_live/show.ex -#, elixir-autogen, elixir-format -msgid "On Tour" -msgstr "" - #: lib/music_library_web/components/record_components.ex #, elixir-autogen, elixir-format msgid "1 record" diff --git a/test/last_fm/artist_test.exs b/test/last_fm/artist_test.exs index 447fcf1f..643bbd63 100644 --- a/test/last_fm/artist_test.exs +++ b/test/last_fm/artist_test.exs @@ -21,7 +21,6 @@ defmodule LastFm.ArtistTest do image: "https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png", play_count: 123, - on_tour: false, base_url: "https://www.last.fm/music/Steven+Wilson" } == LastFm.Artist.from_api_response(api_response) diff --git a/test/support/fixtures/last_fm/artist.getinfo.json b/test/support/fixtures/last_fm/artist.getinfo.json index 67eb26ed..5804c9c8 100644 --- a/test/support/fixtures/last_fm/artist.getinfo.json +++ b/test/support/fixtures/last_fm/artist.getinfo.json @@ -40,7 +40,6 @@ ], "mbid": "3a51b862-0144-40f6-aa17-6aaeefea29d9", "name": "Steven Wilson", - "ontour": "0", "similar": { "artist": [ {