From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 11 Jul 2019 06:26:59 +0000 (+0700)
Subject: Merge branch 'develop' into feature/addressable-lists
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=182f7bbb1170c44eac4ab4a9efa4ff0bff991c98;p=akkoma

Merge branch 'develop' into feature/addressable-lists
---

182f7bbb1170c44eac4ab4a9efa4ff0bff991c98
diff --cc CHANGELOG.md
index e569c5ad2,f27446f36..ff0cb8740
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -51,11 -89,17 +89,18 @@@ Configuration: `federation_incoming_rep
  - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
  - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
  - MRF: Support for running subchains.
 +- Addressable lists
  - Configuration: `skip_thread_containment` option
+ - Configuration: `rate_limit` option. See `Pleroma.Plugs.RateLimiter` documentation for details.
+ - MRF: Support for filtering out likely spam messages by rejecting posts from new users that contain links.
+ - Configuration: `ignore_hosts` option
+ - Configuration: `ignore_tld` option
+ - Configuration: default syslog tag "Pleroma" is now lowercased to "pleroma"
  
  ### Changed
+ - **Breaking:** bind to 127.0.0.1 instead of 0.0.0.0 by default
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
+ - Thread containment / test for complete visibility will be skipped by default.
  - Enforcement of OAuth scopes
  - Add multiple use/time expiring invite token
  - Restyled OAuth pages to fit with Pleroma's default theme
diff --cc lib/pleroma/web/common_api/common_api.ex
index 25b5fedb8,f1450b113..8e3892bdf
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@@ -239,18 -235,28 +241,25 @@@ defmodule Pleroma.Web.CommonAPI d
               "emoji",
               Map.merge(Formatter.get_emoji_map(full_payload), poll_emoji)
             ) do
 -      res =
 -        ActivityPub.create(
 -          %{
 -            to: to,
 -            actor: user,
 -            context: context,
 -            object: object,
 -            additional: %{"cc" => cc, "directMessage" => visibility == "direct"}
 -          },
 -          Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false
 -        )
 -
 -      res
 +      ActivityPub.create(
 +        %{
 +          to: to,
 +          actor: user,
 +          context: context,
 +          object: object,
 +          additional: %{"cc" => cc, "bcc" => bcc, "directMessage" => visibility == "direct"}
 +        },
 +        Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false
 +      )
      else
-       e -> {:error, e}
+       {:private_to_public, true} ->
+         {:error, dgettext("errors", "The message visibility must be direct")}
+ 
+       {:error, _} = e ->
+         e
+ 
+       e ->
+         {:error, e}
      end
    end