From c94178efcd05c009c6c610599c7d09e171c79e01 Mon Sep 17 00:00:00 2001
From: Pablo Brasero <pablo@pablobm.com>
Date: Mon, 15 Dec 2025 12:50:54 +0000
Subject: [PATCH] More descriptive name for "unhide" action

---
 app/controllers/users/statuses_controller.rb       | 2 +-
 app/models/user.rb                                 | 2 +-
 app/views/users/show.html.erb                      | 4 ++--
 config/locales/en.yml                              | 2 +-
 test/controllers/users/statuses_controller_test.rb | 8 ++++----
 test/integration/oauth2_test.rb                    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users/statuses_controller.rb b/app/controllers/users/statuses_controller.rb
index eb8c806d4..d62887cf2 100644
--- a/app/controllers/users/statuses_controller.rb
+++ b/app/controllers/users/statuses_controller.rb
@@ -18,7 +18,7 @@ module Users
       @user.activate! if params[:event] == "activate"
       @user.confirm! if params[:event] == "confirm"
       @user.unconfirm! if params[:event] == "unconfirm"
-      @user.unhide! if params[:event] == "unhide"
+      @user.undelete! if params[:event] == "undelete"
       @user.unsuspend! if params[:event] == "unsuspend"
       @user.suspend! if params[:event] == "suspend"
       @user.soft_destroy! if params[:event] == "soft_destroy" # destroy a user, marking them as deleted and removing personal data
diff --git a/app/models/user.rb b/app/models/user.rb
index 1fd44340e..4db537ee3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -237,7 +237,7 @@ class User < ApplicationRecord
       transitions :from => [:pending, :active, :confirmed, :suspended], :to => :deleted
     end
 
-    event :unhide do
+    event :undelete do
       transitions :from => [:deleted], :to => :active
     end
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index dfa019732..72c4a28bd 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -204,9 +204,9 @@
               </li>
             <% end %>
 
-            <% if @user.may_unhide? %>
+            <% if @user.may_undelete? %>
               <li>
-                <%= link_to t(".unhide_user"), user_status_path(@user, :event => "unhide"), :method => :put, :data => { :confirm => t(".confirm") } %>
+                <%= link_to t(".undelete_user"), user_status_path(@user, :event => "undelete"), :method => :put, :data => { :confirm => t(".confirm") } %>
               </li>
             <% end %>
           </ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 814ecedf2..74a271f1f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3230,7 +3230,7 @@ en:
       unconfirm_user: "Unconfirm this User"
       suspend_user: "Suspend this User"
       unsuspend_user: "Unsuspend this User"
-      unhide_user: "Unhide this User"
+      undelete_user: "Undelete this User"
       confirm: "Confirm"
       report: Report this User
       edit_profile_details: Edit Profile Details
diff --git a/test/controllers/users/statuses_controller_test.rb b/test/controllers/users/statuses_controller_test.rb
index 649ae17fe..b5f0cbf55 100644
--- a/test/controllers/users/statuses_controller_test.rb
+++ b/test/controllers/users/statuses_controller_test.rb
@@ -82,16 +82,16 @@ module Users
       assert_equal "deleted", user.status
     end
 
-    def test_unhide
+    def test_undelete
       user = create(:user, :deleted)
 
       # Try without logging in
-      put user_status_path(user, :event => "unhide")
+      put user_status_path(user, :event => "undelete")
       assert_response :forbidden
 
       # Now try as a normal user
       session_for(create(:user))
-      put user_status_path(user, :event => "unhide")
+      put user_status_path(user, :event => "undelete")
       assert_redirected_to :controller => "/errors", :action => :forbidden
 
       # Double-checking that there were no changes to the user
@@ -99,7 +99,7 @@ module Users
 
       # Finally try as an administrator
       session_for(create(:administrator_user))
-      put user_status_path(user, :event => "unhide")
+      put user_status_path(user, :event => "undelete")
       assert_redirected_to user_path(user)
 
       # Check that the user was deleted properly
diff --git a/test/integration/oauth2_test.rb b/test/integration/oauth2_test.rb
index 0601a567a..67e0a1807 100644
--- a/test/integration/oauth2_test.rb
+++ b/test/integration/oauth2_test.rb
@@ -251,7 +251,7 @@ class OAuth2Test < ActionDispatch::IntegrationTest
     get api_user_preferences_path, :headers => auth_header
     assert_response :forbidden
 
-    user.unhide!
+    user.undelete!
 
     get api_user_preferences_path, :headers => auth_header
     assert_response :success
-- 
2.39.5