diff options
| author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
| commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
| tree | 80664a6152e92abb37133fede9e3ed72c6801910 /lib/pleroma/object.ex | |
| parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
| parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
| download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz | |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/object.ex')
| -rw-r--r-- | lib/pleroma/object.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 3ba749d1a..c3ea1b98b 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -366,7 +366,7 @@ defmodule Pleroma.Object do end def local?(%Object{data: %{"id" => id}}) do - String.starts_with?(id, Pleroma.Web.base_url() <> "/") + String.starts_with?(id, Pleroma.Web.Endpoint.url() <> "/") end def replies(object, opts \\ []) do |