From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 27 Apr 2020 10:33:00 +0000 (+0400)
Subject: Merge branch 'develop' into openapi/account
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f1ca917bb0d733445657e0be92440dedc2f8d3c6;p=akkoma

Merge branch 'develop' into openapi/account
---

f1ca917bb0d733445657e0be92440dedc2f8d3c6
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index fab67e784,61a4960a0..1f4a09370
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -1077,9 -1048,44 +1048,44 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      )
    end
  
+   defp restrict_replies(query, %{
+          "reply_filtering_user" => user,
+          "reply_visibility" => "self"
+        }) do
+     from(
+       [activity, object] in query,
+       where:
+         fragment(
+           "?->>'inReplyTo' is null OR ? = ANY(?)",
+           object.data,
+           ^user.ap_id,
+           activity.recipients
+         )
+     )
+   end
+ 
+   defp restrict_replies(query, %{
+          "reply_filtering_user" => user,
+          "reply_visibility" => "following"
+        }) do
+     from(
+       [activity, object] in query,
+       where:
+         fragment(
+           "?->>'inReplyTo' is null OR ? && array_remove(?, ?) OR ? = ?",
+           object.data,
+           ^[user.ap_id | User.get_cached_user_friends_ap_ids(user)],
+           activity.recipients,
+           activity.actor,
+           activity.actor,
+           ^user.ap_id
+         )
+     )
+   end
+ 
    defp restrict_replies(query, _), do: query
  
 -  defp restrict_reblogs(query, %{"exclude_reblogs" => val}) when val == "true" or val == "1" do
 +  defp restrict_reblogs(query, %{"exclude_reblogs" => val}) when val in [true, "true", "1"] do
      from(activity in query, where: fragment("?->>'type' != 'Announce'", activity.data))
    end
  
diff --cc test/support/conn_case.ex
index 36ce372c2,781622476..8099461cc
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@@ -51,11 -51,42 +51,47 @@@ defmodule Pleroma.Web.ConnCase d
          %{user: user, token: token, conn: conn}
        end
  
 +      defp request_content_type(%{conn: conn}) do
 +        conn = put_req_header(conn, "content-type", "multipart/form-data")
 +        [conn: conn]
 +      end
 +
+       defp json_response_and_validate_schema(conn, status \\ nil) do
+         content_type =
+           conn
+           |> Plug.Conn.get_resp_header("content-type")
+           |> List.first()
+           |> String.split(";")
+           |> List.first()
+ 
+         status = status || conn.status
+ 
+         %{private: %{open_api_spex: %{operation_id: op_id, operation_lookup: lookup, spec: spec}}} =
+           conn
+ 
+         schema = lookup[op_id].responses[status].content[content_type].schema
+         json = json_response(conn, status)
+ 
+         case OpenApiSpex.cast_value(json, schema, spec) do
+           {:ok, _data} ->
+             json
+ 
+           {:error, errors} ->
+             errors =
+               Enum.map(errors, fn error ->
+                 message = OpenApiSpex.Cast.Error.message(error)
+                 path = OpenApiSpex.Cast.Error.path_to_string(error)
+                 "#{message} at #{path}"
+               end)
+ 
+             flunk(
+               "Response does not conform to schema of #{op_id} operation: #{
+                 Enum.join(errors, "\n")
+               }\n#{inspect(json)}"
+             )
+         end
+       end
+ 
        defp ensure_federating_or_authenticated(conn, url, user) do
          initial_setting = Config.get([:instance, :federating])
          on_exit(fn -> Config.put([:instance, :federating], initial_setting) end)