pleroma

commit: 69c80cf904fe47e171cbab5217cb8c34257349c3
parent 99fbe0418a1bae703b6ae052c9ffd60c361f0249
Author: mkljczk <me@mkljczk.pl>
Date:   Sun, 18 May 2025 01:00:36 +0200

Merge branch 'admin-api-log-fix' into 'develop'

Fix condition for moderation log force_password_reset action

See merge request pleroma/pleroma!4356
Diffstat:
A
changelog.d/admin-api-log-fix.skip
0

M
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
12
++++++------

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/changelog.d/admin-api-log-fix.skip b/changelog.d/admin-api-log-fix.skip
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -335,13 +335,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
 
       if params["password"] do
         User.force_password_reset_async(user)
-      end
 
-      ModerationLog.insert_log(%{
-        actor: admin,
-        subject: [user],
-        action: "force_password_reset"
-      })
+        ModerationLog.insert_log(%{
+          actor: admin,
+          subject: [user],
+          action: "force_password_reset"
+        })
+      end
 
       json(conn, %{status: "success"})
     else