aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex7
-rw-r--r--lib/pleroma/web/router.ex18
-rw-r--r--lib/pleroma/web/twitter_api/representers/user_representer.ex8
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex47
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex53
5 files changed, 114 insertions, 19 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 125473b96..e9f0dcd32 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -133,6 +133,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
query
end
+ query = if opts["actor_id"] do
+ from activity in query,
+ where: fragment("? @> ?", activity.data, ^%{actor: opts["actor_id"]})
+ else
+ query
+ end
+
Repo.all(query)
|> Enum.reverse
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 33e395218..a4f13c879 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -27,11 +27,15 @@ defmodule Pleroma.Web.Router do
pipe_through :api
get "/help/test", TwitterAPI.Controller, :help_test
+ get "/statusnet/config", TwitterAPI.Controller, :config
+
get "/statuses/public_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/show/:id", TwitterAPI.Controller, :fetch_status
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
- get "/statusnet/config", TwitterAPI.Controller, :config
+
post "/account/register", TwitterAPI.Controller, :register
end
@@ -40,17 +44,25 @@ defmodule Pleroma.Web.Router do
get "/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/friends_timeline", TwitterAPI.Controller, :friends_timeline
+ get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
+ get "/statuses/mentions_timeline", 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/destroy", TwitterAPI.Controller, :unfollow
+
post "/statusnet/media/upload", TwitterAPI.Controller, :upload
post "/media/upload", TwitterAPI.Controller, :upload_json
+
post "/favorites/create/:id", TwitterAPI.Controller, :favorite
post "/favorites/create", TwitterAPI.Controller, :favorite
post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
- post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+
post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
end
diff --git a/lib/pleroma/web/twitter_api/representers/user_representer.ex b/lib/pleroma/web/twitter_api/representers/user_representer.ex
index 7582a0f22..ab7d6d353 100644
--- a/lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex
@@ -11,6 +11,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
false
end
+ user_info = User.user_info(user)
+
map = %{
"id" => user.id,
"name" => user.name,
@@ -19,9 +21,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
"following" => following,
# Fake fields
"favourites_count" => 0,
- "statuses_count" => 0,
- "friends_count" => 0,
- "followers_count" => 0,
+ "statuses_count" => user_info[:note_count],
+ "friends_count" => user_info[:following_count],
+ "followers_count" => user_info[:follower_count],
"profile_image_url" => image,
"profile_image_url_https" => image,
"profile_image_url_profile_size" => image,
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 735d88832..1053120c4 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -80,6 +80,16 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|> activities_to_statuses(%{for: user})
end
+ def fetch_user_statuses(user, opts \\ %{}) do
+ ActivityPub.fetch_activities([], opts)
+ |> activities_to_statuses(%{for: user})
+ 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
query = from activity in Activity,
where: fragment("? @> ?", activity.data, ^%{ statusnetConversationId: id}),
@@ -105,7 +115,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def follow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
- { :ok, follower } <- User.follow(follower, followed),
+ { :ok, follower } <- User.follow(follower, followed),
{ :ok, activity } <- ActivityPub.insert(%{
"type" => "Follow",
"actor" => follower.ap_id,
@@ -114,6 +124,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
})
do
{ :ok, follower, followed, activity }
+ else
+ err -> err
end
end
@@ -122,6 +134,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{ :ok, follower } <- User.unfollow(follower, followed)
do
{ :ok, follower, followed }
+ else
+ err -> err
end
end
@@ -244,12 +258,37 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{:ok, UserRepresenter.to_map(user)}
else
{:error, changeset} ->
- errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, opts} -> msg end)
- |> Poison.encode!
+ errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
+ |> Poison.encode!
{:error, %{error: errors}}
end
end
+ def get_user(user, params) do
+ case params do
+ %{ "user_id" => user_id } ->
+ case target = Repo.get(User, user_id) do
+ nil ->
+ {:error, "No user with such user_id"}
+ _ ->
+ {:ok, target}
+ end
+ %{ "screen_name" => nickname } ->
+ case target = Repo.get_by(User, nickname: nickname) do
+ nil ->
+ {:error, "No user with such screen_name"}
+ _ ->
+ {:ok, target}
+ end
+ _ ->
+ if user do
+ {:ok, user}
+ else
+ {:error, "You need to specify screen_name or user_id"}
+ end
+ end
+ end
+
defp activities_to_statuses(activities, opts) do
Enum.map(activities, fn(activity) ->
activity_to_status(activity, opts)
@@ -279,7 +318,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
actor = get_in(activity.data, ["actor"])
user = User.get_cached_by_ap_id(actor)
# mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
- mentioned_users = Enum.map(activity.data["to"], fn (ap_id) ->
+ mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
User.get_cached_by_ap_id(ap_id)
end)
|> Enum.filter(&(&1))
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 6014aedc4..8ea54852d 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -45,22 +45,45 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, json)
end
- def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
- { :ok, user, follower, _activity } = TwitterAPI.follow(user, followed_id)
+ def user_timeline(%{assigns: %{user: user}} = conn, params) do
+ case TwitterAPI.get_user(user, params) do
+ {:ok, target_user} ->
+ params = Map.merge(params, %{"actor_id" => target_user.ap_id})
+ statuses = TwitterAPI.fetch_user_statuses(user, params)
+ conn
+ |> json_reply(200, statuses |> Poison.encode!)
+ {:error, msg} ->
+ bad_request_reply(conn, msg)
+ end
+ end
- response = follower |> UserRepresenter.to_json(%{for: user})
+ def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
+ statuses = TwitterAPI.fetch_mentions(user, params)
+ {:ok, json} = Poison.encode(statuses)
conn
- |> json_reply(200, response)
+ |> json_reply(200, json)
end
- def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
- { :ok, user, follower } = TwitterAPI.unfollow(user, followed_id)
+ def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+ case TwitterAPI.follow(user, followed_id) do
+ { :ok, user, followed, _activity } ->
+ response = followed |> UserRepresenter.to_json(%{for: user})
+ conn
+ |> json_reply(200, response)
+ { :error, msg } -> forbidden_json_reply(conn, msg)
+ end
+ end
- response = follower |> UserRepresenter.to_json(%{for: user})
+ def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+ case TwitterAPI.unfollow(user, followed_id) do
+ { :ok, user, followed } ->
+ response = followed |> UserRepresenter.to_json(%{for: user})
- conn
- |> json_reply(200, response)
+ conn
+ |> json_reply(200, response)
+ { :error, msg } -> forbidden_json_reply(conn, msg)
+ end
end
def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
@@ -159,9 +182,21 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, response)
end
+ defp bad_request_reply(conn, error_message) do
+ json = Poison.encode!(%{"error" => error_message})
+ json_reply(conn, 400, json)
+ end
+
defp json_reply(conn, status, json) do
conn
|> put_resp_content_type("application/json")
|> send_resp(status, json)
end
+
+ defp forbidden_json_reply(conn, error_message) do
+ json = %{"error" => error_message, "request" => conn.request_path}
+ |> Poison.encode!
+
+ json_reply(conn, 403, json)
+ end
end
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-23 07:17:56 +0000