pleroma

commit: fc012491a5174139b06cc9945e6dc4bc687ebdb7
parent dfc96f222cc65eda92e5696a2fc2d6d926f960ed
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 25 Jun 2018 08:45:42 +0000

Merge branch 'fix/mutes.json-emptyarray' into 'develop'

Return empty array from /api/qvitter/mutes.json

See merge request pleroma/pleroma!234
Diffstat:
M
lib/pleroma/web/router.ex
1
+
M
lib/pleroma/web/twitter_api/twitter_api_controller.ex
4
++++
M
test/web/twitter_api/twitter_api_controller_test.exs
20
++++++++++++++++++++

3 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
@@ -276,6 +276,7 @@ defmodule Pleroma.Web.Router do
     get("/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array)
 
     get("/mutes/users/ids", TwitterAPI.Controller, :empty_array)
+    get("/qvitter/mutes", TwitterAPI.Controller, :raw_empty_array)
 
     get("/externalprofile/show", TwitterAPI.Controller, :external_profile)
   end
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -404,6 +404,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     json(conn, Jason.encode!([]))
   end
 
+  def raw_empty_array(conn, _params) do
+    json(conn, [])
+  end
+
   def update_profile(%{assigns: %{user: user}} = conn, params) do
     params =
       if bio = params["description"] do
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -491,6 +491,26 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "GET /api/qvitter/mutes.json" do
+    setup [:valid_user]
+
+    test "unimplemented mutes without valid credentials", %{conn: conn} do
+      conn = get(conn, "/api/qvitter/mutes.json")
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "unimplemented mutes with credentials", %{conn: conn, user: current_user} do
+      conn =
+        conn
+        |> with_credentials(current_user.nickname, "test")
+        |> get("/api/qvitter/mutes.json")
+
+      current_user = Repo.get(User, current_user.id)
+
+      assert [] = json_response(conn, 200)
+    end
+  end
+
   describe "POST /api/favorites/create/:id" do
     setup [:valid_user]