Merge branch 'dm-visibility-for-blocking-users' into 'develop'

Fix DM visibility for blocking users #698

Closes #698

See merge request pleroma/pleroma!890
This commit is contained in:
kaniini 2019-03-04 13:20:17 +00:00
commit c63a45cd0e
4 changed files with 72 additions and 16 deletions

View File

@ -292,13 +292,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end end
def dm_timeline(%{assigns: %{user: user}} = conn, params) do def dm_timeline(%{assigns: %{user: user}} = conn, params) do
query = params =
ActivityPub.fetch_activities_query( params
[user.ap_id], |> Map.put("type", "Create")
Map.merge(params, %{"type" => "Create", visibility: "direct"}) |> Map.put("blocking_user", user)
) |> Map.put("user", user)
|> Map.put(:visibility, "direct")
activities = Repo.all(query) activities =
ActivityPub.fetch_activities_query([user.ap_id], params)
|> Repo.all()
conn conn
|> add_link_headers(:dm_timeline, activities) |> add_link_headers(:dm_timeline, activities)

View File

@ -177,13 +177,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end end
def dm_timeline(%{assigns: %{user: user}} = conn, params) do def dm_timeline(%{assigns: %{user: user}} = conn, params) do
query = params =
ActivityPub.fetch_activities_query( params
[user.ap_id], |> Map.put("type", "Create")
Map.merge(params, %{"type" => "Create", "user" => user, visibility: "direct"}) |> Map.put("blocking_user", user)
) |> Map.put("user", user)
|> Map.put(:visibility, "direct")
activities = Repo.all(query) activities =
ActivityPub.fetch_activities_query([user.ap_id], params)
|> Repo.all()
conn conn
|> put_view(ActivityView) |> put_view(ActivityView)

View File

@ -248,6 +248,33 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert status["url"] != direct.data["id"] assert status["url"] != direct.data["id"]
end end
test "doesn't include DMs from blocked users", %{conn: conn} do
blocker = insert(:user)
blocked = insert(:user)
user = insert(:user)
{:ok, blocker} = User.block(blocker, blocked)
{:ok, _blocked_direct} =
CommonAPI.post(blocked, %{
"status" => "Hi @#{blocker.nickname}!",
"visibility" => "direct"
})
{:ok, direct} =
CommonAPI.post(user, %{
"status" => "Hi @#{blocker.nickname}!",
"visibility" => "direct"
})
res_conn =
conn
|> assign(:user, user)
|> get("api/v1/timelines/direct")
[status] = json_response(res_conn, 200)
assert status["id"] == direct.id
end
test "replying to a status", %{conn: conn} do test "replying to a status", %{conn: conn} do
user = insert(:user) user = insert(:user)

View File

@ -415,6 +415,33 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
assert status["id"] == direct_two.id assert status["id"] == direct_two.id
assert status_two["id"] == direct.id assert status_two["id"] == direct.id
end end
test "doesn't include DMs from blocked users", %{conn: conn} do
blocker = insert(:user)
blocked = insert(:user)
user = insert(:user)
{:ok, blocker} = User.block(blocker, blocked)
{:ok, _blocked_direct} =
CommonAPI.post(blocked, %{
"status" => "Hi @#{blocker.nickname}!",
"visibility" => "direct"
})
{:ok, direct} =
CommonAPI.post(user, %{
"status" => "Hi @#{blocker.nickname}!",
"visibility" => "direct"
})
res_conn =
conn
|> assign(:user, blocker)
|> get("/api/statuses/dm_timeline.json")
[status] = json_response(res_conn, 200)
assert status["id"] == direct.id
end
end end
describe "GET /statuses/mentions.json" do describe "GET /statuses/mentions.json" do
@ -1762,8 +1789,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|> assign(:user, user) |> assign(:user, user)
|> post("/api/pleroma/friendships/approve", %{"user_id" => other_user.id}) |> post("/api/pleroma/friendships/approve", %{"user_id" => other_user.id})
user = Repo.get(User, user.id)
assert relationship = json_response(conn, 200) assert relationship = json_response(conn, 200)
assert other_user.id == relationship["id"] assert other_user.id == relationship["id"]
assert relationship["follows_you"] == true assert relationship["follows_you"] == true
@ -1787,8 +1812,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|> assign(:user, user) |> assign(:user, user)
|> post("/api/pleroma/friendships/deny", %{"user_id" => other_user.id}) |> post("/api/pleroma/friendships/deny", %{"user_id" => other_user.id})
user = Repo.get(User, user.id)
assert relationship = json_response(conn, 200) assert relationship = json_response(conn, 200)
assert other_user.id == relationship["id"] assert other_user.id == relationship["id"]
assert relationship["follows_you"] == false assert relationship["follows_you"] == false