From ad17b48011446a9bde0aa56c86971aeecac520c7 Mon Sep 17 00:00:00 2001
From: "byte[]" <byteslice@airmail.cc>
Date: Wed, 4 Dec 2019 16:47:46 -0500
Subject: [PATCH] rearrange image tag changes

---
 .../image/tag_change/index.html.slime         | 41 +------------------
 .../templates/layout/_opengraph.html.slime    |  2 +-
 .../templates/tag_change/index.html.slime     | 40 ++++++++++++++++++
 lib/philomena_web/views/layout_view.ex        |  3 ++
 lib/philomena_web/views/tag_change_view.ex    |  3 ++
 5 files changed, 48 insertions(+), 41 deletions(-)
 create mode 100644 lib/philomena_web/templates/tag_change/index.html.slime
 create mode 100644 lib/philomena_web/views/tag_change_view.ex

diff --git a/lib/philomena_web/templates/image/tag_change/index.html.slime b/lib/philomena_web/templates/image/tag_change/index.html.slime
index f23f2b3a..2aaaae54 100644
--- a/lib/philomena_web/templates/image/tag_change/index.html.slime
+++ b/lib/philomena_web/templates/image/tag_change/index.html.slime
@@ -16,43 +16,4 @@ h1
     = link "Added", to: Routes.image_tag_change_path(@conn, :index, @image, added: 1)
     = link "All", to: Routes.image_tag_change_path(@conn, :index, @image)
 
-  .block__header
-    = pagination
-
-  .block__content
-    table.table
-      thead
-        tr
-          th colspan=2 Image
-          th Tag
-          th Action
-          th Timestamp
-          th User
-
-      tbody
-        = for tag_change <- @tag_changes do
-          tr
-            td.center
-              = link tag_change.image_id, to: Routes.image_path(@conn, :show, tag_change.image)
-            td.center
-              = render PhilomenaWeb.ImageView, "_image_container.html", image: tag_change.image, size: :thumb_tiny, conn: @conn
-
-            td
-              = if tag_change.tag do
-                = render PhilomenaWeb.TagView, "_tag.html", tag: tag_change.tag, conn: @conn
-              - else
-                = tag_change.tag_name_cache || "Unknown tag"
-            
-            = if tag_change.added do
-              td.success Added
-            - else
-              td.danger Removed
-            
-            td
-              = pretty_time(tag_change.created_at)
-
-            td
-              = render PhilomenaWeb.UserAttributionView, "_anon_user.html", object: tag_change, conn: @conn
-
-  .block__header
-    = pagination
\ No newline at end of file
+  = render PhilomenaWeb.TagChangeView, "index.html", conn: @conn, tag_changes: @tag_changes, pagination: pagination
\ No newline at end of file
diff --git a/lib/philomena_web/templates/layout/_opengraph.html.slime b/lib/philomena_web/templates/layout/_opengraph.html.slime
index e65f0cca..56618cdf 100644
--- a/lib/philomena_web/templates/layout/_opengraph.html.slime
+++ b/lib/philomena_web/templates/layout/_opengraph.html.slime
@@ -3,7 +3,7 @@ meta name="theme-color"
 meta name="format-detection" content="telephone=no"
 meta name="robots" content="noindex, nofollow"
 
-= if !is_nil(@conn.assigns[:image]) and @conn.assigns.image.__meta__.state == :loaded do
+= if opengraph?(@conn) do
   - image = @conn.assigns.image
   - filtered = ImageView.filter_or_spoiler_hits?(@conn, image)
 
diff --git a/lib/philomena_web/templates/tag_change/index.html.slime b/lib/philomena_web/templates/tag_change/index.html.slime
new file mode 100644
index 00000000..58bef6d6
--- /dev/null
+++ b/lib/philomena_web/templates/tag_change/index.html.slime
@@ -0,0 +1,40 @@
+.block__header
+  = @pagination
+
+.block__content
+  table.table
+    thead
+      tr
+        th colspan=2 Image
+        th Tag
+        th Action
+        th Timestamp
+        th User
+
+    tbody
+      = for tag_change <- @tag_changes do
+        tr
+          td.center
+            = link tag_change.image_id, to: Routes.image_path(@conn, :show, tag_change.image)
+          td.center
+            = render PhilomenaWeb.ImageView, "_image_container.html", image: tag_change.image, size: :thumb_tiny, conn: @conn
+
+          td
+            = if tag_change.tag do
+              = render PhilomenaWeb.TagView, "_tag.html", tag: tag_change.tag, conn: @conn
+            - else
+              = tag_change.tag_name_cache || "Unknown tag"
+          
+          = if tag_change.added do
+            td.success Added
+          - else
+            td.danger Removed
+          
+          td
+            = pretty_time(tag_change.created_at)
+
+          td
+            = render PhilomenaWeb.UserAttributionView, "_anon_user.html", object: tag_change, conn: @conn
+
+.block__header
+  = @pagination
\ No newline at end of file
diff --git a/lib/philomena_web/views/layout_view.ex b/lib/philomena_web/views/layout_view.ex
index 05e37ea0..1b6031e9 100644
--- a/lib/philomena_web/views/layout_view.ex
+++ b/lib/philomena_web/views/layout_view.ex
@@ -76,4 +76,7 @@ defmodule PhilomenaWeb.LayoutView do
 
   def artist_tags(tags),
     do: Enum.filter(tags, & &1.namespace == "artist")
+
+  def opengraph?(conn),
+    do: !is_nil(conn.assigns[:image]) and conn.assigns.image.__meta__.state == :loaded and is_list(conn.assigns.image.tags)
 end
diff --git a/lib/philomena_web/views/tag_change_view.ex b/lib/philomena_web/views/tag_change_view.ex
new file mode 100644
index 00000000..e4d3cb1f
--- /dev/null
+++ b/lib/philomena_web/views/tag_change_view.ex
@@ -0,0 +1,3 @@
+defmodule PhilomenaWeb.TagChangeView do
+  use PhilomenaWeb, :view
+end