Merge remote-tracking branch 'upstream/master'

lib/philomena/channels/channel.ex

@@ -18,6 +18,7 @@ defmodule Philomena.Channels.Channel do
     field :last_fetched_at, :utc_datetime
     field :next_check_at, :utc_datetime
     field :last_live_at, :utc_datetime
+    field :thumbnail_url, :string, default: ""
 
     timestamps(inserted_at: :created_at, type: :utc_datetime)
   end

lib/philomena_web/views/channel_view.ex

@@ -1,27 +1,7 @@
 defmodule PhilomenaWeb.ChannelView do
   use PhilomenaWeb, :view
 
-  def channel_image(%{type: "LivestreamChannel", short_name: short_name}) do
-    now = DateTime.utc_now() |> DateTime.to_unix(:microsecond)
-
-    PhilomenaProxy.Camo.image_url(
-      "https://thumbnail.api.livestream.com/thumbnail?name=#{short_name}&rand=#{now}"
-    )
+  def channel_image(%{thumbnail_url: thumbnail_url}) do
+    PhilomenaProxy.Camo.image_url(thumbnail_url || "https://picarto.tv/images/missingthumb.jpg")
   end
-
-  def channel_image(%{type: "PicartoChannel", thumbnail_url: thumbnail_url}),
-    do:
-      PhilomenaProxy.Camo.image_url(thumbnail_url || "https://picarto.tv/images/missingthumb.jpg")
-
-  def channel_image(%{type: "PiczelChannel", remote_stream_id: remote_stream_id}),
-    do:
-      PhilomenaProxy.Camo.image_url(
-        "https://piczel.tv/api/thumbnail/stream_#{remote_stream_id}.jpg"
-      )
-
-  def channel_image(%{type: "TwitchChannel", short_name: short_name}),
-    do:
-      PhilomenaProxy.Camo.image_url(
-        "https://static-cdn.jtvnw.net/previews-ttv/live_user_#{String.downcase(short_name)}-320x180.jpg"
-      )
 end