diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex index 2ec6afca8..9e7499c3c 100644 --- a/lib/pleroma/web/fallback/redirect_controller.ex +++ b/lib/pleroma/web/fallback/redirect_controller.ex @@ -35,55 +35,17 @@ defmodule Pleroma.Web.Fallback.RedirectController do def redirector_with_meta(conn, params) do {:ok, index_content} = File.read(index_file_path(conn)) - if get_in(params, [:object]) do - tags = build_tags(conn, params) - preloads = preload_data(conn, params) - title = "#{Pleroma.Config.get([:instance, :name])}" - title2 = "" - description = "" - type = "" - site_name = "" - image = - case params.object.data["attachment"] do - [] -> - # attachmentが空のリストの場合の処理 - "" - _ -> - # attachmentが空のリストでない場合の処理 - "" - end - #datas = "" - twitter = "" + tags = build_tags(conn, params) + preloads = preload_data(conn, params) + title = "akkoma.flyerdonut" - response = - index_content - |> String.replace("", tags <> preloads <> title <> title2 <> description <> type <> site_name <> image <> twitter) + response = + index_content + |> String.replace("", tags <> preloads <> title) - conn - |> put_resp_content_type("text/html") - |> send_resp(200, response) - - - else - #Objectが存在しない場合(Userページ) - tags = build_tags(conn, params) - preloads = preload_data(conn, params) - title = "#{Pleroma.Config.get([:instance, :name])}" - title2 = "" - description = "" - type = "" - site_name = "" - image = "" - twitter = "" - - response = - index_content - |> String.replace("", tags <> preloads <> title <> title2 <> description <> type <> site_name <> image <> twitter) - - conn - |> put_resp_content_type("text/html") - |> send_resp(200, response) - end + conn + |> put_resp_content_type("text/html") + |> send_resp(200, response) end def redirector_with_preload(conn, %{"path" => ["pleroma", "admin"]}) do diff --git a/lib/pleroma/web/metadata/providers/open_graph.ex b/lib/pleroma/web/metadata/providers/open_graph.ex index df0cca74a..b1b288d5b 100644 --- a/lib/pleroma/web/metadata/providers/open_graph.ex +++ b/lib/pleroma/web/metadata/providers/open_graph.ex @@ -88,7 +88,9 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do "image" -> [ {:meta, [property: "og:image", content: MediaProxy.url(url["href"])], []}, - {:meta, [property: "og:image:alt", content: attachment["name"]], []} + {:meta, [property: "og:image", content: MediaProxy.url(url["href"])], []}, + # note用のタグを追加 + {:meta, [property: "note:card", content: "summary_large_image"], []} | acc ] |> maybe_add_dimensions(url)