aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:13:05 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-08-06 08:22:16 +0000
commite49131bb7212ba5d1b79fc20c83223325a2e98c4 (patch)
tree86241b700b851d93337cc1f650f09bb93b3516ec /lib/pleroma/user.ex
parent2b628f23410edc310d10e692ae0502136e999fd3 (diff)
downloadpleroma-e49131bb7212ba5d1b79fc20c83223325a2e98c4.tar.gz
relay: move to /relay endpoint from / due to webapp issues
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 327eb3ea3..8d8c53dfc 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -638,16 +638,18 @@ defmodule Pleroma.User do
end
def get_or_create_instance_user do
- if user = get_by_ap_id(Pleroma.Web.Endpoint.url()) do
+ relay_uri = "#{Pleroma.Web.Endpoint.url()}/relay"
+
+ if user = get_by_ap_id(relay_uri) do
user
else
changes =
%User{}
|> cast(%{}, [:ap_id, :nickname, :local])
- |> put_change(:ap_id, Pleroma.Web.Endpoint.url())
+ |> put_change(:ap_id, relay_uri)
|> put_change(:nickname, nil)
|> put_change(:local, true)
- |> put_change(:follower_address, Pleroma.Web.Endpoint.url() <> "/relay/followers")
+ |> put_change(:follower_address, relay_uri <> "/followers")
{:ok, user} = Repo.insert(changes)
user