diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-04-29 20:08:45 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-04-29 20:08:45 +0200 |
| commit | 20015b4b67cf0dfab6bdb658c9eb0e1ae04febdc (patch) | |
| tree | bd0163ce456b3c521aa3967f52819b853e1fa1f8 /lib/pleroma | |
| parent | ba1ea770012893ea818f248e9a0a2ee3ab854676 (diff) | |
| download | pleroma-20015b4b67cf0dfab6bdb658c9eb0e1ae04febdc.tar.gz | |
Save remote users with fqn as nickname.
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/websub/websub.ex | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index 3e239179e..59c5d8e9e 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -96,10 +96,12 @@ defmodule Pleroma.Web.OStatus do data = %{ local: false, name: info.name, - nickname: info.nickname, + nickname: info.nickname <> "@" <> info.host, ap_id: info.uri, info: info } + # TODO: Make remote user changeset + # SHould enforce fqn nickname Repo.insert(Ecto.Changeset.change(%User{}, data)) end end diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex index 8e3e0a54e..3fd779fba 100644 --- a/lib/pleroma/web/websub/websub.ex +++ b/lib/pleroma/web/websub/websub.ex @@ -139,7 +139,8 @@ defmodule Pleroma.Web.Websub do uri: uri, hub: hub, nickname: preferredUsername || name, - name: displayName || name + name: displayName || name, + host: URI.parse(uri).host }} else e -> {:error, e} |