mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

TwitterAPI: Add is_local to user view.

Browse source
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 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"statusnet_profile_url" => user.ap_id,
"cover_photo" => User.banner_url(user) |> MediaProxy.url(),
"background_image" => image_url(user.info["background"]) |> MediaProxy.url(),
"is_local" => user.local
}
if assigns[:token] do

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

@ -56,7 +56,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil
"background_image" => nil,
"is_local" => true
}
assert represented == UserView.render("show.json", %{user: user})
@ -88,7 +89,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil
"background_image" => nil,
"is_local" => true
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
@ -121,7 +123,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"rights" => %{},
"statusnet_profile_url" => follower.ap_id,
"cover_photo" => banner,
"background_image" => nil
"background_image" => nil,
"is_local" => true
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
@ -154,7 +157,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"rights" => %{},
"statusnet_profile_url" => user.ap_id,
"cover_photo" => banner,
"background_image" => nil
"background_image" => nil,
"is_local" => true
}
blocker = Repo.get(User, blocker.id)