From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 1 Jun 2021 16:32:30 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into cycles-constants
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c435de426d045118ed7be3d77f659f349d2d2245;p=akkoma

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

c435de426d045118ed7be3d77f659f349d2d2245
diff --cc lib/pleroma/web/activity_pub/utils.ex
index 984f39aa7,0513498aa..1df53f79a
--- a/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