aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/application.ex9
-rw-r--r--lib/pleroma/user.ex40
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex7
-rw-r--r--lib/pleroma/web/router.ex3
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex42
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex54
6 files changed, 118 insertions, 37 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced..86b6c0c1e 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -14,10 +14,11 @@ defmodule Pleroma.Application do
supervisor(Pleroma.Web.Endpoint, []),
# Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
# worker(Pleroma.Worker, [arg1, arg2, arg3]),
- supervisor(ConCache, [[
- ttl_check: :timer.seconds(1),
- ttl: :timer.seconds(5)
- ], [name: :users]])
+ worker(Cachex, [:user_cache, [
+ default_ttl: 5000,
+ ttl_interval: 1000,
+ limit: 500
+ ]])
]
# See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index fdcc1b7d5..86b4b8b5e 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -55,22 +55,31 @@ defmodule Pleroma.User do
def follow(%User{} = follower, %User{} = followed) do
ap_followers = User.ap_followers(followed)
- following = [ap_followers | follower.following]
- |> Enum.uniq
+ if following?(follower, followed) do
+ { :error,
+ "Could not follow user: #{followed.nickname} is already on your list." }
+ else
+ following = [ap_followers | follower.following]
+ |> Enum.uniq
- follower
- |> follow_changeset(%{following: following})
- |> Repo.update
+ follower
+ |> follow_changeset(%{following: following})
+ |> Repo.update
+ end
end
def unfollow(%User{} = follower, %User{} = followed) do
ap_followers = User.ap_followers(followed)
- following = follower.following
- |> List.delete(ap_followers)
+ if following?(follower, followed) do
+ following = follower.following
+ |> List.delete(ap_followers)
- follower
- |> follow_changeset(%{following: following})
- |> Repo.update
+ follower
+ |> follow_changeset(%{following: following})
+ |> Repo.update
+ else
+ { :error, "Not subscribed!" }
+ end
end
def following?(%User{} = follower, %User{} = followed) do
@@ -78,15 +87,12 @@ defmodule Pleroma.User do
end
def get_cached_by_ap_id(ap_id) do
- ConCache.get_or_store(:users, "ap_id:#{ap_id}", fn() ->
- # Return false so the cache will store it.
- Repo.get_by(User, ap_id: ap_id) || false
- end)
+ key = "ap_id:#{ap_id}"
+ Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, ap_id: ap_id) end)
end
def get_cached_by_nickname(nickname) do
- ConCache.get_or_store(:users, "nickname:#{nickname}", fn() ->
- Repo.get_by(User, nickname: nickname) || false
- end)
+ key = "nickname:#{nickname}"
+ Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, nickname: nickname) end)
end
end
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 2d7c25b50..b28813a45 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -21,8 +21,11 @@ defmodule Pleroma.Web.Router do
scope "/api", Pleroma.Web do
pipe_through :api
+
+ get "/help/test", TwitterAPI.Controller, :help_test
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
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 569ef5d14..32d38b276 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -80,6 +80,11 @@ 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_conversation(user, id) do
query = from activity in Activity,
where: fragment("? @> ?", activity.data, ^%{ statusnetConversationId: id}),
@@ -103,8 +108,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
- def follow(%User{} = follower, followed_id) do
- with %User{} = followed <- Repo.get(User, followed_id),
+ def follow(%User{} = follower, params) do
+ with { :ok, %User{} = followed } <- get_user(params),
{ :ok, follower } <- User.follow(follower, followed),
{ :ok, activity } <- ActivityPub.insert(%{
"type" => "Follow",
@@ -114,6 +119,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
})
do
{ :ok, follower, followed, activity }
+ else
+ err -> err
end
end
@@ -122,6 +129,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{ :ok, follower } <- User.unfollow(follower, followed)
do
{ :ok, follower, followed }
+ else
+ err -> err
end
end
@@ -252,12 +261,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 \\ nil, 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)
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index b70af3b09..3d6487396 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -45,22 +45,36 @@ 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)
-
- response = follower |> UserRepresenter.to_json(%{for: user})
+ 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
- conn
- |> json_reply(200, response)
+ def follow(%{assigns: %{user: user}} = conn, params) do
+ case TwitterAPI.follow(user, params) 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
def unfollow(%{assigns: %{user: user}} = conn, params) do
- { :ok, user, follower } = TwitterAPI.unfollow(user, params)
-
- response = follower |> UserRepresenter.to_json(%{for: user})
-
- conn
- |> json_reply(200, response)
+ case TwitterAPI.unfollow(user, params) do
+ { :ok, user, unfollowed, } ->
+ response = unfollowed |> UserRepresenter.to_json(%{for: user})
+ conn
+ |> json_reply(200, response)
+ { :error, msg } -> forbidden_json_reply(conn, msg)
+ end
end
def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
@@ -85,6 +99,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> send_resp(200, response)
end
+ def help_test(conn, _params) do
+ conn |> json_reply(200, Poison.encode!("ok"))
+ end
+
def upload_json(conn, %{"media" => media}) do
response = TwitterAPI.upload(media, "json")
conn
@@ -155,9 +173,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-04-25 02:04:23 +0000