Browse Source

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

in conversations.
tags/v0.9.9
lain 5 years ago
parent
commit
a16b17cc61
2 changed files with 10 additions and 5 deletions
  1. +4
    -2
      lib/pleroma/web/twitter_api/views/activity_view.ex
  2. +6
    -3
      test/web/twitter_api/views/activity_view_test.exs

+ 4
- 2
lib/pleroma/web/twitter_api/views/activity_view.ex View File

@@ -101,12 +101,14 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView 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()


+ 6
- 3
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 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest 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


Loading…
Cancel
Save