Commit 8a479742 authored by lain's avatar lain

Fix specs.

parent 4ea2a410
Pipeline #843 failed with stage
in 2 minutes and 23 seconds
......@@ -47,7 +47,7 @@ defmodule Pleroma.Web.CommonAPI do
end
def get_visibility(%{"visibility" => visibility}), do: visibility
def get_visibility(%{"in_reply_to_status_id" => status_id}) do
def get_visibility(%{"in_reply_to_status_id" => status_id}) when status_id do
inReplyTo = get_replied_to_activity(status_id)
Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
end
......
......@@ -182,7 +182,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|> Map.put("actor_id", ap_id)
|> Map.put("whole_db", true)
activities = ActivityPub.fetch_activities([], params)
activities = ActivityPub.fetch_public_activities(params)
|> Enum.reverse
render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
......@@ -465,12 +465,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def favourites(%{assigns: %{user: user}} = conn, _) do
params = conn
params = %{}
|> Map.put("type", "Create")
|> Map.put("favorited_by", user.ap_id)
|> Map.put("blocking_user", user)
activities = ActivityPub.fetch_activities([], params)
activities = ActivityPub.fetch_public_activities(params)
|> Enum.reverse
conn
......
......@@ -14,6 +14,8 @@ defmodule Pleroma.Builders.UserBuilder do
end
def insert(data \\ %{}) do
Repo.insert(build(data))
{:ok, user} = Repo.insert(build(data))
User.invalidate_cache(user)
{:ok, user}
end
end
......@@ -218,7 +218,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
test "with user_id", %{conn: conn} do
user = insert(:user)
{:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user})
|> IO.inspect
conn = get(conn, "/api/statuses/user_timeline.json", %{"user_id" => user.id})
response = json_response(conn, 200)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment