From bb7aa0a12427dfebb10f636dfa4110fcbda5d1b1 Mon Sep 17 00:00:00 2001
From: Luna D <luna@nighty.cloud>
Date: Sun, 23 Jun 2024 10:38:56 -0400
Subject: [PATCH] Remove remaining conn usages from log_details

---
 .../controllers/admin/batch/tag_controller.ex              | 7 ++++---
 lib/philomena_web/controllers/image/tamper_controller.ex   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/philomena_web/controllers/admin/batch/tag_controller.ex b/lib/philomena_web/controllers/admin/batch/tag_controller.ex
index 302981be..1eaae044 100644
--- a/lib/philomena_web/controllers/admin/batch/tag_controller.ex
+++ b/lib/philomena_web/controllers/admin/batch/tag_controller.ex
@@ -51,7 +51,8 @@ defmodule PhilomenaWeb.Admin.Batch.TagController do
           details: &log_details/3,
           data: %{
             tag_list: tag_list,
-            image_count: Enum.count(image_ids)
+            image_count: Enum.count(image_ids),
+            user: conn.assigns.current_user
           }
         )
         |> json(%{succeeded: image_ids, failed: []})
@@ -68,10 +69,10 @@ defmodule PhilomenaWeb.Admin.Batch.TagController do
     end
   end
 
-  defp log_details(conn, _action, data) do
+  defp log_details(_conn, _action, data) do
     %{
       body: "Batch tagged '#{data.tag_list}' on #{data.image_count} images",
-      subject_path: ~p"/profiles/#{conn.assigns.current_user}"
+      subject_path: ~p"/profiles/#{data.user}"
     }
   end
 end
diff --git a/lib/philomena_web/controllers/image/tamper_controller.ex b/lib/philomena_web/controllers/image/tamper_controller.ex
index 4ce1ac3c..2cc03745 100644
--- a/lib/philomena_web/controllers/image/tamper_controller.ex
+++ b/lib/philomena_web/controllers/image/tamper_controller.ex
@@ -26,12 +26,12 @@ defmodule PhilomenaWeb.Image.TamperController do
     |> put_flash(:info, "Vote removed.")
     |> moderation_log(
       details: &log_details/3,
-      data: %{vote: result, image: image}
+      data: %{vote: result, image: image, username: conn.assigns.user.name}
     )
     |> redirect(to: ~p"/images/#{conn.assigns.image}")
   end
 
-  defp log_details(conn, _action, data) do
+  defp log_details(_conn, _action, data) do
     image = data.image
 
     vote_type =
@@ -42,7 +42,7 @@ defmodule PhilomenaWeb.Image.TamperController do
       end
 
     %{
-      body: "Deleted #{vote_type} by #{conn.assigns.user.name} on image >>#{data.image.id}",
+      body: "Deleted #{vote_type} by #{data.username} on image >>#{data.image.id}",
       subject_path: ~p"/images/#{image}"
     }
   end