Add statuses/mentions endpoint
This commit is contained in:
parent
eda742c78b
commit
3a56d7318f
@ -23,12 +23,15 @@ defmodule Pleroma.Web.Router do
|
|||||||
pipe_through :api
|
pipe_through :api
|
||||||
|
|
||||||
get "/help/test", TwitterAPI.Controller, :help_test
|
get "/help/test", TwitterAPI.Controller, :help_test
|
||||||
|
get "/statusnet/config", TwitterAPI.Controller, :config
|
||||||
|
|
||||||
get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
|
get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
|
||||||
get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
|
get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
|
||||||
get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
|
get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
|
||||||
|
|
||||||
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
|
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
|
||||||
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
|
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
|
||||||
get "/statusnet/config", TwitterAPI.Controller, :config
|
|
||||||
post "/account/register", TwitterAPI.Controller, :register
|
post "/account/register", TwitterAPI.Controller, :register
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -37,17 +40,24 @@ defmodule Pleroma.Web.Router do
|
|||||||
|
|
||||||
get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
|
get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
|
||||||
post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
|
post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
|
||||||
post "/statuses/update", TwitterAPI.Controller, :status_update
|
|
||||||
get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
|
get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
|
||||||
get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
|
get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
|
||||||
|
get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
|
||||||
|
|
||||||
|
post "/statuses/update", TwitterAPI.Controller, :status_update
|
||||||
|
post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
|
||||||
|
|
||||||
post "/friendships/create", TwitterAPI.Controller, :follow
|
post "/friendships/create", TwitterAPI.Controller, :follow
|
||||||
post "/friendships/destroy", TwitterAPI.Controller, :unfollow
|
post "/friendships/destroy", TwitterAPI.Controller, :unfollow
|
||||||
|
|
||||||
post "/statusnet/media/upload", TwitterAPI.Controller, :upload
|
post "/statusnet/media/upload", TwitterAPI.Controller, :upload
|
||||||
post "/media/upload", TwitterAPI.Controller, :upload_json
|
post "/media/upload", TwitterAPI.Controller, :upload_json
|
||||||
|
|
||||||
post "/favorites/create/:id", TwitterAPI.Controller, :favorite
|
post "/favorites/create/:id", TwitterAPI.Controller, :favorite
|
||||||
post "/favorites/create", TwitterAPI.Controller, :favorite
|
post "/favorites/create", TwitterAPI.Controller, :favorite
|
||||||
post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
|
post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
|
||||||
post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
|
|
||||||
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
|
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -85,6 +85,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
|||||||
|> activities_to_statuses(%{for: user})
|
|> activities_to_statuses(%{for: user})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def fetch_mentions(user, opts \\ %{}) do
|
||||||
|
ActivityPub.fetch_activities([user.ap_id], opts)
|
||||||
|
|> activities_to_statuses(%{for: user})
|
||||||
|
end
|
||||||
|
|
||||||
def fetch_conversation(user, id) do
|
def fetch_conversation(user, id) do
|
||||||
query = from activity in Activity,
|
query = from activity in Activity,
|
||||||
where: fragment("? @> ?", activity.data, ^%{ statusnetConversationId: id}),
|
where: fragment("? @> ?", activity.data, ^%{ statusnetConversationId: id}),
|
||||||
|
@ -57,6 +57,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
|
||||||
|
statuses = TwitterAPI.fetch_mentions(user, params)
|
||||||
|
{:ok, json} = Poison.encode(statuses)
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> json_reply(200, json)
|
||||||
|
end
|
||||||
|
|
||||||
def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
|
def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
|
||||||
case TwitterAPI.follow(user, followed_id) do
|
case TwitterAPI.follow(user, followed_id) do
|
||||||
{ :ok, user, followed, _activity } ->
|
{ :ok, user, followed, _activity } ->
|
||||||
|
@ -114,6 +114,27 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "GET /statuses/mentions.json" do
|
||||||
|
setup [:valid_user]
|
||||||
|
test "without valid credentials", %{conn: conn} do
|
||||||
|
conn = get conn, "/api/statuses/mentions.json"
|
||||||
|
assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "with credentials", %{conn: conn, user: current_user} do
|
||||||
|
{:ok, activity} = ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: current_user})
|
||||||
|
|
||||||
|
conn = conn
|
||||||
|
|> with_credentials(current_user.nickname, "test")
|
||||||
|
|> get("/api/statuses/mentions.json")
|
||||||
|
|
||||||
|
response = json_response(conn, 200)
|
||||||
|
|
||||||
|
assert length(response) == 1
|
||||||
|
assert Enum.at(response, 0) == ActivityRepresenter.to_map(activity, %{user: current_user, mentioned: [current_user]})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "GET /statuses/user_timeline.json" do
|
describe "GET /statuses/user_timeline.json" do
|
||||||
setup [:valid_user]
|
setup [:valid_user]
|
||||||
test "without any params", %{conn: conn} do
|
test "without any params", %{conn: conn} do
|
||||||
|
@ -102,6 +102,17 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
|||||||
assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: direct_activity_user, mentioned: [user]})
|
assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: direct_activity_user, mentioned: [user]})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "fetch user's mentions" do
|
||||||
|
user = insert(:user)
|
||||||
|
{:ok, activity} = ActivityBuilder.insert(%{"to" => [user.ap_id]})
|
||||||
|
activity_user = Repo.get_by(User, ap_id: activity.data["actor"])
|
||||||
|
|
||||||
|
statuses = TwitterAPI.fetch_mentions(user)
|
||||||
|
|
||||||
|
assert length(statuses) == 1
|
||||||
|
assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user, mentioned: [user]})
|
||||||
|
end
|
||||||
|
|
||||||
test "get a user by params" do
|
test "get a user by params" do
|
||||||
user1_result = {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
|
user1_result = {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
|
||||||
{:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
|
{:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
|
||||||
|
Loading…
Reference in New Issue
Block a user