Rename SubscriptionNotificationController list and get actions to index and show

diff --git a/lib/pleroma/web/pleroma_api/subscription_notification_controller.ex b/lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
index 969ce01792fe12b93b50def704e5636fffcdd832..fa8307668695c3e4bb1ea74b4d98db1305456cfb 100644 (file)
--- a/lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
+++ b/lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationController do
   alias Pleroma.SubscriptionNotification
   alias Pleroma.Web.PleromaAPI.PleromaAPI
 
-  def list(%{assigns: %{user: user}} = conn, params) do
+  def index(%{assigns: %{user: user}} = conn, params) do
     notifications = PleromaAPI.get_subscription_notifications(user, params)
 
     conn
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationController do
     |> render("index.json", %{notifications: notifications, for: user})
   end
 
-  def get(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do
+  def show(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do
     with {:ok, notification} <- SubscriptionNotification.get(user, id) do
       render(conn, "show.json", %{subscription_notification: notification, for: user})
     else

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 1fff94b3803f893c5849f3c808db3b4746bde49d..502c67e747d73fa8add71c3f19d734b201300959 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -273,8 +273,8 @@ defmodule Pleroma.Web.Router do
         post("/clear", SubscriptionNotificationController, :clear)
         post("/dismiss", SubscriptionNotificationController, :dismiss)
         delete("/destroy_multiple", SubscriptionNotificationController, :destroy_multiple)
-        get("/", SubscriptionNotificationController, :list)
-        get("/:id", SubscriptionNotificationController, :get)
+        get("/", SubscriptionNotificationController, :index)
+        get("/:id", SubscriptionNotificationController, :show)
       end
     end
 

diff --git a/test/web/pleroma_api/subscription_notification_controller_test.exs b/test/web/pleroma_api/subscription_notification_controller_test.exs
index 781d27ead6e5fcee58c78afa03cdadd055809d16..c6a71732d060f392b7f28eccdc4b4b43482903a6 100644 (file)
--- a/test/web/pleroma_api/subscription_notification_controller_test.exs
+++ b/test/web/pleroma_api/subscription_notification_controller_test.exs
@@ -33,7 +33,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
     test "list of notifications", %{conn: conn, user: user, subscriber: subscriber} do
       status_text = "Hello"
       {:ok, _activity} = CommonAPI.post(user, %{"status" => status_text})
-      path = subscription_notification_path(conn, :list)
+      path = subscription_notification_path(conn, :index)
 
       conn =
         conn
@@ -50,7 +50,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
       {:ok, _activity} = CommonAPI.post(user, %{"status" => status_text})
       [notification] = Repo.all(SubscriptionNotification)
 
-      path = subscription_notification_path(conn, :get, notification)
+      path = subscription_notification_path(conn, :show, notification)
 
       conn =
         conn
@@ -101,7 +101,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
       conn =
         build_conn()
         |> assign(:user, subscriber)
-        |> get(subscription_notification_path(conn, :list))
+        |> get(subscription_notification_path(conn, :index))
 
       assert json_response(conn, 200) == []
 
@@ -136,7 +136,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
       conn_res =
         get(
           conn,
-          subscription_notification_path(conn, :list, %{
+          subscription_notification_path(conn, :index, %{
             "limit" => 2,
             "min_id" => notification1_id
           })
@@ -149,7 +149,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
       conn_res =
         get(
           conn,
-          subscription_notification_path(conn, :list, %{
+          subscription_notification_path(conn, :index, %{
             "limit" => 2,
             "since_id" => notification1_id
           })
@@ -162,7 +162,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
       conn_res =
         get(
           conn,
-          subscription_notification_path(conn, :list, %{
+          subscription_notification_path(conn, :index, %{
             "limit" => 2,
             "max_id" => notification4_id
           })
@@ -195,7 +195,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
 
       conn = assign(conn, :user, user1)
 
-      conn_res = get(conn, subscription_notification_path(conn, :list))
+      conn_res = get(conn, subscription_notification_path(conn, :index))
 
       result = json_response(conn_res, 200)
 
@@ -205,7 +205,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
 
       conn2 = assign(conn, :user, user2)
 
-      conn_res = get(conn2, subscription_notification_path(conn, :list))
+      conn_res = get(conn2, subscription_notification_path(conn, :index))
 
       result = json_response(conn_res, 200)
 
@@ -220,7 +220,7 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationControllerTest do
 
       assert json_response(conn_destroy, 200) == %{}
 
-      conn_res = get(conn2, subscription_notification_path(conn, :list))
+      conn_res = get(conn2, subscription_notification_path(conn, :index))
 
       result = json_response(conn_res, 200)