From f2badd4424a362f30409113142bfca750ec61214 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Sat, 23 Jun 2018 22:21:39 -0700 Subject: return empty array for api/qvitter/mutes.json queries instead of html --- lib/pleroma/web/router.ex | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 13bd393ab..a502ba4d5 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -269,6 +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("/externalprofile/show", TwitterAPI.Controller, :external_profile) end -- cgit v1.2.3 From 631600394694c1f90d0ecfc1432e46c1c54ca748 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Sat, 23 Jun 2018 23:05:54 -0700 Subject: fixes- found that TwitterAPI.Controller adds .json suffix already --- lib/pleroma/web/router.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index a502ba4d5..b65850aaa 100644 --- 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 -- cgit v1.2.3 From 1299bccc7de1562775de23245bf9922c16329e9a Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Sat, 23 Jun 2018 23:20:30 -0700 Subject: return unquoted empty array from /api/qvitter/mutes.json --- lib/pleroma/web/router.ex | 2 +- lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index b65850aaa..4ebb2c368 100644 --- 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", 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 index ff5921807..8f5b3c786 100644 --- 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 -- cgit v1.2.3 From 6160a1b3c07c49cf81e2353cc25a123e75843581 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Sun, 24 Jun 2018 15:24:41 -0700 Subject: mix format --- lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 0a047013a..7fecb8a4f 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do @accept Keyword.get(@mrf_policy, :accept) defp check_accept(actor_info, object) do - if length(@accept) > 0 and not actor_info.host in @accept do + if length(@accept) > 0 and not (actor_info.host in @accept) do {:reject, nil} else {:ok, object} -- cgit v1.2.3