rename `post` to `status`

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index ffb800177de59daf2127f004bc2f5a132248870d..8ac50540d994b9424eeb96427228d829bd40a8ee 100644 (file)
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -202,14 +202,14 @@ defmodule Pleroma.User.Info do
 
   def add_pinnned_activity(info, %Pleroma.Activity{id: id}) do
     if id not in info.pinned_activities do
-      max_pinned_posts = Pleroma.Config.get([:instance, :max_pinned_posts], 0)
+      max_pinned_statuses = Pleroma.Config.get([:instance, :max_pinned_statuses], 0)
       params = %{pinned_activities: info.pinned_activities ++ [id]}
 
       info
       |> cast(params, [:pinned_activities])
       |> validate_length(:pinned_activities,
-        max: max_pinned_posts,
-        message: "You have already pinned the maximum number of toots"
+        max: max_pinned_statuses,
+        message: "You have already pinned the maximum number of statuses"
       )
     else
       change(info)

diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 7d9febc470e6d0169b5afa1c0f3e0d1c6e7fc149..325ef663676560dc5f253ffb2e693df2854ae4d9 100644 (file)
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -601,8 +601,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
     assert object
   end
 
-  test "returned pinned posts" do
-    Pleroma.Config.put([:instance, :max_pinned_posts], 3)
+  test "returned pinned statuses" do
+    Pleroma.Config.put([:instance, :max_pinned_statuses], 3)
     user = insert(:user)
 
     {:ok, activity_one} = CommonAPI.post(user, %{"status" => "HI!!!"})

diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 59beb312021b05df1bd454c0083b19cedce6e688..652b5309924b3dd75502a17b59f139e57c060985 100644 (file)
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -97,9 +97,9 @@ defmodule Pleroma.Web.CommonAPI.Test do
     end
   end
 
-  describe "pinned posts" do
-    test "pin post" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+  describe "pinned statuses" do
+    test "pin status" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -107,8 +107,8 @@ defmodule Pleroma.Web.CommonAPI.Test do
       assert {:ok, ^activity} = CommonAPI.pin(activity.id, user)
     end
 
-    test "max pinned posts" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "max pinned statuses" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity_one} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -122,8 +122,8 @@ defmodule Pleroma.Web.CommonAPI.Test do
                CommonAPI.pin(activity_two.id, user)
     end
 
-    test "unpin post" do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "unpin status" do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})

diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 5ff7ef25972bc0493828ee2956f7e85bd6b43d58..e7e42dd2428a44db35928ce64d2fbdfa7735386b 100644 (file)
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -1472,9 +1472,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
     assert user.info.settings == %{"programming" => "socks"}
   end
 
-  describe "pinned posts" do
-    test "returns pinned posts", %{conn: conn} do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+  describe "pinned statuses" do
+    test "returns pinned statuses", %{conn: conn} do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -1492,8 +1492,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       assert [%{"id" => ^id_str}] = result
     end
 
-    test "pin post", %{conn: conn} do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "pin status", %{conn: conn} do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -1514,8 +1514,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
                |> Jason.decode!()
     end
 
-    test "unpin post", %{conn: conn} do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "unpin status", %{conn: conn} do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
       user = insert(:user)
 
       {:ok, activity} = CommonAPI.post(user, %{"status" => "HI!!!"})
@@ -1539,8 +1539,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
                |> Jason.decode!()
     end
 
-    test "max pinned posts", %{conn: conn} do
-      Pleroma.Config.put([:instance, :max_pinned_posts], 1)
+    test "max pinned statuses", %{conn: conn} do
+      Pleroma.Config.put([:instance, :max_pinned_statuses], 1)
 
       user = insert(:user)
 
@@ -1558,7 +1558,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
 
       user = User.get_by_ap_id(user.ap_id)
 
-      assert %{"error" => "You have already pinned the maximum number of toots"} =
+      assert %{"error" => "You have already pinned the maximum number of statuses"} =
                conn
                |> assign(:user, user)
                |> post("/api/v1/statuses/#{activity_two.id}/pin")