From 295eb6395eef7a1802913f2d2c5145ee5bfabd58 Mon Sep 17 00:00:00 2001
From: sino <sinosho@gmail.com>
Date: Sun, 31 Mar 2024 19:18:34 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=82=BF=E3=83=87=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E9=96=A2=E9=80=A3=E3=81=AE=E8=BF=BD=E5=8A=A0=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/fallback/redirect_controller.ex       | 56 +++----------------
 .../web/metadata/providers/open_graph.ex      |  4 +-
 2 files changed, 12 insertions(+), 48 deletions(-)

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 = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
-      title2 = "<meta property=\"og:title\" content=\"#{params.user.name} の投稿\">"
-      description = "<meta property=\"og:description\" content=\"#{params.object.data["content"]}\">"
-      type = "<meta property=\"og:type\" content=\"article\" />"
-      site_name = "<meta property=\"og:site_name\" content=\"flyerdonut\" />"
-      image =
-      case params.object.data["attachment"] do
-        [] ->
-          # attachmentが空のリストの場合の処理
-          "<meta property=\"og:image\" content=#{List.first(params.user.avatar["url"])["href"]} />"
-        _ ->
-          # attachmentが空のリストでない場合の処理
-          "<meta property=\"og:image\" content=#{List.first(List.first(params.object.data["attachment"])["url"])["href"]} /><meta name=\"note:card\" content=\"summary_large_image\">"
-      end
-      #datas = "<!-- datas #{inspect(params.object)} -->"
-      twitter = "<meta name=\"twitter:card\" content=\"summary\" />"
+    tags = build_tags(conn, params)
+    preloads = preload_data(conn, params)
+    title = "<title>akkoma.flyerdonut</title>"
 
-      response =
-        index_content
-        |> String.replace("<!--server-generated-meta-->", tags <> preloads <> title <> title2 <> description <> type <> site_name <> image <> twitter)
+    response =
+      index_content
+      |> String.replace("<!--server-generated-meta-->", 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 = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
-      title2 = "<meta property=\"og:title\" content=\"#{params.user.name} のページ\">"
-      description = "<meta property=\"og:description\" content=\"#{params.user.bio}\">"
-      type = "<meta property=\"og:type\" content=\"article\" />"
-      site_name = "<meta property=\"og:site_name\" content=\"flyerdonut\" />"
-      image = "<meta property=\"og:image\" content=#{List.first(params.user.avatar["url"])["href"]} />"
-      twitter = "<meta name=\"twitter:card\" content=\"summary\" />"
-
-      response =
-        index_content
-        |> String.replace("<!--server-generated-meta-->", 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)