moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save remote users with fqn as nickname.

This commit is contained in:
Roger Braun 2017-04-29 20:08:45 +02:00
parent ba1ea77001
commit 20015b4b67
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -96,10 +96,12 @@ def make_user(uri) do
data = %{ data = %{
local: false, local: false,
name: info.name, name: info.name,
nickname: info.nickname, nickname: info.nickname <> "@" <> info.host,
ap_id: info.uri, ap_id: info.uri,
info: info info: info
} }
# TODO: Make remote user changeset
# SHould enforce fqn nickname
Repo.insert(Ecto.Changeset.change(%User{}, data)) Repo.insert(Ecto.Changeset.change(%User{}, data))
end end
end end

3
lib/pleroma/web/websub/websub.ex
View File

@ -139,7 +139,8 @@ def gather_feed_data(topic, getter \\ &HTTPoison.get/1) do
uri: uri, uri: uri,
hub: hub, hub: hub,
nickname: preferredUsername || name, nickname: preferredUsername || name,
name: displayName || name name: displayName || name,
host: URI.parse(uri).host
}} }}
else e -> else e ->
{:error, e} {:error, e}

4
test/web/ostatus/ostatus_test.exs
View File

@ -33,7 +33,7 @@ test "tries to use the information in poco fields" do
user = Repo.get(Pleroma.User, user.id) user = Repo.get(Pleroma.User, user.id)
assert user.name == "Constance Variable" assert user.name == "Constance Variable"
assert user.nickname == "lambadalambda" assert user.nickname == "lambadalambda@social.heldscal.la"
assert user.local == false assert user.local == false
assert user.info["uri"] == uri assert user.info["uri"] == uri
assert user.ap_id == uri assert user.ap_id == uri
@ -60,6 +60,7 @@ test "it returns user info in a hash" do
subject: "acct:shp@social.heldscal.la", subject: "acct:shp@social.heldscal.la",
topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom", topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
uri: "https://social.heldscal.la/user/29191", uri: "https://social.heldscal.la/user/29191",
host: "social.heldscal.la",
fqn: user fqn: user
} }
assert data == expected assert data == expected
@ -80,6 +81,7 @@ test "it works with the uri" do
subject: "https://social.heldscal.la/user/29191", subject: "https://social.heldscal.la/user/29191",
topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom", topic: "https://social.heldscal.la/api/statuses/user_timeline/29191.atom",
uri: "https://social.heldscal.la/user/29191", uri: "https://social.heldscal.la/user/29191",
host: "social.heldscal.la",
fqn: user fqn: user
} }
assert data == expected assert data == expected

3
test/web/websub/websub_test.exs
View File

@ -118,7 +118,8 @@ test "discovers the hub and canonical url" do
hub: "https://mastodon.social/api/push", hub: "https://mastodon.social/api/push",
uri: "https://mastodon.social/users/lambadalambda", uri: "https://mastodon.social/users/lambadalambda",
nickname: "lambadalambda", nickname: "lambadalambda",
name: "Critical Value" name: "Critical Value",
host: "mastodon.social"
} }
assert expected == discovered assert expected == discovered