Add public timeline TwAPI.
This commit is contained in:
parent
b9d0e34506
commit
2db28df4cf
6 changed files with 37 additions and 6 deletions
|
|
@ -8,7 +8,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
end
|
||||
|
||||
def fetch_public_activities(opts \\ %{}) do
|
||||
since_id = opts[:since_id] || 0
|
||||
since_id = opts["since_id"] || 0
|
||||
|
||||
query = from activity in Activity,
|
||||
where: fragment(~s(? @> '{"to": ["https://www.w3.org/ns/activitystreams#Public"]}'), activity.data),
|
||||
|
|
|
|||
|
|
@ -9,12 +9,19 @@ defmodule Pleroma.Web.Router do
|
|||
|
||||
pipeline :api do
|
||||
plug :accepts, ["json"]
|
||||
plug :fetch_session
|
||||
plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1, optional: true}
|
||||
end
|
||||
|
||||
pipeline :authenticated_api do
|
||||
plug :accepts, ["json"]
|
||||
plug :fetch_session
|
||||
plug Pleroma.Plugs.AuthenticationPlug, fetcher: &Pleroma.Web.Router.user_fetcher/1
|
||||
plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1}
|
||||
end
|
||||
|
||||
scope "/api", Pleroma.Web do
|
||||
pipe_through :api
|
||||
get "/statuses/public_timeline.json", TwitterAPI.Controller, :public_timeline
|
||||
end
|
||||
|
||||
scope "/api", Pleroma.Web do
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
|||
ActivityPub.insert(activity)
|
||||
end
|
||||
|
||||
def fetch_public_statuses do
|
||||
activities = ActivityPub.fetch_public_activities
|
||||
def fetch_public_statuses(opts \\ %{}) do
|
||||
activities = ActivityPub.fetch_public_activities(opts)
|
||||
|
||||
Enum.map(activities, fn(activity) ->
|
||||
actor = get_in(activity.data, ["actor"])
|
||||
|
|
|
|||
|
|
@ -16,6 +16,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|||
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
|
||||
end
|
||||
|
||||
def public_timeline(conn, params) do
|
||||
statuses = TwitterAPI.fetch_public_statuses(params)
|
||||
{:ok, json} = Poison.encode(statuses)
|
||||
|
||||
conn
|
||||
|> json_reply(200, json)
|
||||
end
|
||||
|
||||
defp json_reply(conn, status, json) do
|
||||
conn
|
||||
|> put_resp_content_type("application/json")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue