nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Actually put some onformation in the error user, make it actually properly parse

Browse source 
in conversations.
This commit is contained in:
lain 2019-01-07 20:59:30 +01:00
parent 74e1093732
commit a16b17cc61
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -101,12 +101,14 @@ defp get_user(ap_id, opts) do
user
true ->
error_user()
error_user(ap_id)
end
end
defp error_user do
defp error_user(ap_id) do
%User{
name: ap_id,
ap_id: ap_id,
info: %User.Info{},
nickname: "erroruser@example.com",
inserted_at: NaiveDateTime.utc_now()

9
test/web/twitter_api/views/activity_view_test.exs
View file

@ -25,7 +25,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
import Mock
test "returns an error user for activities missing users" do
test "returns a temporary ap_id based user for activities missing db users" do
user = insert(:user)
{:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!", "visibility" => "direct"})
@ -33,8 +33,11 @@ test "returns an error user for activities missing users" do
Repo.delete(user)
Cachex.clear(:user_cache)
result = ActivityView.render("activity.json", activity: activity)
assert result
%{"user" => tw_user} = ActivityView.render("activity.json", activity: activity)
assert tw_user["screen_name"] == "erroruser@example.com"
assert tw_user["name"] == user.ap_id
assert tw_user["statusnet_profile_url"] == user.ap_id
end
test "tries to get a user by nickname if fetching by ap_id doesn't work" do