Merge branch 'features/column_media_streaming' into 'develop'

Add streaming to media tabs of federated and local TLs

See merge request pleroma/pleroma!225

diff --combined lib/pleroma/web/activity_pub/activity_pub.ex
index 567ee31159572045d2868b69f3f8dd185b3456f9,554202f6bd6b79db6179539134ae8328bcc08e71..dfcc5b9eda804ceb5e322a967de960758aa4e37d
--- 1/lib/pleroma/web/activity_pub/activity_pub.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -65,6 -65,14 +65,14 @@@ defmodule Pleroma.Web.ActivityPub.Activ
          if activity.local do
            Pleroma.Web.Streamer.stream("public:local", activity)
          end
+ 
+         if activity.data["object"]["attachment"] != [] do
+           Pleroma.Web.Streamer.stream("public:media", activity)
+ 
+           if activity.local do
+             Pleroma.Web.Streamer.stream("public:local:media", activity)
+           end
+         end
        else
          if !Enum.member?(activity.data["cc"] || [], public) &&
               !Enum.member?(
@@@ -430,15 -438,6 +438,15 @@@
  
    defp restrict_media(query, _), do: query
  
 +  defp restrict_replies(query, %{"exclude_replies" => val}) when val == "true" or val == "1" do
 +    from(
 +      activity in query,
 +      where: fragment("?->'object'->>'inReplyTo' is null", activity.data)
 +    )
 +  end
 +
 +  defp restrict_replies(query, _), do: query
 +
    # Only search through last 100_000 activities by default
    defp restrict_recent(query, %{"whole_db" => true}), do: query
  
@@@ -496,7 -495,6 +504,7 @@@
      |> restrict_blocked(opts)
      |> restrict_media(opts)
      |> restrict_visibility(opts)
 +    |> restrict_replies(opts)
    end
  
    def fetch_activities(recipients, opts \\ %{}) do