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

TwitterAPI: Add is_local to user view.

This commit is contained in:
eal 2018-02-01 21:41:19 +02:00
parent 15cb3f2b01
commit ab83e0de6d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/twitter_api/views/user_view.ex
View File

@ -47,6 +47,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => User.banner_url(user) |> MediaProxy.url(), "cover_photo" => User.banner_url(user) |> MediaProxy.url(),
"background_image" => image_url(user.info["background"]) |> MediaProxy.url(), "background_image" => image_url(user.info["background"]) |> MediaProxy.url(),
"is_local" => user.local
} }
if assigns[:token] do if assigns[:token] do

12
test/web/twitter_api/views/user_view_test.exs
View File

@ -56,7 +56,8 @@ test "A user" do
"rights" => %{}, "rights" => %{},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil "background_image" => nil,
"is_local" => true
} }
assert represented == UserView.render("show.json", %{user: user}) assert represented == UserView.render("show.json", %{user: user})
@ -88,7 +89,8 @@ test "A user for a given other follower", %{user: user} do
"rights" => %{}, "rights" => %{},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil "background_image" => nil,
"is_local" => true
} }
assert represented == UserView.render("show.json", %{user: user, for: follower}) assert represented == UserView.render("show.json", %{user: user, for: follower})
@ -121,7 +123,8 @@ test "A user that follows you", %{user: user} do
"rights" => %{}, "rights" => %{},
"statusnet_profile_url" => follower.ap_id, "statusnet_profile_url" => follower.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil "background_image" => nil,
"is_local" => true
} }
assert represented == UserView.render("show.json", %{user: follower, for: user}) assert represented == UserView.render("show.json", %{user: follower, for: user})
@ -154,7 +157,8 @@ test "A blocked user for the blocker", %{user: user} do
"rights" => %{}, "rights" => %{},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil "background_image" => nil,
"is_local" => true
} }
blocker = Repo.get(User, blocker.id) blocker = Repo.get(User, blocker.id)