From: lain Date: Wed, 14 Aug 2019 13:30:40 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/develop' into pleroma-conversations X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=560dbad538ba978d00116b1b037502ba2185cb5e;p=akkoma Merge remote-tracking branch 'origin/develop' into pleroma-conversations --- 560dbad538ba978d00116b1b037502ba2185cb5e diff --cc CHANGELOG.md index f8c90a73b,358287096..2d6eac4c5 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -38,9 -41,11 +41,12 @@@ The format is based on [Keep a Changelo - Invalid SemVer version generation, when the current branch does not have commits ahead of tag/checked out on a tag - Pleroma.Upload base_url was not automatically whitelisted by MediaProxy. Now your custom CDN or file hosting will be accessed directly as expected. - Report email not being sent to admins when the reporter is a remote user + - MRF: ensure that subdomain_match calls are case-insensitive ### Added +- Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data. + - **Breaking:** MRF describe API, which adds support for exposing configuration information about MRF policies to NodeInfo. + Custom modules will need to be updated by adding, at the very least, `def describe, do: {:ok, %{}}` to the MRF policy modules. - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`) - MRF: Support for excluding specific domains from Transparency. - MRF: Support for filtering posts based on who they mention (`Pleroma.Web.ActivityPub.MRF.MentionPolicy`) diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex index a862554b1,492af1702..d3aea2aaf --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@@ -5,9 -5,9 +5,11 @@@ defmodule Pleroma.Web.MastodonAPI.StatusView do use Pleroma.Web, :view + require Pleroma.Constants + alias Pleroma.Activity + alias Pleroma.Conversation + alias Pleroma.Conversation.Participation alias Pleroma.HTML alias Pleroma.Object alias Pleroma.Repo