Merge remote-tracking branch 'pleroma/develop' into cycles-constants

diff --cc lib/pleroma/web/activity_pub/builder.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
index 984f39aa7628d3fc81837d51b65de95f1fe334e1,0513498aa5baa53862a5efecb1697409d7ef95ae..1df53f79ad75f20dc1f8b7ef193e7c52d1d8b9a9
--- 1/lib/pleroma/web/activity_pub/utils.ex
--- 2/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@@ -38,8 -37,6 +37,8 @@@ defmodule Pleroma.Web.ActivityPub.Util
    @supported_report_states ~w(open closed resolved)
    @valid_visibilities ~w(public unlisted private direct)
  
-   def as_local_public, do: Web.base_url() <> "/#Public"
++  def as_local_public, do: Endpoint.url() <> "/#Public"
 +
    # Some implementations send the actor URI as the actor field, others send the entire actor object,
    # so figure out what the actor's URI is based on what we have.
    def get_ap_id(%{"id" => id} = _), do: id

diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
Simple merge