fixes- found that TwitterAPI.Controller adds .json suffix already

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index a502ba4d576ff085cb5e6550ebc8a082e6626a65..b65850aaacbee981243f66b716673e5dc6584a2a 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -269,7 +269,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.json", TwitterAPI.Controller, :empty_array)
+    get("/qvitter/mutes", TwitterAPI.Controller, :empty_array)
 
     get("/externalprofile/show", TwitterAPI.Controller, :external_profile)
   end

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 806227110e944dd2e2b36f5d50fb48631d164e7c..edc8cbff843209a2d60f358232ad3fed07128750 100644 (file)
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -491,6 +491,25 @@ 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]