From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 25 Jun 2018 08:45:42 +0000 (+0000)
Subject: Merge branch 'fix/mutes.json-emptyarray' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fc012491a5174139b06cc9945e6dc4bc687ebdb7;hp=6160a1b3c07c49cf81e2353cc25a123e75843581;p=akkoma

Merge branch 'fix/mutes.json-emptyarray' into 'develop'

Return empty array from /api/qvitter/mutes.json

See merge request pleroma/pleroma!234
---

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index 6b2821b21..3f0ecafb5 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -13,6 +13,23 @@ Instead, overload the settings by editing the following files:
 * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev`
 * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod`
 
+## Block functionality
+
+    config :pleroma, :activitypub,
+      accept_blocks: true,
+      unfollow_blocked: true,
+      outgoing_blocks: true
+
+    config :pleroma, :user, deny_follow_blocked: true
+
+* `accept_blocks`: whether to accept incoming block activities from
+   other instances
+* `unfollow_blocked`: whether blocks result in people getting
+   unfollowed
+* `outgoing_blocks`: whether to federate blocks to other instances
+* `deny_follow_blocked`: whether to disallow following an account that
+   has blocked the user in question
+
 ## Message Rewrite Filters (MRFs)
 
 Modify incoming and outgoing posts.
diff --git a/config/config.exs b/config/config.exs
index 6fc127d4c..cf6cbaa9d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -26,6 +26,7 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
+  "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
   "application/activity+json" => ["activity+json"],
   "application/ld+json" => ["activity+json"]
@@ -57,7 +58,12 @@ config :pleroma, :instance,
   public: true,
   quarantined_instances: []
 
-config :pleroma, :activitypub, accept_blocks: true
+config :pleroma, :activitypub,
+  accept_blocks: true,
+  unfollow_blocked: true,
+  outgoing_blocks: true
+
+config :pleroma, :user, deny_follow_blocked: true
 
 config :pleroma, :mrf_rejectnonpublic,
   allow_followersonly: false,
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index aba8742a0..94f16c3c0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -169,6 +169,9 @@ defmodule Pleroma.User do
   end
 
   def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
+    user_config = Application.get_env(:pleroma, :user)
+    deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
+
     user_info = user_info(followed)
 
     should_direct_follow =
@@ -178,7 +181,8 @@ defmodule Pleroma.User do
           false
 
         # if the users are blocking each other, we shouldn't even be here, but check for it anyway
-        User.blocks?(follower, followed) == true or User.blocks?(followed, follower) == true ->
+        deny_follow_blocked and
+            (User.blocks?(follower, followed) or User.blocks?(followed, follower)) ->
           false
 
         # if OStatus, then there is no three-way handshake to follow
@@ -206,13 +210,16 @@ defmodule Pleroma.User do
   end
 
   def follow(%User{} = follower, %User{info: info} = followed) do
+    user_config = Application.get_env(:pleroma, :user)
+    deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
+
     ap_followers = followed.follower_address
 
     cond do
       following?(follower, followed) or info["deactivated"] ->
         {:error, "Could not follow user: #{followed.nickname} is already on your list."}
 
-      blocks?(followed, follower) ->
+      deny_follow_blocked and blocks?(followed, follower) ->
         {:error, "Could not follow user: #{followed.nickname} blocked you."}
 
       true ->
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index dfcc5b9ed..195679fad 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -251,16 +251,25 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
 
   def block(blocker, blocked, activity_id \\ nil, local \\ true) do
-    follow_activity = fetch_latest_follow(blocker, blocked)
+    ap_config = Application.get_env(:pleroma, :activitypub)
+    unfollow_blocked = Keyword.get(ap_config, :unfollow_blocked)
+    outgoing_blocks = Keyword.get(ap_config, :outgoing_blocks)
 
-    if follow_activity do
-      unfollow(blocker, blocked, nil, local)
+    with true <- unfollow_blocked do
+      follow_activity = fetch_latest_follow(blocker, blocked)
+
+      if follow_activity do
+        unfollow(blocker, blocked, nil, local)
+      end
     end
 
-    with block_data <- make_block_data(blocker, blocked, activity_id),
+    with true <- outgoing_blocks,
+         block_data <- make_block_data(blocker, blocked, activity_id),
          {:ok, activity} <- insert(block_data, local),
          :ok <- maybe_federate(activity) do
       {:ok, activity}
+    else
+      _e -> {:ok, nil}
     end
   end
 
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 8a8d1e050..dab255ee2 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -621,6 +621,58 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     json(conn, %{})
   end
 
+  def search2(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
+    accounts = User.search(query, params["resolve"] == "true")
+
+    fetched =
+      if Regex.match?(~r/https?:/, query) do
+        with {:ok, activities} <- OStatus.fetch_activity_from_url(query) do
+          activities
+          |> Enum.filter(fn
+            %{data: %{"type" => "Create"}} -> true
+            _ -> false
+          end)
+        else
+          _e -> []
+        end
+      end || []
+
+    q =
+      from(
+        a in Activity,
+        where: fragment("?->>'type' = 'Create'", a.data),
+        where: "https://www.w3.org/ns/activitystreams#Public" in a.recipients,
+        where:
+          fragment(
+            "to_tsvector('english', ?->'object'->>'content') @@ plainto_tsquery('english', ?)",
+            a.data,
+            ^query
+          ),
+        limit: 20,
+        order_by: [desc: :id]
+      )
+
+    statuses = Repo.all(q) ++ fetched
+
+    tags_path = Web.base_url() <> "/tag/"
+
+    tags =
+      String.split(query)
+      |> Enum.uniq()
+      |> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
+      |> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
+      |> Enum.map(fn tag -> %{name: tag, url: tags_path <> tag} end)
+
+    res = %{
+      "accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user),
+      "statuses" =>
+        StatusView.render("index.json", activities: statuses, for: user, as: :activity),
+      "hashtags" => tags
+    }
+
+    json(conn, res)
+  end
+
   def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
     accounts = User.search(query, params["resolve"] == "true")
 
@@ -812,7 +864,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
             boost_modal: false,
             delete_modal: true,
             auto_play_gif: false,
-            reduce_motion: false
+            display_sensitive_media: false,
+            reduce_motion: false,
+            max_toot_chars: Keyword.get(@instance, :limit)
           },
           compose: %{
             me: "#{user.id}",
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 9db683f44..f33d615cf 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -30,6 +30,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
       avatar_static: image,
       header: header,
       header_static: header,
+      emojis: [],
+      fields: [],
       source: %{
         note: "",
         privacy: "public",
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 4ebb2c368..34652cdde 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -170,9 +170,16 @@ defmodule Pleroma.Web.Router do
     get("/accounts/:id/following", MastodonAPIController, :following)
     get("/accounts/:id", MastodonAPIController, :user)
 
+    get("/trends", MastodonAPIController, :empty_array)
+
     get("/search", MastodonAPIController, :search)
   end
 
+  scope "/api/v2", Pleroma.Web.MastodonAPI do
+    pipe_through(:api)
+    get("/search", MastodonAPIController, :search2)
+  end
+
   scope "/api", Pleroma.Web do
     pipe_through(:config)
 
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index f7b8d7438..b93418b3f 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -28,6 +28,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       avatar_static: "http://localhost:4001/images/avi.png",
       header: "http://localhost:4001/images/banner.png",
       header_static: "http://localhost:4001/images/banner.png",
+      emojis: [],
+      fields: [],
       source: %{
         note: "",
         privacy: "public",