only_remote -> remote renaming

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70d2ac0a8e690488e06a46ae2d2b4af2437734c0..628f6f17d42ad6ef9f62de77afc6a6d37b0a0c86 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Admin API: An endpoint to manage frontends.
 - Streaming API: Add follow relationships updates.
 - WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types.
-- Mastodon API: Home, public, hashtag & list timelines accept `only_media`, `only_remote` & `local` parameters for filtration.
+- Mastodon API: Home, public, hashtag & list timelines accept `only_media`, `remote` & `local` parameters for filtration.
 </details>
 
 ### Fixed

diff --git a/docs/development/API/differences_in_mastoapi_responses.md b/docs/development/API/differences_in_mastoapi_responses.md
index 7a4979154a3a3abbd6ed8cd50f8a8a50f2afbb72..c83be2faac38659053e9aaf9160c48d5b844db09 100644 (file)
--- a/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/development/API/differences_in_mastoapi_responses.md
@@ -20,7 +20,7 @@ Home, public, hashtag & list timelines accept these parameters:
 
 - `only_media`: show only statuses with media attached
 - `local`: show only local statuses
-- `only_remote`: show only remote statuses
+- `remote`: show only remote statuses
 
 ## Statuses
 

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 58e868119daa3444b4b111a6e44758d8abee6eea..98051032aca1b10cb23353be274017556eed7449 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -735,7 +735,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_local(query, _), do: query
 
-  defp restrict_remote(query, %{only_remote: true}) do
+  defp restrict_remote(query, %{remote: true}) do
     from(activity in query, where: activity.local == false)
   end
 

diff --git a/lib/pleroma/web/api_spec/operations/timeline_operation.ex b/lib/pleroma/web/api_spec/operations/timeline_operation.ex
index 52008e27cae2c4c27595522249553923e5dcc028..01396642c6776d60ac1c2db5d3d5feabcc457471 100644 (file)
--- a/lib/pleroma/web/api_spec/operations/timeline_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/timeline_operation.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do
       security: [%{"oAuth" => ["read:statuses"]}],
       parameters: [
         local_param(),
-        only_remote_param(),
+        remote_param(),
         only_media_param(),
         with_muted_param(),
         exclude_visibilities_param(),
@@ -63,7 +63,7 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do
         local_param(),
         instance_param(),
         only_media_param(),
-        only_remote_param(),
+        remote_param(),
         with_muted_param(),
         exclude_visibilities_param(),
         reply_visibility_param() | pagination_params()
@@ -110,7 +110,7 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do
         ),
         local_param(),
         only_media_param(),
-        only_remote_param(),
+        remote_param(),
         with_muted_param(),
         exclude_visibilities_param() | pagination_params()
       ],
@@ -137,7 +137,7 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do
         ),
         with_muted_param(),
         local_param(),
-        only_remote_param(),
+        remote_param(),
         only_media_param(),
         exclude_visibilities_param() | pagination_params()
       ],
@@ -206,9 +206,9 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do
     )
   end
 
-  defp only_remote_param do
+  defp remote_param do
     Operation.parameter(
-      :only_remote,
+      :remote,
       :query,
       %Schema{allOf: [BooleanLike], default: false},
       "Show only remote statuses?"

diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index 066762748c20b6580a201d1395f9a17a5ee877aa..cc409451c1a4c398a0db6980017811c9038ea7fb 100644 (file)
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -131,22 +131,22 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       refute remote_activity.id in only_local_media_ids
       assert with_media.id in only_local_media_ids
 
-      only_remote_ids =
+      remote_ids =
         conn
-        |> get("/api/v1/timelines/home?only_remote=true")
+        |> get("/api/v1/timelines/home?remote=true")
         |> json_response_and_validate_schema(200)
         |> Enum.map(& &1["id"])
 
-      refute local_activity.id in only_remote_ids
-      assert remote_activity.id in only_remote_ids
-      refute with_media.id in only_remote_ids
+      refute local_activity.id in remote_ids
+      assert remote_activity.id in remote_ids
+      refute with_media.id in remote_ids
 
       assert conn
-             |> get("/api/v1/timelines/home?only_remote=true&only_media=true")
+             |> get("/api/v1/timelines/home?remote=true&only_media=true")
              |> json_response_and_validate_schema(200) == []
 
       assert conn
-             |> get("/api/v1/timelines/home?only_remote=true&local=true")
+             |> get("/api/v1/timelines/home?remote=true&local=true")
              |> json_response_and_validate_schema(200) == []
     end
   end
@@ -210,7 +210,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
 
       assert [%{"id" => ^remote_id}] =
                conn
-               |> get("/api/v1/timelines/public?only_remote=true")
+               |> get("/api/v1/timelines/public?remote=true")
                |> json_response_and_validate_schema(:ok)
 
       with_media_id = with_media.id
@@ -221,7 +221,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
                |> json_response_and_validate_schema(:ok)
 
       assert conn
-             |> get("/api/v1/timelines/public?only_remote=true&only_media=true")
+             |> get("/api/v1/timelines/public?remote=true&only_media=true")
              |> json_response_and_validate_schema(:ok) == []
 
       # does not contain repeats
@@ -657,7 +657,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
              ] = result
     end
 
-    test "filering", %{user: user, conn: conn} do
+    test "filtering", %{user: user, conn: conn} do
       {:ok, list} = Pleroma.List.create("name", user)
 
       local_user = insert(:user)
@@ -699,18 +699,18 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       assert with_media.id in only_local_media_ids
       refute remote_activity.id in only_local_media_ids
 
-      only_remote_ids =
+      remote_ids =
         conn
-        |> get("/api/v1/timelines/list/#{list.id}?only_remote=true")
+        |> get("/api/v1/timelines/list/#{list.id}?remote=true")
         |> json_response_and_validate_schema(200)
         |> Enum.map(& &1["id"])
 
-      refute local_activity.id in only_remote_ids
-      refute with_media.id in only_remote_ids
-      assert remote_activity.id in only_remote_ids
+      refute local_activity.id in remote_ids
+      refute with_media.id in remote_ids
+      assert remote_activity.id in remote_ids
 
       assert conn
-             |> get("/api/v1/timelines/list/#{list.id}?only_remote=true&only_media=true")
+             |> get("/api/v1/timelines/list/#{list.id}?remote=true&only_media=true")
              |> json_response_and_validate_schema(200) == []
 
       only_media_ids =
@@ -724,9 +724,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       refute remote_activity.id in only_media_ids
 
       assert conn
-             |> get(
-               "/api/v1/timelines/list/#{list.id}?only_media=true&local=true&only_remote=true"
-             )
+             |> get("/api/v1/timelines/list/#{list.id}?only_media=true&local=true&remote=true")
              |> json_response_and_validate_schema(200) == []
     end
   end
@@ -777,7 +775,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
 
       remote_ids =
         conn
-        |> get("/api/v1/timelines/tag/2hu?only_remote=true")
+        |> get("/api/v1/timelines/tag/2hu?remote=true")
         |> json_response_and_validate_schema(:ok)
         |> Enum.map(& &1["id"])
 
@@ -807,7 +805,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
 
       ids =
         conn
-        |> get("/api/v1/timelines/tag/2hu?only_media=true&local=true&only_remote=true")
+        |> get("/api/v1/timelines/tag/2hu?only_media=true&local=true&remote=true")
         |> json_response_and_validate_schema(:ok)
         |> Enum.map(& &1["id"])
 
@@ -816,7 +814,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
       refute remote_activity.id in ids
 
       assert conn
-             |> get("/api/v1/timelines/tag/2hu?only_media=true&only_remote=true")
+             |> get("/api/v1/timelines/tag/2hu?only_media=true&remote=true")
              |> json_response_and_validate_schema(:ok) == []
     end