From 5c028b8f92aacb296afbd59130d848883f0c3a10 Mon Sep 17 00:00:00 2001 From: Sachin Joshi Date: Fri, 17 May 2019 12:20:31 +0545 Subject: [PATCH 001/400] user creation admin api will create multiple users --- CHANGELOG.md | 1 + .../web/admin_api/admin_api_controller.ex | 37 +++++---- .../web/admin_api/views/account_view.ex | 46 ++++++++++ lib/pleroma/web/router.ex | 2 +- .../admin_api/admin_api_controller_test.exs | 83 ++++++++++++++++++- 5 files changed, 149 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0e849285..5ee853c76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Configuration: Added `extra_cookie_attrs` for setting non-standard cookie attributes. Defaults to ["SameSite=Lax"] so that remote follows work. - Timelines: Messages involving people you have blocked will be excluded from the timeline in all cases instead of just repeats. - Admin API: Move the user related API to `api/pleroma/admin/users` +- Admin API: `POST /api/pleroma/admin/users` will take list of users - Pleroma API: Support for emoji tags in `/api/pleroma/emoji` resulting in a breaking API change - Mastodon API: Support for `exclude_types`, `limit` and `min_id` in `/api/v1/notifications` - Mastodon API: Add `languages` and `registrations` to `/api/v1/instance` diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index e00b33aba..6048ed35b 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -46,24 +46,31 @@ def user_unfollow(conn, %{"follower" => follower_nick, "followed" => followed_ni |> json("ok") end - def user_create( - conn, - %{"nickname" => nickname, "email" => email, "password" => password} - ) do - user_data = %{ - nickname: nickname, - name: nickname, - email: email, - password: password, - password_confirmation: password, - bio: "." - } + def users_create(conn, %{"users" => users}) do + result = + Enum.map(users, fn %{"nickname" => nickname, "email" => email, "password" => password} -> + user_data = %{ + nickname: nickname, + name: nickname, + email: email, + password: password, + password_confirmation: password, + bio: "." + } - changeset = User.register_changeset(%User{}, user_data, need_confirmation: false) - {:ok, user} = User.register(changeset) + changeset = User.register_changeset(%User{}, user_data, need_confirmation: false) + + case User.register(changeset) do + {:ok, user} -> + AccountView.render("created.json", %{user: user}) + + {:error, changeset} -> + AccountView.render("create-error.json", %{changeset: changeset}) + end + end) conn - |> json(user.nickname) + |> json(result) end def user_show(conn, %{"nickname" => nickname}) do diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 28bb667d8..e1825c5f1 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -44,4 +44,50 @@ def render("invites.json", %{invites: invites}) do invites: render_many(invites, AccountView, "invite.json", as: :invite) } end + + def render("created.json", %{user: user}) do + %{ + type: "success", + code: 201, + data: %{ + nickname: user.nickname, + email: user.email + } + } + end + + def render("create-error.json", %{changeset: %Ecto.Changeset{changes: changes, errors: errors}}) do + %{ + type: "error", + code: 409, + error: parse_error(errors), + data: %{ + nickname: Map.get(changes, :nickname), + email: Map.get(changes, :email) + } + } + end + + defp parse_error([]), do: "" + + defp parse_error(errors) do + ## when nickname is duplicate ap_id constraint error is raised + nickname_error = Keyword.get(errors, :nickname) || Keyword.get(errors, :ap_id) + email_error = Keyword.get(errors, :email) + password_error = Keyword.get(errors, :password) + + cond do + nickname_error -> + "nickname #{elem(nickname_error, 0)}" + + email_error -> + "email #{elem(email_error, 0)}" + + password_error -> + "password #{elem(password_error, 0)}" + + true -> + "" + end + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 7fef82f82..bbc2fda9b 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -156,7 +156,7 @@ defmodule Pleroma.Web.Router do post("/user", AdminAPIController, :user_create) delete("/users", AdminAPIController, :user_delete) - post("/users", AdminAPIController, :user_create) + post("/users", AdminAPIController, :users_create) patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation) put("/users/tag", AdminAPIController, :tag_users) delete("/users/tag", AdminAPIController, :untag_users) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 6c1897b5a..a0c9fd56f 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -31,12 +31,87 @@ test "Create" do |> assign(:user, admin) |> put_req_header("accept", "application/json") |> post("/api/pleroma/admin/users", %{ - "nickname" => "lain", - "email" => "lain@example.org", - "password" => "test" + "users" => [ + %{ + "nickname" => "lain", + "email" => "lain@example.org", + "password" => "test" + } + ] }) - assert json_response(conn, 200) == "lain" + assert json_response(conn, 200) == [ + %{ + "code" => 201, + "data" => %{ + "email" => "lain@example.org", + "nickname" => "lain" + }, + "type" => "success" + } + ] + end + + test "Cannot create user with exisiting email" do + admin = insert(:user, info: %{is_admin: true}) + user = insert(:user) + + conn = + build_conn() + |> assign(:user, admin) + |> put_req_header("accept", "application/json") + |> post("/api/pleroma/admin/users", %{ + "users" => [ + %{ + "nickname" => "lain", + "email" => user.email, + "password" => "test" + } + ] + }) + + assert json_response(conn, 200) == [ + %{ + "code" => 409, + "data" => %{ + "email" => user.email, + "nickname" => "lain" + }, + "error" => "email has already been taken", + "type" => "error" + } + ] + end + + test "Cannot create user with exisiting nickname" do + admin = insert(:user, info: %{is_admin: true}) + user = insert(:user) + + conn = + build_conn() + |> assign(:user, admin) + |> put_req_header("accept", "application/json") + |> post("/api/pleroma/admin/users", %{ + "users" => [ + %{ + "nickname" => user.nickname, + "email" => "someuser@plerama.social", + "password" => "test" + } + ] + }) + + assert json_response(conn, 200) == [ + %{ + "code" => 409, + "data" => %{ + "email" => "someuser@plerama.social", + "nickname" => user.nickname + }, + "error" => "nickname has already been taken", + "type" => "error" + } + ] end end From 5534d4c67675901ab272ee47355ad43dfae99033 Mon Sep 17 00:00:00 2001 From: Sachin Joshi Date: Sat, 1 Jun 2019 11:17:53 +0545 Subject: [PATCH 002/400] make bulk user creation from admin works as a transaction --- lib/pleroma/user.ex | 8 ++- .../web/admin_api/admin_api_controller.ex | 45 +++++++++---- .../web/admin_api/views/account_view.ex | 2 +- .../admin_api/admin_api_controller_test.exs | 66 ++++++++++++++++++- 4 files changed, 104 insertions(+), 17 deletions(-) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index c6a562a61..722e8ff6b 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -276,7 +276,13 @@ defp autofollow_users(user) do @doc "Inserts provided changeset, performs post-registration actions (confirmation email sending etc.)" def register(%Ecto.Changeset{} = changeset) do with {:ok, user} <- Repo.insert(changeset), - {:ok, user} <- autofollow_users(user), + {:ok, user} <- post_register_action(user) do + {:ok, user} + end + end + + def post_register_action(%User{} = user) do + with {:ok, user} <- autofollow_users(user), {:ok, user} <- set_cache(user), {:ok, _} <- Pleroma.User.WelcomeMessage.post_welcome_message_to_user(user), {:ok, _} <- try_send_confirmation_email(user) do diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 6048ed35b..60fd4e571 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -47,7 +47,7 @@ def user_unfollow(conn, %{"follower" => follower_nick, "followed" => followed_ni end def users_create(conn, %{"users" => users}) do - result = + changesets = Enum.map(users, fn %{"nickname" => nickname, "email" => email, "password" => password} -> user_data = %{ nickname: nickname, @@ -58,19 +58,40 @@ def users_create(conn, %{"users" => users}) do bio: "." } - changeset = User.register_changeset(%User{}, user_data, need_confirmation: false) - - case User.register(changeset) do - {:ok, user} -> - AccountView.render("created.json", %{user: user}) - - {:error, changeset} -> - AccountView.render("create-error.json", %{changeset: changeset}) - end + User.register_changeset(%User{}, user_data, need_confirmation: false) + end) + |> Enum.reduce(Ecto.Multi.new(), fn changeset, multi -> + Ecto.Multi.insert(multi, Ecto.UUID.generate(), changeset) end) - conn - |> json(result) + case Pleroma.Repo.transaction(changesets) do + {:ok, users} -> + res = + users + |> Map.values() + |> Enum.map(fn user -> + {:ok, user} = User.post_register_action(user) + user + end) + |> Enum.map(&AccountView.render("created.json", %{user: &1})) + + conn + |> json(res) + + {:error, id, changeset, _} -> + res = + Enum.map(changesets.operations, fn + {current_id, {:changeset, _current_changeset, _}} when current_id == id -> + AccountView.render("create-error.json", %{changeset: changeset}) + + {_, {:changeset, current_changeset, _}} -> + AccountView.render("create-error.json", %{changeset: current_changeset}) + end) + + conn + |> put_status(:conflict) + |> json(res) + end end def user_show(conn, %{"nickname" => nickname}) do diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index e1825c5f1..cccdeff7e 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -48,7 +48,7 @@ def render("invites.json", %{invites: invites}) do def render("created.json", %{user: user}) do %{ type: "success", - code: 201, + code: 200, data: %{ nickname: user.nickname, email: user.email diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index a0c9fd56f..019905137 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -36,18 +36,31 @@ test "Create" do "nickname" => "lain", "email" => "lain@example.org", "password" => "test" + }, + %{ + "nickname" => "lain2", + "email" => "lain2@example.org", + "password" => "test" } ] }) assert json_response(conn, 200) == [ %{ - "code" => 201, + "code" => 200, "data" => %{ "email" => "lain@example.org", "nickname" => "lain" }, "type" => "success" + }, + %{ + "code" => 200, + "data" => %{ + "email" => "lain2@example.org", + "nickname" => "lain2" + }, + "type" => "success" } ] end @@ -70,7 +83,7 @@ test "Cannot create user with exisiting email" do ] }) - assert json_response(conn, 200) == [ + assert json_response(conn, 409) == [ %{ "code" => 409, "data" => %{ @@ -101,7 +114,7 @@ test "Cannot create user with exisiting nickname" do ] }) - assert json_response(conn, 200) == [ + assert json_response(conn, 409) == [ %{ "code" => 409, "data" => %{ @@ -113,6 +126,53 @@ test "Cannot create user with exisiting nickname" do } ] end + + test "Multiple user creation works in transaction" do + admin = insert(:user, info: %{is_admin: true}) + user = insert(:user) + + conn = + build_conn() + |> assign(:user, admin) + |> put_req_header("accept", "application/json") + |> post("/api/pleroma/admin/users", %{ + "users" => [ + %{ + "nickname" => "newuser", + "email" => "newuser@pleroma.social", + "password" => "test" + }, + %{ + "nickname" => "lain", + "email" => user.email, + "password" => "test" + } + ] + }) + + assert json_response(conn, 409) == [ + %{ + "code" => 409, + "data" => %{ + "email" => user.email, + "nickname" => "lain" + }, + "error" => "email has already been taken", + "type" => "error" + }, + %{ + "code" => 409, + "data" => %{ + "email" => "newuser@pleroma.social", + "nickname" => "newuser" + }, + "error" => "", + "type" => "error" + } + ] + + assert User.get_by_nickname("newuser") === nil + end end describe "/api/pleroma/admin/users/:nickname" do From e394fc2eefdd7a4c7edd5fb3c04b445215d4a86c Mon Sep 17 00:00:00 2001 From: Sachin Joshi Date: Sun, 2 Jun 2019 09:48:45 +0545 Subject: [PATCH 003/400] fix the flaky test for users creation by admin --- .../admin_api/admin_api_controller_test.exs | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 9721a4034..86b160246 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -47,24 +47,8 @@ test "Create" do ] }) - assert json_response(conn, 200) == [ - %{ - "code" => 200, - "data" => %{ - "email" => "lain@example.org", - "nickname" => "lain" - }, - "type" => "success" - }, - %{ - "code" => 200, - "data" => %{ - "email" => "lain2@example.org", - "nickname" => "lain2" - }, - "type" => "success" - } - ] + response = json_response(conn, 200) |> Enum.map(&Map.get(&1, "type")) + assert response == ["success", "success"] end test "Cannot create user with exisiting email" do From 8ba7a151adf77c5cc47d6e1364a6078cc4bdef98 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Mon, 22 Jul 2019 16:45:54 +0200 Subject: [PATCH 004/400] Cleanup: fix a comment --- test/web/mastodon_api/mastodon_api_controller_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index ce2e44499..b5279412f 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -405,7 +405,7 @@ test "direct timeline", %{conn: conn} do assert %{"visibility" => "direct"} = status assert status["url"] != direct.data["id"] - # User should be able to see his own direct message + # User should be able to see their own direct message res_conn = build_conn() |> assign(:user, user_one) From b72940277470c67802b979e4cab44f277e8fffb3 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Mon, 22 Jul 2019 09:10:30 +0200 Subject: [PATCH 005/400] Make test.exs read config in the same way as dev.exs This way, if your test.secret.exs has an error, you'll actually see it. --- config/test.exs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config/test.exs b/config/test.exs index 92dca18bc..3f606aa81 100644 --- a/config/test.exs +++ b/config/test.exs @@ -82,11 +82,10 @@ config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock -try do +if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" -rescue - _ -> - IO.puts( - "You may want to create test.secret.exs to declare custom database connection parameters." - ) +else + IO.puts( + "You may want to create test.secret.exs to declare custom database connection parameters." + ) end From 666514194a325e2463c05bae516b89d7c5f59316 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Mon, 22 Jul 2019 14:16:20 +0200 Subject: [PATCH 006/400] Add activity expirations table Add a table to store activity expirations. An activity can have zero or one expirations. The expiration has a scheduled_at field which stores the time at which the activity should expire and be deleted. --- lib/pleroma/activity.ex | 3 ++ lib/pleroma/activity_expiration.ex | 31 +++++++++++++++++++ .../20190716100804_add_expirations_table.exs | 10 ++++++ test/activity_expiration_test.exs | 21 +++++++++++++ test/activity_test.exs | 9 ++++++ test/support/factory.ex | 19 +++++++++++- 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 lib/pleroma/activity_expiration.ex create mode 100644 priv/repo/migrations/20190716100804_add_expirations_table.exs create mode 100644 test/activity_expiration_test.exs diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 46552c7be..be4850560 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Activity do use Ecto.Schema alias Pleroma.Activity + alias Pleroma.ActivityExpiration alias Pleroma.Bookmark alias Pleroma.Notification alias Pleroma.Object @@ -59,6 +60,8 @@ defmodule Pleroma.Activity do # typical case. has_one(:object, Object, on_delete: :nothing, foreign_key: :id) + has_one(:expiration, ActivityExpiration, on_delete: :delete_all) + timestamps() end diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex new file mode 100644 index 000000000..d3d95f9e9 --- /dev/null +++ b/lib/pleroma/activity_expiration.ex @@ -0,0 +1,31 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ActivityExpiration do + use Ecto.Schema + + alias Pleroma.Activity + alias Pleroma.ActivityExpiration + alias Pleroma.FlakeId + alias Pleroma.Repo + + import Ecto.Query + + @type t :: %__MODULE__{} + + schema "activity_expirations" do + belongs_to(:activity, Activity, type: FlakeId) + field(:scheduled_at, :naive_datetime) + end + + def due_expirations(offset \\ 0) do + naive_datetime = + NaiveDateTime.utc_now() + |> NaiveDateTime.add(offset, :millisecond) + + ActivityExpiration + |> where([exp], exp.scheduled_at < ^naive_datetime) + |> Repo.all() + end +end diff --git a/priv/repo/migrations/20190716100804_add_expirations_table.exs b/priv/repo/migrations/20190716100804_add_expirations_table.exs new file mode 100644 index 000000000..fbde8f9d6 --- /dev/null +++ b/priv/repo/migrations/20190716100804_add_expirations_table.exs @@ -0,0 +1,10 @@ +defmodule Pleroma.Repo.Migrations.AddExpirationsTable do + use Ecto.Migration + + def change do + create_if_not_exists table(:activity_expirations) do + add(:activity_id, references(:activities, type: :uuid, on_delete: :delete_all)) + add(:scheduled_at, :naive_datetime, null: false) + end + end +end diff --git a/test/activity_expiration_test.exs b/test/activity_expiration_test.exs new file mode 100644 index 000000000..20566a186 --- /dev/null +++ b/test/activity_expiration_test.exs @@ -0,0 +1,21 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ActivityExpirationTest do + use Pleroma.DataCase + alias Pleroma.ActivityExpiration + import Pleroma.Factory + + test "finds activities due to be deleted only" do + activity = insert(:note_activity) + expiration_due = insert(:expiration_in_the_past, %{activity_id: activity.id}) + activity2 = insert(:note_activity) + insert(:expiration_in_the_future, %{activity_id: activity2.id}) + + expirations = ActivityExpiration.due_expirations() + + assert length(expirations) == 1 + assert hd(expirations) == expiration_due + end +end diff --git a/test/activity_test.exs b/test/activity_test.exs index b27f6fd36..785c4b3cf 100644 --- a/test/activity_test.exs +++ b/test/activity_test.exs @@ -164,4 +164,13 @@ test "find all statuses for unauthenticated users when `limit_to_local_content` Pleroma.Config.put([:instance, :limit_to_local_content], :unauthenticated) end end + + test "add an activity with an expiration" do + activity = insert(:note_activity) + insert(:expiration_in_the_future, %{activity_id: activity.id}) + + Pleroma.ActivityExpiration + |> where([a], a.activity_id == ^activity.id) + |> Repo.one!() + end end diff --git a/test/support/factory.ex b/test/support/factory.ex index c751546ce..7b52b1328 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors +# Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Factory do @@ -142,6 +142,23 @@ def note_activity_factory(attrs \\ %{}) do |> Map.merge(attrs) end + defp expiration_offset_by_minutes(attrs, minutes) do + %Pleroma.ActivityExpiration{} + |> Map.merge(attrs) + |> Map.put( + :scheduled_at, + NaiveDateTime.add(NaiveDateTime.utc_now(), :timer.minutes(minutes), :millisecond) + ) + end + + def expiration_in_the_past_factory(attrs \\ %{}) do + expiration_offset_by_minutes(attrs, -60) + end + + def expiration_in_the_future_factory(attrs \\ %{}) do + expiration_offset_by_minutes(attrs, 60) + end + def article_activity_factory do article = insert(:article) From 378f5f0fbe21c2533719fed9afe8313586fda5d5 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Mon, 22 Jul 2019 14:18:58 +0200 Subject: [PATCH 007/400] Add activity expiration worker This is a worker that runs every minute and deletes expired activities. It's based heavily on the scheduled activities worker. --- config/config.exs | 3 ++ docs/config.md | 4 ++ lib/pleroma/activity_expiration_worker.ex | 62 +++++++++++++++++++++++ lib/pleroma/application.ex | 4 ++ test/activity_expiration_worker_test.exs | 17 +++++++ 5 files changed, 90 insertions(+) create mode 100644 lib/pleroma/activity_expiration_worker.ex create mode 100644 test/activity_expiration_worker_test.exs diff --git a/config/config.exs b/config/config.exs index 569411866..2887353fb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -447,6 +447,7 @@ max_retries: 5 config :pleroma_job_queue, :queues, + activity_expiration: 10, federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -536,6 +537,8 @@ status_id_action: {60_000, 3}, password_reset: {1_800_000, 5} +config :pleroma, Pleroma.ActivityExpiration, enabled: true + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/docs/config.md b/docs/config.md index 02f86dc16..a20ed704f 100644 --- a/docs/config.md +++ b/docs/config.md @@ -484,6 +484,10 @@ config :auto_linker, * `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`) * `enabled`: whether scheduled activities are sent to the job queue to be executed +## Pleroma.ActivityExpiration + +# `enabled`: whether expired activities will be sent to the job queue to be deleted + ## Pleroma.Web.Auth.Authenticator * `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex new file mode 100644 index 000000000..a341f58df --- /dev/null +++ b/lib/pleroma/activity_expiration_worker.ex @@ -0,0 +1,62 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ActivityExpirationWorker do + alias Pleroma.Activity + alias Pleroma.ActivityExpiration + alias Pleroma.Config + alias Pleroma.Repo + alias Pleroma.User + alias Pleroma.Web.CommonAPI + require Logger + use GenServer + import Ecto.Query + + @schedule_interval :timer.minutes(1) + + def start_link do + GenServer.start_link(__MODULE__, nil) + end + + @impl true + def init(_) do + if Config.get([ActivityExpiration, :enabled]) do + schedule_next() + {:ok, nil} + else + :ignore + end + end + + def perform(:execute, expiration_id) do + try do + expiration = + ActivityExpiration + |> where([e], e.id == ^expiration_id) + |> Repo.one!() + + activity = Activity.get_by_id_with_object(expiration.activity_id) + user = User.get_by_ap_id(activity.object.data["actor"]) + CommonAPI.delete(activity.id, user) + rescue + error -> + Logger.error("#{__MODULE__} Couldn't delete expired activity: #{inspect(error)}") + end + end + + @impl true + def handle_info(:perform, state) do + ActivityExpiration.due_expirations(@schedule_interval) + |> Enum.each(fn expiration -> + PleromaJobQueue.enqueue(:activity_expiration, __MODULE__, [:execute, expiration.id]) + end) + + schedule_next() + {:noreply, state} + end + + defp schedule_next do + Process.send_after(self(), :perform, @schedule_interval) + end +end diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 035331491..42e4a1dfa 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -115,6 +115,10 @@ def start(_type, _args) do %{ id: Pleroma.ScheduledActivityWorker, start: {Pleroma.ScheduledActivityWorker, :start_link, []} + }, + %{ + id: Pleroma.ActivityExpirationWorker, + start: {Pleroma.ActivityExpirationWorker, :start_link, []} } ] ++ hackney_pool_children() ++ diff --git a/test/activity_expiration_worker_test.exs b/test/activity_expiration_worker_test.exs new file mode 100644 index 000000000..939d912f1 --- /dev/null +++ b/test/activity_expiration_worker_test.exs @@ -0,0 +1,17 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ActivityExpirationWorkerTest do + use Pleroma.DataCase + alias Pleroma.Activity + import Pleroma.Factory + + test "deletes an activity" do + activity = insert(:note_activity) + expiration = insert(:expiration_in_the_past, %{activity_id: activity.id}) + Pleroma.ActivityExpirationWorker.perform(:execute, expiration.id) + + refute Repo.get(Activity, activity.id) + end +end From 704960b3c135d2e050308c68f5ccf5d7b7df40f8 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Mon, 22 Jul 2019 16:46:20 +0200 Subject: [PATCH 008/400] Add support for activity expiration to common and Masto API The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not. --- docs/api/differences_in_mastoapi_responses.md | 1 + lib/pleroma/activity_expiration.ex | 19 ++++++++++++ lib/pleroma/web/common_api/common_api.ex | 29 +++++++++++++------ test/support/factory.ex | 10 ++++--- test/web/common_api/common_api_test.exs | 17 +++++++++++ .../mastodon_api_controller_test.exs | 19 ++++++++++++ 6 files changed, 82 insertions(+), 13 deletions(-) diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 1907d70c8..7d5be4713 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -79,6 +79,7 @@ Additional parameters can be added to the JSON body/Form data: - `content_type`: string, contain the MIME type of the status, it is transformed into HTML by the backend. You can get the list of the supported MIME types with the nodeinfo endpoint. - `to`: A list of nicknames (like `lain@soykaf.club` or `lain` on the local server) that will be used to determine who is going to be addressed by this post. Using this will disable the implicit addressing by mentioned names in the `status` body, only the people in the `to` list will be addressed. The normal rules for for post visibility are not affected by this and will still apply. - `visibility`: string, besides standard MastoAPI values (`direct`, `private`, `unlisted` or `public`) it can be used to address a List by setting it to `list:LIST_ID`. +- `expires_on`: datetime (iso8601), sets when the posted activity should expire. When a posted activity expires it will be deleted from the server, and a delete request for it will be federated. ## PATCH `/api/v1/update_credentials` diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex index d3d95f9e9..a0af5255b 100644 --- a/lib/pleroma/activity_expiration.ex +++ b/lib/pleroma/activity_expiration.ex @@ -10,6 +10,7 @@ defmodule Pleroma.ActivityExpiration do alias Pleroma.FlakeId alias Pleroma.Repo + import Ecto.Changeset import Ecto.Query @type t :: %__MODULE__{} @@ -19,6 +20,24 @@ defmodule Pleroma.ActivityExpiration do field(:scheduled_at, :naive_datetime) end + def changeset(%ActivityExpiration{} = expiration, attrs) do + expiration + |> cast(attrs, [:scheduled_at]) + |> validate_required([:scheduled_at]) + end + + def get_by_activity_id(activity_id) do + ActivityExpiration + |> where([exp], exp.activity_id == ^activity_id) + |> Repo.one() + end + + def create(%Activity{} = activity, scheduled_at) do + %ActivityExpiration{activity_id: activity.id} + |> changeset(%{scheduled_at: scheduled_at}) + |> Repo.insert() + end + def due_expirations(offset \\ 0) do naive_datetime = NaiveDateTime.utc_now() diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 44af6a773..0f287af4e 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -4,6 +4,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.Activity + alias Pleroma.ActivityExpiration alias Pleroma.Formatter alias Pleroma.Object alias Pleroma.ThreadMute @@ -218,6 +219,7 @@ def post(user, %{"status" => status} = data) do context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), + {:ok, expires_at} <- Ecto.Type.cast(:naive_datetime, data["expires_at"]), full_payload <- String.trim(status <> cw), :ok <- validate_character_limit(full_payload, attachments, limit), object <- @@ -243,15 +245,24 @@ def post(user, %{"status" => status} = data) do preview? = Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false direct? = visibility == "direct" - %{ - to: to, - actor: user, - context: context, - object: object, - additional: %{"cc" => cc, "directMessage" => direct?} - } - |> maybe_add_list_data(user, visibility) - |> ActivityPub.create(preview?) + result = + %{ + to: to, + actor: user, + context: context, + object: object, + additional: %{"cc" => cc, "directMessage" => direct?} + } + |> maybe_add_list_data(user, visibility) + |> ActivityPub.create(preview?) + + if expires_at do + with {:ok, activity} <- result do + ActivityExpiration.create(activity, expires_at) + end + end + + result else {:private_to_public, true} -> {:error, dgettext("errors", "The message visibility must be direct")} diff --git a/test/support/factory.ex b/test/support/factory.ex index 7b52b1328..63fe3a66d 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -143,12 +143,14 @@ def note_activity_factory(attrs \\ %{}) do end defp expiration_offset_by_minutes(attrs, minutes) do + scheduled_at = + NaiveDateTime.utc_now() + |> NaiveDateTime.add(:timer.minutes(minutes), :millisecond) + |> NaiveDateTime.truncate(:second) + %Pleroma.ActivityExpiration{} |> Map.merge(attrs) - |> Map.put( - :scheduled_at, - NaiveDateTime.add(NaiveDateTime.utc_now(), :timer.minutes(minutes), :millisecond) - ) + |> Map.put(:scheduled_at, scheduled_at) end def expiration_in_the_past_factory(attrs \\ %{}) do diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 16b3f121d..210314a4a 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -160,6 +160,23 @@ test "it returns error when character limit is exceeded" do Pleroma.Config.put([:instance, :limit], limit) end + + test "it can handle activities that expire" do + user = insert(:user) + + expires_at = + NaiveDateTime.utc_now() + |> NaiveDateTime.truncate(:second) + |> NaiveDateTime.add(1_000_000, :second) + + expires_at_iso8601 = expires_at |> NaiveDateTime.to_iso8601() + + assert {:ok, activity} = + CommonAPI.post(user, %{"status" => "chai", "expires_at" => expires_at_iso8601}) + + assert expiration = Pleroma.ActivityExpiration.get_by_activity_id(activity.id) + assert expiration.scheduled_at == expires_at + end end describe "reactions" do diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index b5279412f..24482a4a2 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -7,6 +7,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do alias Ecto.Changeset alias Pleroma.Activity + alias Pleroma.ActivityExpiration alias Pleroma.Notification alias Pleroma.Object alias Pleroma.Repo @@ -151,6 +152,24 @@ test "posting a status", %{conn: conn} do assert %{"id" => third_id} = json_response(conn_three, 200) refute id == third_id + + # An activity that will expire: + expires_at = + NaiveDateTime.utc_now() + |> NaiveDateTime.add(:timer.minutes(120), :millisecond) + |> NaiveDateTime.truncate(:second) + + conn_four = + conn + |> post("api/v1/statuses", %{ + "status" => "oolong", + "expires_at" => expires_at + }) + + assert %{"id" => fourth_id} = json_response(conn_four, 200) + assert activity = Activity.get_by_id(fourth_id) + assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) + assert expiration.scheduled_at == expires_at end test "replying to a status", %{conn: conn} do From 36012ef6c1dfea2489e61063e14783fa3fb52700 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Tue, 23 Jul 2019 16:33:45 +0200 Subject: [PATCH 009/400] Require that ephemeral posts live for at least one hour If we didn't put some kind of lifetime requirement on these, I guess you could annoy people by sending large numbers of ephemeral posts that provoke notifications but then disappear before anyone can read them. --- lib/pleroma/activity_expiration.ex | 18 ++++++++++++++++++ lib/pleroma/web/common_api/common_api.ex | 14 ++++++++++++-- test/activity_expiration_test.exs | 6 ++++++ test/support/factory.ex | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex index a0af5255b..bf57abca4 100644 --- a/lib/pleroma/activity_expiration.ex +++ b/lib/pleroma/activity_expiration.ex @@ -14,6 +14,7 @@ defmodule Pleroma.ActivityExpiration do import Ecto.Query @type t :: %__MODULE__{} + @min_activity_lifetime :timer.hours(1) schema "activity_expirations" do belongs_to(:activity, Activity, type: FlakeId) @@ -24,6 +25,7 @@ def changeset(%ActivityExpiration{} = expiration, attrs) do expiration |> cast(attrs, [:scheduled_at]) |> validate_required([:scheduled_at]) + |> validate_scheduled_at() end def get_by_activity_id(activity_id) do @@ -47,4 +49,20 @@ def due_expirations(offset \\ 0) do |> where([exp], exp.scheduled_at < ^naive_datetime) |> Repo.all() end + + def validate_scheduled_at(changeset) do + validate_change(changeset, :scheduled_at, fn _, scheduled_at -> + if not expires_late_enough?(scheduled_at) do + [scheduled_at: "an ephemeral activity must live for at least one hour"] + else + [] + end + end) + end + + def expires_late_enough?(scheduled_at) do + now = NaiveDateTime.utc_now() + diff = NaiveDateTime.diff(scheduled_at, now, :millisecond) + diff >= @min_activity_lifetime + end end diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 0f287af4e..261d60392 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -196,6 +196,16 @@ def get_replied_to_visibility(activity) do end end + defp check_expiry_date(expiry_str) do + {:ok, expiry} = Ecto.Type.cast(:naive_datetime, expiry_str) + + if is_nil(expiry) || ActivityExpiration.expires_late_enough?(expiry) do + {:ok, expiry} + else + {:error, "Expiry date is too soon"} + end + end + def post(user, %{"status" => status} = data) do limit = Pleroma.Config.get([:instance, :limit]) @@ -219,7 +229,7 @@ def post(user, %{"status" => status} = data) do context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), - {:ok, expires_at} <- Ecto.Type.cast(:naive_datetime, data["expires_at"]), + {:ok, expires_at} <- check_expiry_date(data["expires_at"]), full_payload <- String.trim(status <> cw), :ok <- validate_character_limit(full_payload, attachments, limit), object <- @@ -258,7 +268,7 @@ def post(user, %{"status" => status} = data) do if expires_at do with {:ok, activity} <- result do - ActivityExpiration.create(activity, expires_at) + {:ok, _} = ActivityExpiration.create(activity, expires_at) end end diff --git a/test/activity_expiration_test.exs b/test/activity_expiration_test.exs index 20566a186..4948fae16 100644 --- a/test/activity_expiration_test.exs +++ b/test/activity_expiration_test.exs @@ -18,4 +18,10 @@ test "finds activities due to be deleted only" do assert length(expirations) == 1 assert hd(expirations) == expiration_due end + + test "denies expirations that don't live long enough" do + activity = insert(:note_activity) + now = NaiveDateTime.utc_now() + assert {:error, _} = ActivityExpiration.create(activity, now) + end end diff --git a/test/support/factory.ex b/test/support/factory.ex index 63fe3a66d..7a2ddcada 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -158,7 +158,7 @@ def expiration_in_the_past_factory(attrs \\ %{}) do end def expiration_in_the_future_factory(attrs \\ %{}) do - expiration_offset_by_minutes(attrs, 60) + expiration_offset_by_minutes(attrs, 61) end def article_activity_factory do From 3cb471ec0688b81c8ef37dd27f2b82e6c858431f Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 12:43:20 +0200 Subject: [PATCH 010/400] Expose expires_at datetime in mastoAPI only for the activity actor In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so. --- docs/api/differences_in_mastoapi_responses.md | 1 + lib/pleroma/web/mastodon_api/views/status_view.ex | 13 ++++++++++++- .../mastodon_api/mastodon_api_controller_test.exs | 3 ++- test/web/mastodon_api/status_view_test.exs | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 7d5be4713..168a13f4e 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -25,6 +25,7 @@ Has these additional fields under the `pleroma` object: - `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any) - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` +- `expires_on`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire ## Attachments diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index de9425959..7264dcafb 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do use Pleroma.Web, :view alias Pleroma.Activity + alias Pleroma.ActivityExpiration alias Pleroma.HTML alias Pleroma.Object alias Pleroma.Repo @@ -165,6 +166,15 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity bookmarked = Activity.get_bookmark(activity, opts[:for]) != nil + client_posted_this_activity = opts[:for] && user.id == opts[:for].id + + expires_at = + with true <- client_posted_this_activity, + expiration when not is_nil(expiration) <- + ActivityExpiration.get_by_activity_id(activity.id) do + expiration.scheduled_at + end + thread_muted? = case activity.thread_muted? do thread_muted? when is_boolean(thread_muted?) -> thread_muted? @@ -262,7 +272,8 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity conversation_id: get_context_id(activity), in_reply_to_account_acct: reply_to_user && reply_to_user.nickname, content: %{"text/plain" => content_plaintext}, - spoiler_text: %{"text/plain" => summary_plaintext} + spoiler_text: %{"text/plain" => summary_plaintext}, + expires_at: expires_at } } end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 24482a4a2..e59908979 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -166,10 +166,11 @@ test "posting a status", %{conn: conn} do "expires_at" => expires_at }) - assert %{"id" => fourth_id} = json_response(conn_four, 200) + assert fourth_response = %{"id" => fourth_id} = json_response(conn_four, 200) assert activity = Activity.get_by_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) assert expiration.scheduled_at == expires_at + assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at) end test "replying to a status", %{conn: conn} do diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 3447c5b1f..073c69659 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -133,7 +133,8 @@ test "a note activity" do conversation_id: convo_id, in_reply_to_account_acct: nil, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, - spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])} + spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, + expires_at: nil } } From 91d9fdc7decc664483625c11e44d4e053dd9c585 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 13:02:28 +0200 Subject: [PATCH 011/400] Update changelog to document expiring posts feature --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a5a6c21..75d236af5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Added +- Expiring/ephemeral activites. All activities can have expires_on value set, which controls when they should be deleted automatically. +- Mastodon API: in post_status, expires_at datetime parameter lets you set when an activity should expire +- Mastodon API: all status JSON responses contain a `pleroma.expires_in` item which states the number of minutes until an activity expires. The value is only shown to the user who created the activity. To everyone else it's empty. +- Configuration: `ActivityExpiration.enabled` controls whether expired activites will get deleted at the appropriate time. Enabled by default. + ### Changed - **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config - Configuration: OpenGraph and TwitterCard providers enabled by default From 2981821db834448bf9b2ba26590314e36201664c Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 16:51:09 +0200 Subject: [PATCH 012/400] squash! Expose expires_at datetime in mastoAPI only for the activity actor NOTE: rewrite the commit msg --- docs/api/differences_in_mastoapi_responses.md | 2 +- lib/pleroma/web/mastodon_api/views/status_view.ex | 10 +++++++--- test/web/mastodon_api/mastodon_api_controller_test.exs | 2 +- test/web/mastodon_api/status_view_test.exs | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 168a13f4e..829468b13 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -25,7 +25,7 @@ Has these additional fields under the `pleroma` object: - `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any) - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` -- `expires_on`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire +- `expires_in`: the number of minutes until a post will expire (be deleted automatically), or empty if the post won't expire ## Attachments diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 7264dcafb..4a3686d72 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -168,11 +168,15 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity client_posted_this_activity = opts[:for] && user.id == opts[:for].id - expires_at = + expires_in = with true <- client_posted_this_activity, expiration when not is_nil(expiration) <- ActivityExpiration.get_by_activity_id(activity.id) do - expiration.scheduled_at + expires_in_seconds = + expiration.scheduled_at + |> NaiveDateTime.diff(NaiveDateTime.utc_now(), :second) + + round(expires_in_seconds / 60) end thread_muted? = @@ -273,7 +277,7 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity in_reply_to_account_acct: reply_to_user && reply_to_user.nickname, content: %{"text/plain" => content_plaintext}, spoiler_text: %{"text/plain" => summary_plaintext}, - expires_at: expires_at + expires_in: expires_in } } end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index e59908979..a9d38c06e 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -170,7 +170,7 @@ test "posting a status", %{conn: conn} do assert activity = Activity.get_by_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) assert expiration.scheduled_at == expires_at - assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at) + assert fourth_response["pleroma"]["expires_in"] > 0 end test "replying to a status", %{conn: conn} do diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 073c69659..eb0874ab2 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -134,7 +134,7 @@ test "a note activity" do in_reply_to_account_acct: nil, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, - expires_at: nil + expires_in: nil } } From 877575d0da830724e822eac2de243391aaea7ec8 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 17:07:51 +0200 Subject: [PATCH 013/400] fixup! Update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75d236af5..f64506637 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added - Expiring/ephemeral activites. All activities can have expires_on value set, which controls when they should be deleted automatically. -- Mastodon API: in post_status, expires_at datetime parameter lets you set when an activity should expire -- Mastodon API: all status JSON responses contain a `pleroma.expires_in` item which states the number of minutes until an activity expires. The value is only shown to the user who created the activity. To everyone else it's empty. +- Mastodon API: in post_status, the expires_in parameter lets you set the number of minutes until an activity expires. It must be at least one hour. +- Mastodon API: all status JSON responses contain a `pleroma.expires_on` item which states when an activity will expire. The value is only shown to the user who created the activity. To everyone else it's empty. - Configuration: `ActivityExpiration.enabled` controls whether expired activites will get deleted at the appropriate time. Enabled by default. ### Changed From 2c83eb0b157b2f574f55341e9171f0b5ab7bd3b2 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 17:09:59 +0200 Subject: [PATCH 014/400] Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" This reverts commit 2981821db834448bf9b2ba26590314e36201664c. --- docs/api/differences_in_mastoapi_responses.md | 2 +- lib/pleroma/web/mastodon_api/views/status_view.ex | 10 +++------- test/web/mastodon_api/mastodon_api_controller_test.exs | 2 +- test/web/mastodon_api/status_view_test.exs | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 829468b13..168a13f4e 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -25,7 +25,7 @@ Has these additional fields under the `pleroma` object: - `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any) - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` -- `expires_in`: the number of minutes until a post will expire (be deleted automatically), or empty if the post won't expire +- `expires_on`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire ## Attachments diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 4a3686d72..7264dcafb 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -168,15 +168,11 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity client_posted_this_activity = opts[:for] && user.id == opts[:for].id - expires_in = + expires_at = with true <- client_posted_this_activity, expiration when not is_nil(expiration) <- ActivityExpiration.get_by_activity_id(activity.id) do - expires_in_seconds = - expiration.scheduled_at - |> NaiveDateTime.diff(NaiveDateTime.utc_now(), :second) - - round(expires_in_seconds / 60) + expiration.scheduled_at end thread_muted? = @@ -277,7 +273,7 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity in_reply_to_account_acct: reply_to_user && reply_to_user.nickname, content: %{"text/plain" => content_plaintext}, spoiler_text: %{"text/plain" => summary_plaintext}, - expires_in: expires_in + expires_at: expires_at } } end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index a9d38c06e..e59908979 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -170,7 +170,7 @@ test "posting a status", %{conn: conn} do assert activity = Activity.get_by_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) assert expiration.scheduled_at == expires_at - assert fourth_response["pleroma"]["expires_in"] > 0 + assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at) end test "replying to a status", %{conn: conn} do diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index eb0874ab2..073c69659 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -134,7 +134,7 @@ test "a note activity" do in_reply_to_account_acct: nil, content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, - expires_in: nil + expires_at: nil } } From 0e2b5a3e6aed7947909c2a1ff1618403546f1572 Mon Sep 17 00:00:00 2001 From: Mike Verdone Date: Wed, 24 Jul 2019 17:25:11 +0200 Subject: [PATCH 015/400] WIP --- .../mastodon_api_controller_test.exs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index e59908979..fbe0ab375 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -154,23 +154,27 @@ test "posting a status", %{conn: conn} do refute id == third_id # An activity that will expire: - expires_at = - NaiveDateTime.utc_now() - |> NaiveDateTime.add(:timer.minutes(120), :millisecond) - |> NaiveDateTime.truncate(:second) + expires_in = 120 conn_four = conn |> post("api/v1/statuses", %{ "status" => "oolong", - "expires_at" => expires_at + "expires_in" => expires_in }) assert fourth_response = %{"id" => fourth_id} = json_response(conn_four, 200) assert activity = Activity.get_by_id(fourth_id) assert expiration = ActivityExpiration.get_by_activity_id(fourth_id) - assert expiration.scheduled_at == expires_at - assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expires_at) + + estimated_expires_at = + NaiveDateTime.utc_now() + |> NaiveDateTime.add(:timer.minutes(expires_in), :millisecond) + |> NaiveDateTime.truncate(:second) + + # This assert will fail if the test takes longer than a minute. I sure hope it never does: + assert abs(NaiveDateTime.diff(expiration.scheduled_at, estimated_expires_at, :second)) < 60 + assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expiration.scheduled_at) end test "replying to a status", %{conn: conn} do From 23d279e03ee1f7a1285614754738711359bc4b81 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Thu, 1 Aug 2019 17:28:00 +0300 Subject: [PATCH 016/400] [#1149] Replaced RetryQueue with oban-based retries. --- config/config.exs | 17 +- config/test.exs | 4 + docs/config.md | 7 - lib/pleroma/application.ex | 4 +- lib/pleroma/web/activity_pub/publisher.ex | 16 +- lib/pleroma/web/federator/federator.ex | 14 - lib/pleroma/web/federator/publisher.ex | 22 +- lib/pleroma/web/federator/retry_queue.ex | 239 ------------------ lib/pleroma/web/salmon/salmon.ex | 11 +- lib/pleroma/workers/publisher.ex | 14 + mix.exs | 1 + mix.lock | 1 + .../20190730055101_add_oban_jobs_table.exs | 6 + test/user_test.exs | 15 +- test/web/activity_pub/publisher_test.exs | 2 +- test/web/federator_test.exs | 78 +++--- test/web/retry_queue_test.exs | 48 ---- test/web/salmon/salmon_test.exs | 2 +- 18 files changed, 106 insertions(+), 395 deletions(-) delete mode 100644 lib/pleroma/web/federator/retry_queue.ex create mode 100644 lib/pleroma/workers/publisher.ex create mode 100644 priv/repo/migrations/20190730055101_add_oban_jobs_table.exs delete mode 100644 test/web/retry_queue_test.exs diff --git a/config/config.exs b/config/config.exs index 17770640a..1bb325bf5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -440,13 +440,7 @@ "web" ] -config :pleroma, Pleroma.Web.Federator.RetryQueue, - enabled: false, - max_jobs: 20, - initial_timeout: 30, - max_retries: 5 - -config :pleroma_job_queue, :queues, +job_queues = [ federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -454,6 +448,15 @@ transmogrifier: 20, scheduled_activities: 10, background: 5 +] + +config :pleroma_job_queue, :queues, job_queues + +config :pleroma, Oban, + repo: Pleroma.Repo, + verbose: false, + prune: {:maxage, 60 * 60 * 24 * 7}, + queues: job_queues config :pleroma, :fetch_initial_posts, enabled: false, diff --git a/config/test.exs b/config/test.exs index 92dca18bc..23d9bf779 100644 --- a/config/test.exs +++ b/config/test.exs @@ -62,6 +62,10 @@ config :pleroma_job_queue, disabled: true +config :pleroma, Oban, + queues: false, + prune: :disabled + config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, total_user_limit: 3, diff --git a/docs/config.md b/docs/config.md index 02f86dc16..5c18ffdbf 100644 --- a/docs/config.md +++ b/docs/config.md @@ -412,13 +412,6 @@ config :pleroma_job_queue, :queues, This config contains two queues: `federator_incoming` and `federator_outgoing`. Both have the `max_jobs` set to `50`. -## Pleroma.Web.Federator.RetryQueue - -* `enabled`: If set to `true`, failed federation jobs will be retried -* `max_jobs`: The maximum amount of parallel federation jobs running at the same time. -* `initial_timeout`: The initial timeout in seconds -* `max_retries`: The maximum number of times a federation job is retried - ## Pleroma.Web.Metadata * `providers`: a list of metadata providers to enable. Providers available: * Pleroma.Web.Metadata.Providers.OpenGraph diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 035331491..ce7d8c4b2 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -120,8 +120,8 @@ def start(_type, _args) do hackney_pool_children() ++ [ %{ - id: Pleroma.Web.Federator.RetryQueue, - start: {Pleroma.Web.Federator.RetryQueue, :start_link, []} + id: Oban, + start: {Oban, :start_link, [Application.get_env(:pleroma, Oban)]} }, %{ id: Pleroma.Web.OAuth.Token.CleanWorker, diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex index 46edab0bd..29f3221d1 100644 --- a/lib/pleroma/web/activity_pub/publisher.ex +++ b/lib/pleroma/web/activity_pub/publisher.ex @@ -85,6 +85,15 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa end end + def publish_one(%{actor_id: actor_id} = params) do + actor = User.get_by_id(actor_id) + + params + |> Map.delete(:actor_id) + |> Map.put(:actor, actor) + |> publish_one() + end + defp should_federate?(inbox, public) do if public do true @@ -160,7 +169,8 @@ def determine_inbox( Publishes an activity with BCC to all relevant peers. """ - def publish(actor, %{data: %{"bcc" => bcc}} = activity) when is_list(bcc) and bcc != [] do + def publish(%User{} = actor, %{data: %{"bcc" => bcc}} = activity) + when is_list(bcc) and bcc != [] do public = is_public?(activity) {:ok, data} = Transmogrifier.prepare_outgoing(activity.data) @@ -187,7 +197,7 @@ def publish(actor, %{data: %{"bcc" => bcc}} = activity) when is_list(bcc) and bc Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{ inbox: inbox, json: json, - actor: actor, + actor_id: actor.id, id: activity.data["id"], unreachable_since: unreachable_since }) @@ -222,7 +232,7 @@ def publish(%User{} = actor, %Activity{} = activity) do %{ inbox: inbox, json: json, - actor: actor, + actor_id: actor.id, id: activity.data["id"], unreachable_since: unreachable_since } diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index f4f9e83e0..97ec9d549 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -10,7 +10,6 @@ defmodule Pleroma.Web.Federator do alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.Federator.Publisher - alias Pleroma.Web.Federator.RetryQueue alias Pleroma.Web.OStatus alias Pleroma.Web.Websub @@ -130,19 +129,6 @@ def perform(:incoming_ap_doc, params) do end end - def perform( - :publish_single_websub, - %{xml: _xml, topic: _topic, callback: _callback, secret: _secret} = params - ) do - case Websub.publish_one(params) do - {:ok, _} -> - :ok - - {:error, _} -> - RetryQueue.enqueue(params, Websub) - end - end - def perform(type, _) do Logger.debug(fn -> "Unknown task: #{type}" end) {:error, "Don't know what to do with this"} diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex index 70f870244..e8c1bf17f 100644 --- a/lib/pleroma/web/federator/publisher.ex +++ b/lib/pleroma/web/federator/publisher.ex @@ -6,7 +6,6 @@ defmodule Pleroma.Web.Federator.Publisher do alias Pleroma.Activity alias Pleroma.Config alias Pleroma.User - alias Pleroma.Web.Federator.RetryQueue require Logger @@ -30,23 +29,10 @@ defmodule Pleroma.Web.Federator.Publisher do Enqueue publishing a single activity. """ @spec enqueue_one(module(), Map.t()) :: :ok - def enqueue_one(module, %{} = params), - do: PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:publish_one, module, params]) - - @spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()} - def perform(:publish_one, module, params) do - case apply(module, :publish_one, [params]) do - {:ok, _} -> - :ok - - {:error, _e} -> - RetryQueue.enqueue(params, module) - end - end - - def perform(type, _, _) do - Logger.debug("Unknown task: #{type}") - {:error, "Don't know what to do with this"} + def enqueue_one(module, %{} = params) do + %{module: to_string(module), params: params} + |> Pleroma.Workers.Publisher.new() + |> Pleroma.Repo.insert() end @doc """ diff --git a/lib/pleroma/web/federator/retry_queue.ex b/lib/pleroma/web/federator/retry_queue.ex deleted file mode 100644 index 3db948c2e..000000000 --- a/lib/pleroma/web/federator/retry_queue.ex +++ /dev/null @@ -1,239 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.Federator.RetryQueue do - use GenServer - - require Logger - - def init(args) do - queue_table = :ets.new(:pleroma_retry_queue, [:bag, :protected]) - - {:ok, %{args | queue_table: queue_table, running_jobs: :sets.new()}} - end - - def start_link do - enabled = - if Pleroma.Config.get(:env) == :test, - do: true, - else: Pleroma.Config.get([__MODULE__, :enabled], false) - - if enabled do - Logger.info("Starting retry queue") - - linkres = - GenServer.start_link( - __MODULE__, - %{delivered: 0, dropped: 0, queue_table: nil, running_jobs: nil}, - name: __MODULE__ - ) - - maybe_kickoff_timer() - linkres - else - Logger.info("Retry queue disabled") - :ignore - end - end - - def enqueue(data, transport, retries \\ 0) do - GenServer.cast(__MODULE__, {:maybe_enqueue, data, transport, retries + 1}) - end - - def get_stats do - GenServer.call(__MODULE__, :get_stats) - end - - def reset_stats do - GenServer.call(__MODULE__, :reset_stats) - end - - def get_retry_params(retries) do - if retries > Pleroma.Config.get([__MODULE__, :max_retries]) do - {:drop, "Max retries reached"} - else - {:retry, growth_function(retries)} - end - end - - def get_retry_timer_interval do - Pleroma.Config.get([:retry_queue, :interval], 1000) - end - - defp ets_count_expires(table, current_time) do - :ets.select_count( - table, - [ - { - {:"$1", :"$2"}, - [{:"=<", :"$1", {:const, current_time}}], - [true] - } - ] - ) - end - - defp ets_pop_n_expired(table, current_time, desired) do - {popped, _continuation} = - :ets.select( - table, - [ - { - {:"$1", :"$2"}, - [{:"=<", :"$1", {:const, current_time}}], - [:"$_"] - } - ], - desired - ) - - popped - |> Enum.each(fn e -> - :ets.delete_object(table, e) - end) - - popped - end - - def maybe_start_job(running_jobs, queue_table) do - # we don't want to hit the ets or the DateTime more times than we have to - # could optimize slightly further by not using the count, and instead grabbing - # up to N objects early... - current_time = DateTime.to_unix(DateTime.utc_now()) - n_running_jobs = :sets.size(running_jobs) - - if n_running_jobs < Pleroma.Config.get([__MODULE__, :max_jobs]) do - n_ready_jobs = ets_count_expires(queue_table, current_time) - - if n_ready_jobs > 0 do - # figure out how many we could start - available_job_slots = Pleroma.Config.get([__MODULE__, :max_jobs]) - n_running_jobs - start_n_jobs(running_jobs, queue_table, current_time, available_job_slots) - else - running_jobs - end - else - running_jobs - end - end - - defp start_n_jobs(running_jobs, _queue_table, _current_time, 0) do - running_jobs - end - - defp start_n_jobs(running_jobs, queue_table, current_time, available_job_slots) - when available_job_slots > 0 do - candidates = ets_pop_n_expired(queue_table, current_time, available_job_slots) - - candidates - |> List.foldl(running_jobs, fn {_, e}, rj -> - {:ok, pid} = Task.start(fn -> worker(e) end) - mref = Process.monitor(pid) - :sets.add_element(mref, rj) - end) - end - - def worker({:send, data, transport, retries}) do - case transport.publish_one(data) do - {:ok, _} -> - GenServer.cast(__MODULE__, :inc_delivered) - :delivered - - {:error, _reason} -> - enqueue(data, transport, retries) - :retry - end - end - - def handle_call(:get_stats, _from, %{delivered: delivery_count, dropped: drop_count} = state) do - {:reply, %{delivered: delivery_count, dropped: drop_count}, state} - end - - def handle_call(:reset_stats, _from, %{delivered: delivery_count, dropped: drop_count} = state) do - {:reply, %{delivered: delivery_count, dropped: drop_count}, - %{state | delivered: 0, dropped: 0}} - end - - def handle_cast(:reset_stats, state) do - {:noreply, %{state | delivered: 0, dropped: 0}} - end - - def handle_cast( - {:maybe_enqueue, data, transport, retries}, - %{dropped: drop_count, queue_table: queue_table, running_jobs: running_jobs} = state - ) do - case get_retry_params(retries) do - {:retry, timeout} -> - :ets.insert(queue_table, {timeout, {:send, data, transport, retries}}) - running_jobs = maybe_start_job(running_jobs, queue_table) - {:noreply, %{state | running_jobs: running_jobs}} - - {:drop, message} -> - Logger.debug(message) - {:noreply, %{state | dropped: drop_count + 1}} - end - end - - def handle_cast(:kickoff_timer, state) do - retry_interval = get_retry_timer_interval() - Process.send_after(__MODULE__, :retry_timer_run, retry_interval) - {:noreply, state} - end - - def handle_cast(:inc_delivered, %{delivered: delivery_count} = state) do - {:noreply, %{state | delivered: delivery_count + 1}} - end - - def handle_cast(:inc_dropped, %{dropped: drop_count} = state) do - {:noreply, %{state | dropped: drop_count + 1}} - end - - def handle_info({:send, data, transport, retries}, %{delivered: delivery_count} = state) do - case transport.publish_one(data) do - {:ok, _} -> - {:noreply, %{state | delivered: delivery_count + 1}} - - {:error, _reason} -> - enqueue(data, transport, retries) - {:noreply, state} - end - end - - def handle_info( - :retry_timer_run, - %{queue_table: queue_table, running_jobs: running_jobs} = state - ) do - maybe_kickoff_timer() - running_jobs = maybe_start_job(running_jobs, queue_table) - {:noreply, %{state | running_jobs: running_jobs}} - end - - def handle_info({:DOWN, ref, :process, _pid, _reason}, state) do - %{running_jobs: running_jobs, queue_table: queue_table} = state - running_jobs = :sets.del_element(ref, running_jobs) - running_jobs = maybe_start_job(running_jobs, queue_table) - {:noreply, %{state | running_jobs: running_jobs}} - end - - def handle_info(unknown, state) do - Logger.debug("RetryQueue: don't know what to do with #{inspect(unknown)}, ignoring") - {:noreply, state} - end - - if Pleroma.Config.get(:env) == :test do - defp growth_function(_retries) do - _shutit = Pleroma.Config.get([__MODULE__, :initial_timeout]) - DateTime.to_unix(DateTime.utc_now()) - 1 - end - else - defp growth_function(retries) do - round(Pleroma.Config.get([__MODULE__, :initial_timeout]) * :math.pow(retries, 3)) + - DateTime.to_unix(DateTime.utc_now()) - end - end - - defp maybe_kickoff_timer do - GenServer.cast(__MODULE__, :kickoff_timer) - end -end diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex index 9b01ebcc6..bbaa293fd 100644 --- a/lib/pleroma/web/salmon/salmon.ex +++ b/lib/pleroma/web/salmon/salmon.ex @@ -170,6 +170,15 @@ def publish_one(%{recipient: url, feed: feed} = params) when is_binary(url) do end end + def publish_one(%{recipient_id: recipient_id} = params) do + recipient = User.get_by_id(recipient_id) + + params + |> Map.delete(:recipient_id) + |> Map.put(:recipient, recipient) + |> publish_one() + end + def publish_one(_), do: :noop @supported_activities [ @@ -218,7 +227,7 @@ def publish(%{info: %{keys: keys}} = user, %{data: %{"type" => type}} = activity Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end) Publisher.enqueue_one(__MODULE__, %{ - recipient: remote_user, + recipient_id: remote_user.id, feed: feed, unreachable_since: reachable_urls_metadata[remote_user.info.salmon] }) diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher.ex new file mode 100644 index 000000000..639794830 --- /dev/null +++ b/lib/pleroma/workers/publisher.ex @@ -0,0 +1,14 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Publisher do + use Oban.Worker, queue: "federator_outgoing", max_attempts: 5 + + @impl Oban.Worker + def perform(%Oban.Job{args: %{module: module_name, params: params}}) do + module_name + |> String.to_atom() + |> apply(:publish_one, [params]) + end +end diff --git a/mix.exs b/mix.exs index 2a8fe2e9d..1ca7a4a77 100644 --- a/mix.exs +++ b/mix.exs @@ -101,6 +101,7 @@ defp deps do {:phoenix_ecto, "~> 4.0"}, {:ecto_sql, "~> 3.1"}, {:postgrex, ">= 0.13.5"}, + {:oban, "~> 0.6"}, {:gettext, "~> 0.15"}, {:comeonin, "~> 4.1.1"}, {:pbkdf2_elixir, "~> 0.12.3"}, diff --git a/mix.lock b/mix.lock index 65da7be8b..8c0b9734e 100644 --- a/mix.lock +++ b/mix.lock @@ -55,6 +55,7 @@ "mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"}, "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"}, + "oban": {:hex, :oban, "0.6.0", "8b9b861355610e703e58a878bc29959f3f0e1b4cd1e90d785cf2bb2498d3b893", [:mix], [{:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"}, "pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.3", "6706a148809a29c306062862c803406e88f048277f6e85b68faf73291e820b84", [:mix], [], "hexpm"}, "phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, diff --git a/priv/repo/migrations/20190730055101_add_oban_jobs_table.exs b/priv/repo/migrations/20190730055101_add_oban_jobs_table.exs new file mode 100644 index 000000000..2f201bd05 --- /dev/null +++ b/priv/repo/migrations/20190730055101_add_oban_jobs_table.exs @@ -0,0 +1,6 @@ +defmodule Pleroma.Repo.Migrations.AddObanJobsTable do + use Ecto.Migration + + defdelegate up, to: Oban.Migrations + defdelegate down, to: Oban.Migrations +end diff --git a/test/user_test.exs b/test/user_test.exs index 556df45fd..70c376384 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -12,9 +12,9 @@ defmodule Pleroma.UserTest do alias Pleroma.Web.CommonAPI use Pleroma.DataCase + use Oban.Testing, repo: Pleroma.Repo import Pleroma.Factory - import Mock setup_all do Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) @@ -1034,11 +1034,7 @@ test "it deletes a user, all follow relationships and all activities", %{user: u refute Activity.get_by_id(repeat.id) end - test_with_mock "it sends out User Delete activity", - %{user: user}, - Pleroma.Web.ActivityPub.Publisher, - [:passthrough], - [] do + test "it sends out User Delete activity", %{user: user} do config_path = [:instance, :federating] initial_setting = Pleroma.Config.get(config_path) Pleroma.Config.put(config_path, true) @@ -1048,11 +1044,8 @@ test "it deletes a user, all follow relationships and all activities", %{user: u {:ok, _user} = User.delete(user) - assert called( - Pleroma.Web.ActivityPub.Publisher.publish_one(%{ - inbox: "http://mastodon.example.org/inbox" - }) - ) + assert [%{args: %{"params" => %{"inbox" => "http://mastodon.example.org/inbox"}}}] = + all_enqueued(worker: Pleroma.Workers.Publisher) Pleroma.Config.put(config_path, initial_setting) end diff --git a/test/web/activity_pub/publisher_test.exs b/test/web/activity_pub/publisher_test.exs index 36a39c84c..26d019878 100644 --- a/test/web/activity_pub/publisher_test.exs +++ b/test/web/activity_pub/publisher_test.exs @@ -257,7 +257,7 @@ test "it returns inbox for messages involving single recipients in total" do assert called( Pleroma.Web.Federator.Publisher.enqueue_one(Publisher, %{ inbox: "https://domain.com/users/nick1/inbox", - actor: actor, + actor_id: actor.id, id: note_activity.data["id"] }) ) diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index 6e143eee4..5c1704548 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -6,7 +6,10 @@ defmodule Pleroma.Web.FederatorTest do alias Pleroma.Instances alias Pleroma.Web.CommonAPI alias Pleroma.Web.Federator + use Pleroma.DataCase + use Oban.Testing, repo: Pleroma.Repo + import Pleroma.Factory import Mock @@ -22,15 +25,6 @@ defmodule Pleroma.Web.FederatorTest do :ok end - describe "Publisher.perform" do - test "call `perform` with unknown task" do - assert { - :error, - "Don't know what to do with this" - } = Pleroma.Web.Federator.Publisher.perform("test", :ok, :ok) - end - end - describe "Publish an activity" do setup do user = insert(:user) @@ -73,10 +67,7 @@ test "with relays deactivated, it does not publish to the relay", %{ end describe "Targets reachability filtering in `publish`" do - test_with_mock "it federates only to reachable instances via AP", - Pleroma.Web.ActivityPub.Publisher, - [:passthrough], - [] do + test "it federates only to reachable instances via AP" do user = insert(:user) {inbox1, inbox2} = @@ -104,20 +95,13 @@ test "with relays deactivated, it does not publish to the relay", %{ {:ok, _activity} = CommonAPI.post(user, %{"status" => "HI @nick1@domain.com, @nick2@domain2.com!"}) - assert called( - Pleroma.Web.ActivityPub.Publisher.publish_one(%{ - inbox: inbox1, - unreachable_since: dt - }) - ) + expected_dt = NaiveDateTime.to_iso8601(dt) - refute called(Pleroma.Web.ActivityPub.Publisher.publish_one(%{inbox: inbox2})) + assert [%{args: %{"params" => %{"inbox" => ^inbox1, "unreachable_since" => ^expected_dt}}}] = + all_enqueued(worker: Pleroma.Workers.Publisher) end - test_with_mock "it federates only to reachable instances via Websub", - Pleroma.Web.Websub, - [:passthrough], - [] do + test "it federates only to reachable instances via Websub" do user = insert(:user) websub_topic = Pleroma.Web.OStatus.feed_path(user) @@ -142,23 +126,25 @@ test "with relays deactivated, it does not publish to the relay", %{ {:ok, _activity} = CommonAPI.post(user, %{"status" => "HI"}) - assert called( - Pleroma.Web.Websub.publish_one(%{ - callback: sub2.callback, - unreachable_since: dt - }) - ) + expected_callback = sub2.callback + expected_dt = NaiveDateTime.to_iso8601(dt) - refute called(Pleroma.Web.Websub.publish_one(%{callback: sub1.callback})) + assert [ + %{ + args: %{ + "params" => %{ + "callback" => ^expected_callback, + "unreachable_since" => ^expected_dt + } + } + } + ] = all_enqueued(worker: Pleroma.Workers.Publisher) end - test_with_mock "it federates only to reachable instances via Salmon", - Pleroma.Web.Salmon, - [:passthrough], - [] do + test "it federates only to reachable instances via Salmon" do user = insert(:user) - remote_user1 = + _remote_user1 = insert(:user, %{ local: false, nickname: "nick1@domain.com", @@ -174,6 +160,8 @@ test "with relays deactivated, it does not publish to the relay", %{ info: %{salmon: "https://domain2.com/salmon"} }) + remote_user2_id = remote_user2.id + dt = NaiveDateTime.utc_now() Instances.set_unreachable(remote_user2.ap_id, dt) @@ -182,14 +170,18 @@ test "with relays deactivated, it does not publish to the relay", %{ {:ok, _activity} = CommonAPI.post(user, %{"status" => "HI @nick1@domain.com, @nick2@domain2.com!"}) - assert called( - Pleroma.Web.Salmon.publish_one(%{ - recipient: remote_user2, - unreachable_since: dt - }) - ) + expected_dt = NaiveDateTime.to_iso8601(dt) - refute called(Pleroma.Web.Salmon.publish_one(%{recipient: remote_user1})) + assert [ + %{ + args: %{ + "params" => %{ + "recipient_id" => ^remote_user2_id, + "unreachable_since" => ^expected_dt + } + } + } + ] = all_enqueued(worker: Pleroma.Workers.Publisher) end end diff --git a/test/web/retry_queue_test.exs b/test/web/retry_queue_test.exs deleted file mode 100644 index ecb3ce5d0..000000000 --- a/test/web/retry_queue_test.exs +++ /dev/null @@ -1,48 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule MockActivityPub do - def publish_one({ret, waiter}) do - send(waiter, :complete) - {ret, "success"} - end -end - -defmodule Pleroma.Web.Federator.RetryQueueTest do - use Pleroma.DataCase - alias Pleroma.Web.Federator.RetryQueue - - @small_retry_count 0 - @hopeless_retry_count 10 - - setup do - RetryQueue.reset_stats() - end - - test "RetryQueue responds to stats request" do - assert %{delivered: 0, dropped: 0} == RetryQueue.get_stats() - end - - test "failed posts are retried" do - {:retry, _timeout} = RetryQueue.get_retry_params(@small_retry_count) - - wait_task = - Task.async(fn -> - receive do - :complete -> :ok - end - end) - - RetryQueue.enqueue({:ok, wait_task.pid}, MockActivityPub, @small_retry_count) - Task.await(wait_task) - assert %{delivered: 1, dropped: 0} == RetryQueue.get_stats() - end - - test "posts that have been tried too many times are dropped" do - {:drop, _timeout} = RetryQueue.get_retry_params(@hopeless_retry_count) - - RetryQueue.enqueue({:ok, nil}, MockActivityPub, @hopeless_retry_count) - assert %{delivered: 0, dropped: 1} == RetryQueue.get_stats() - end -end diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs index e86e76fe9..0186f3fef 100644 --- a/test/web/salmon/salmon_test.exs +++ b/test/web/salmon/salmon_test.exs @@ -96,6 +96,6 @@ test "it gets a magic key" do Salmon.publish(user, activity) - assert called(Publisher.enqueue_one(Salmon, %{recipient: mentioned_user})) + assert called(Publisher.enqueue_one(Salmon, %{recipient_id: mentioned_user.id})) end end From b7fad8d395c2bd1afe445a370e539571f5ec0c18 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 9 Aug 2019 20:08:01 +0300 Subject: [PATCH 017/400] [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. --- config/config.exs | 7 + lib/pleroma/web/activity_pub/utils.ex | 9 +- lib/pleroma/web/federator/federator.ex | 134 +++++------------- lib/pleroma/web/federator/publisher.ex | 12 +- lib/pleroma/workers/publisher.ex | 25 +++- lib/pleroma/workers/receiver.ex | 61 ++++++++ lib/pleroma/workers/subscriber.ex | 44 ++++++ test/activity_test.exs | 4 +- test/support/oban_helpers.ex | 36 +++++ test/user_test.exs | 11 +- .../activity_pub_controller_test.exs | 14 +- test/web/federator_test.exs | 57 +++++--- test/web/websub/websub_test.exs | 4 + 13 files changed, 280 insertions(+), 138 deletions(-) create mode 100644 lib/pleroma/workers/receiver.ex create mode 100644 lib/pleroma/workers/subscriber.ex create mode 100644 test/support/oban_helpers.ex diff --git a/config/config.exs b/config/config.exs index 1bb325bf5..5fd64365c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -458,6 +458,13 @@ prune: {:maxage, 60 * 60 * 24 * 7}, queues: job_queues +config :pleroma, :workers, + retries: [ + compile_time_default: 1, + federator_incoming: 5, + federator_outgoing: 5 + ] + config :pleroma, :fetch_initial_posts, enabled: false, pages: 5 diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 39074888b..f0917f9d4 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -168,14 +168,7 @@ def create_context(context) do """ def maybe_federate(%Activity{local: true} = activity) do if Pleroma.Config.get!([:instance, :federating]) do - priority = - case activity.data["type"] do - "Delete" -> 10 - "Create" -> 1 - _ -> 5 - end - - Pleroma.Web.Federator.publish(activity, priority) + Pleroma.Web.Federator.publish(activity) end :ok diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index 97ec9d549..bb9eadfee 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -3,22 +3,15 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Federator do - alias Pleroma.Activity - alias Pleroma.Object.Containment - alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.ActivityPub.Transmogrifier - alias Pleroma.Web.ActivityPub.Utils - alias Pleroma.Web.Federator.Publisher - alias Pleroma.Web.OStatus - alias Pleroma.Web.Websub + alias Pleroma.Workers.Publisher, as: PublisherWorker + alias Pleroma.Workers.Receiver, as: ReceiverWorker + alias Pleroma.Workers.Subscriber, as: SubscriberWorker require Logger def init do # 1 minute - Process.sleep(1000 * 60) - refresh_subscriptions() + refresh_subscriptions(schedule_in: 60) end @doc "Addresses [memory leaks on recursive replies fetching](https://git.pleroma.social/pleroma/pleroma/issues/161)" @@ -36,111 +29,50 @@ def allowed_incoming_reply_depth?(depth) do # Client API def incoming_doc(doc) do - PleromaJobQueue.enqueue(:federator_incoming, __MODULE__, [:incoming_doc, doc]) + %{"op" => "incoming_doc", "body" => doc} + |> ReceiverWorker.new(worker_args(:federator_incoming)) + |> Pleroma.Repo.insert() end def incoming_ap_doc(params) do - PleromaJobQueue.enqueue(:federator_incoming, __MODULE__, [:incoming_ap_doc, params]) + %{"op" => "incoming_ap_doc", "params" => params} + |> ReceiverWorker.new(worker_args(:federator_incoming)) + |> Pleroma.Repo.insert() end - def publish(activity, priority \\ 1) do - PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:publish, activity], priority) + def publish(%{id: "pleroma:fakeid"} = activity) do + PublisherWorker.perform_publish(activity) + end + + def publish(activity) do + %{"op" => "publish", "activity_id" => activity.id} + |> PublisherWorker.new(worker_args(:federator_outgoing)) + |> Pleroma.Repo.insert() end def verify_websub(websub) do - PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:verify_websub, websub]) + %{"op" => "verify_websub", "websub_id" => websub.id} + |> SubscriberWorker.new(worker_args(:federator_outgoing)) + |> Pleroma.Repo.insert() end - def request_subscription(sub) do - PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:request_subscription, sub]) + def request_subscription(websub) do + %{"op" => "request_subscription", "websub_id" => websub.id} + |> SubscriberWorker.new(worker_args(:federator_outgoing)) + |> Pleroma.Repo.insert() end - def refresh_subscriptions do - PleromaJobQueue.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions]) + def refresh_subscriptions(worker_args \\ []) do + %{"op" => "refresh_subscriptions"} + |> SubscriberWorker.new(worker_args ++ [max_attempts: 1] ++ worker_args(:federator_outgoing)) + |> Pleroma.Repo.insert() end - # Job Worker Callbacks - - def perform(:refresh_subscriptions) do - Logger.debug("Federator running refresh subscriptions") - Websub.refresh_subscriptions() - - spawn(fn -> - # 6 hours - Process.sleep(1000 * 60 * 60 * 6) - refresh_subscriptions() - end) - end - - def perform(:request_subscription, websub) do - Logger.debug("Refreshing #{websub.topic}") - - with {:ok, websub} <- Websub.request_subscription(websub) do - Logger.debug("Successfully refreshed #{websub.topic}") + defp worker_args(queue) do + if max_attempts = Pleroma.Config.get([:workers, :retries, queue]) do + [max_attempts: max_attempts] else - _e -> Logger.debug("Couldn't refresh #{websub.topic}") - end - end - - def perform(:publish, activity) do - Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end) - - with %User{} = actor <- User.get_cached_by_ap_id(activity.data["actor"]), - {:ok, actor} <- User.ensure_keys_present(actor) do - Publisher.publish(actor, activity) - end - end - - def perform(:verify_websub, websub) do - Logger.debug(fn -> - "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" - end) - - Websub.verify(websub) - end - - def perform(:incoming_doc, doc) do - Logger.info("Got document, trying to parse") - OStatus.handle_incoming(doc) - end - - def perform(:incoming_ap_doc, params) do - Logger.info("Handling incoming AP activity") - - params = Utils.normalize_params(params) - - # NOTE: we use the actor ID to do the containment, this is fine because an - # actor shouldn't be acting on objects outside their own AP server. - with {:ok, _user} <- ap_enabled_actor(params["actor"]), - nil <- Activity.normalize(params["id"]), - :ok <- Containment.contain_origin_from_id(params["actor"], params), - {:ok, activity} <- Transmogrifier.handle_incoming(params) do - {:ok, activity} - else - %Activity{} -> - Logger.info("Already had #{params["id"]}") - :error - - _e -> - # Just drop those for now - Logger.info("Unhandled activity") - Logger.info(Jason.encode!(params, pretty: true)) - :error - end - end - - def perform(type, _) do - Logger.debug(fn -> "Unknown task: #{type}" end) - {:error, "Don't know what to do with this"} - end - - def ap_enabled_actor(id) do - user = User.get_cached_by_ap_id(id) - - if User.ap_enabled?(user) do - {:ok, user} - else - ActivityPub.make_user_from_ap_id(id) + [] end end end diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex index e8c1bf17f..05d2be615 100644 --- a/lib/pleroma/web/federator/publisher.ex +++ b/lib/pleroma/web/federator/publisher.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Web.Federator.Publisher do alias Pleroma.Activity alias Pleroma.Config alias Pleroma.User + alias Pleroma.Workers.Publisher, as: PublisherWorker require Logger @@ -30,8 +31,15 @@ defmodule Pleroma.Web.Federator.Publisher do """ @spec enqueue_one(module(), Map.t()) :: :ok def enqueue_one(module, %{} = params) do - %{module: to_string(module), params: params} - |> Pleroma.Workers.Publisher.new() + worker_args = + if max_attempts = Pleroma.Config.get([:workers, :retries, :federator_outgoing]) do + [max_attempts: max_attempts] + else + [] + end + + %{"op" => "publish_one", "module" => to_string(module), "params" => params} + |> PublisherWorker.new(worker_args) |> Pleroma.Repo.insert() end diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher.ex index 639794830..67871977a 100644 --- a/lib/pleroma/workers/publisher.ex +++ b/lib/pleroma/workers/publisher.ex @@ -3,12 +3,33 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.Publisher do - use Oban.Worker, queue: "federator_outgoing", max_attempts: 5 + alias Pleroma.Activity + alias Pleroma.User + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "federator_outgoing", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) @impl Oban.Worker - def perform(%Oban.Job{args: %{module: module_name, params: params}}) do + def perform(%{"op" => "publish", "activity_id" => activity_id}) do + with %Activity{} = activity <- Activity.get_by_id(activity_id) do + perform_publish(activity) + else + _ -> raise "Non-existing activity: #{activity_id}" + end + end + + def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}) do module_name |> String.to_atom() |> apply(:publish_one, [params]) end + + def perform_publish(%Activity{} = activity) do + with %User{} = actor <- User.get_cached_by_ap_id(activity.data["actor"]), + {:ok, actor} <- User.ensure_keys_present(actor) do + Pleroma.Web.Federator.Publisher.publish(actor, activity) + end + end end diff --git a/lib/pleroma/workers/receiver.ex b/lib/pleroma/workers/receiver.ex new file mode 100644 index 000000000..43558b4e6 --- /dev/null +++ b/lib/pleroma/workers/receiver.ex @@ -0,0 +1,61 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Receiver do + alias Pleroma.Activity + alias Pleroma.Object.Containment + alias Pleroma.User + alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.Transmogrifier + alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.OStatus + + require Logger + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "federator_incoming", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "incoming_doc", "body" => doc}) do + Logger.info("Got incoming document, trying to parse") + OStatus.handle_incoming(doc) + end + + def perform(%{"op" => "incoming_ap_doc", "params" => params}) do + Logger.info("Handling incoming AP activity") + + params = Utils.normalize_params(params) + + # NOTE: we use the actor ID to do the containment, this is fine because an + # actor shouldn't be acting on objects outside their own AP server. + with {:ok, _user} <- ap_enabled_actor(params["actor"]), + nil <- Activity.normalize(params["id"]), + :ok <- Containment.contain_origin_from_id(params["actor"], params), + {:ok, activity} <- Transmogrifier.handle_incoming(params) do + {:ok, activity} + else + %Activity{} -> + Logger.info("Already had #{params["id"]}") + :error + + _e -> + # Just drop those for now + Logger.info("Unhandled activity") + Logger.info(Jason.encode!(params, pretty: true)) + :error + end + end + + defp ap_enabled_actor(id) do + user = User.get_cached_by_ap_id(id) + + if User.ap_enabled?(user) do + {:ok, user} + else + ActivityPub.make_user_from_ap_id(id) + end + end +end diff --git a/lib/pleroma/workers/subscriber.ex b/lib/pleroma/workers/subscriber.ex new file mode 100644 index 000000000..a8c01bb10 --- /dev/null +++ b/lib/pleroma/workers/subscriber.ex @@ -0,0 +1,44 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Subscriber do + alias Pleroma.Repo + alias Pleroma.Web.Websub + alias Pleroma.Web.Websub.WebsubClientSubscription + + require Logger + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "federator_outgoing", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "refresh_subscriptions"}) do + Websub.refresh_subscriptions() + # Schedule the next run in 6 hours + Pleroma.Web.Federator.refresh_subscriptions(schedule_in: 3600 * 6) + end + + def perform(%{"op" => "request_subscription", "websub_id" => websub_id}) do + websub = Repo.get(WebsubClientSubscription, websub_id) + Logger.debug("Refreshing #{websub.topic}") + + with {:ok, websub} <- Websub.request_subscription(websub) do + Logger.debug("Successfully refreshed #{websub.topic}") + else + _e -> Logger.debug("Couldn't refresh #{websub.topic}") + end + end + + def perform(%{"op" => "verify_websub", "websub_id" => websub_id}) do + websub = Repo.get(WebsubClientSubscription, websub_id) + + Logger.debug(fn -> + "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" + end) + + Websub.verify(websub) + end +end diff --git a/test/activity_test.exs b/test/activity_test.exs index b27f6fd36..b9c12adb2 100644 --- a/test/activity_test.exs +++ b/test/activity_test.exs @@ -6,6 +6,7 @@ defmodule Pleroma.ActivityTest do use Pleroma.DataCase alias Pleroma.Activity alias Pleroma.Bookmark + alias Pleroma.ObanHelpers alias Pleroma.Object alias Pleroma.ThreadMute import Pleroma.Factory @@ -125,7 +126,8 @@ test "when association is not loaded" do } {:ok, local_activity} = Pleroma.Web.CommonAPI.post(user, %{"status" => "find me!"}) - {:ok, remote_activity} = Pleroma.Web.Federator.incoming_ap_doc(params) + {:ok, job} = Pleroma.Web.Federator.incoming_ap_doc(params) + {:ok, remote_activity} = ObanHelpers.perform(job) %{local_activity: local_activity, remote_activity: remote_activity, user: user} end diff --git a/test/support/oban_helpers.ex b/test/support/oban_helpers.ex new file mode 100644 index 000000000..54b5a9566 --- /dev/null +++ b/test/support/oban_helpers.ex @@ -0,0 +1,36 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ObanHelpers do + @moduledoc """ + Oban test helpers. + """ + + alias Pleroma.Repo + + def perform(%Oban.Job{} = job) do + res = apply(String.to_existing_atom("Elixir." <> job.worker), :perform, [job]) + Repo.delete(job) + res + end + + def perform(jobs) when is_list(jobs) do + for job <- jobs, do: perform(job) + end + + def member?(%{} = job_args, jobs) when is_list(jobs) do + Enum.any?(jobs, fn job -> + member?(job_args, job.args) + end) + end + + def member?(%{} = test_attrs, %{} = attrs) do + Enum.all?( + test_attrs, + fn {k, _v} -> member?(test_attrs[k], attrs[k]) end + ) + end + + def member?(x, y), do: x == y +end diff --git a/test/user_test.exs b/test/user_test.exs index 70c376384..ee6d8e8f3 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -5,6 +5,7 @@ defmodule Pleroma.UserTest do alias Pleroma.Activity alias Pleroma.Builders.UserBuilder + alias Pleroma.ObanHelpers alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User @@ -1044,8 +1045,16 @@ test "it sends out User Delete activity", %{user: user} do {:ok, _user} = User.delete(user) - assert [%{args: %{"params" => %{"inbox" => "http://mastodon.example.org/inbox"}}}] = + assert ObanHelpers.member?( + %{ + "op" => "publish_one", + "params" => %{ + "inbox" => "http://mastodon.example.org/inbox", + "id" => "pleroma:fakeid" + } + }, all_enqueued(worker: Pleroma.Workers.Publisher) + ) Pleroma.Config.put(config_path, initial_setting) end diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 40344f17e..1d809164f 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -4,15 +4,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do use Pleroma.Web.ConnCase + use Oban.Testing, repo: Pleroma.Repo + import Pleroma.Factory alias Pleroma.Activity alias Pleroma.Instances + alias Pleroma.ObanHelpers alias Pleroma.Object alias Pleroma.User alias Pleroma.Web.ActivityPub.ObjectView alias Pleroma.Web.ActivityPub.UserView alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI + alias Pleroma.Workers.Receiver, as: ReceiverWorker setup_all do Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) @@ -232,7 +236,8 @@ test "it inserts an incoming activity into the database", %{conn: conn} do |> post("/inbox", data) assert "ok" == json_response(conn, 200) - :timer.sleep(500) + + ObanHelpers.perform(all_enqueued(worker: ReceiverWorker)) assert Activity.get_by_ap_id(data["id"]) end @@ -274,7 +279,7 @@ test "it inserts an incoming activity into the database", %{conn: conn, data: da |> post("/users/#{user.nickname}/inbox", data) assert "ok" == json_response(conn, 200) - :timer.sleep(500) + ObanHelpers.perform(all_enqueued(worker: ReceiverWorker)) assert Activity.get_by_ap_id(data["id"]) end @@ -303,7 +308,7 @@ test "it accepts messages from actors that are followed by the user", %{ |> post("/users/#{recipient.nickname}/inbox", data) assert "ok" == json_response(conn, 200) - :timer.sleep(500) + ObanHelpers.perform(all_enqueued(worker: ReceiverWorker)) assert Activity.get_by_ap_id(data["id"]) end @@ -382,6 +387,8 @@ test "it removes all follower collections but actor's", %{conn: conn} do |> post("/users/#{recipient.nickname}/inbox", data) |> json_response(200) + ObanHelpers.perform(all_enqueued(worker: ReceiverWorker)) + activity = Activity.get_by_ap_id(data["id"]) assert activity.id @@ -457,6 +464,7 @@ test "it inserts an incoming create activity into the database", %{conn: conn} d |> post("/users/#{user.nickname}/outbox", data) result = json_response(conn, 201) + assert Activity.get_by_ap_id(result["id"]) end diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index 5c1704548..ebe962da2 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -4,8 +4,10 @@ defmodule Pleroma.Web.FederatorTest do alias Pleroma.Instances + alias Pleroma.ObanHelpers alias Pleroma.Web.CommonAPI alias Pleroma.Web.Federator + alias Pleroma.Workers.Publisher, as: PublisherWorker use Pleroma.DataCase use Oban.Testing, repo: Pleroma.Repo @@ -45,6 +47,7 @@ test "with relays active, it publishes to the relay", %{ } do with_mocks([relay_mock]) do Federator.publish(activity) + ObanHelpers.perform(all_enqueued(worker: PublisherWorker)) end assert_received :relay_publish @@ -58,6 +61,7 @@ test "with relays deactivated, it does not publish to the relay", %{ with_mocks([relay_mock]) do Federator.publish(activity) + ObanHelpers.perform(all_enqueued(worker: PublisherWorker)) end refute_received :relay_publish @@ -97,8 +101,15 @@ test "it federates only to reachable instances via AP" do expected_dt = NaiveDateTime.to_iso8601(dt) - assert [%{args: %{"params" => %{"inbox" => ^inbox1, "unreachable_since" => ^expected_dt}}}] = - all_enqueued(worker: Pleroma.Workers.Publisher) + ObanHelpers.perform(all_enqueued(worker: PublisherWorker)) + + assert ObanHelpers.member?( + %{ + "op" => "publish_one", + "params" => %{"inbox" => inbox1, "unreachable_since" => expected_dt} + }, + all_enqueued(worker: PublisherWorker) + ) end test "it federates only to reachable instances via Websub" do @@ -129,16 +140,18 @@ test "it federates only to reachable instances via Websub" do expected_callback = sub2.callback expected_dt = NaiveDateTime.to_iso8601(dt) - assert [ + ObanHelpers.perform(all_enqueued(worker: PublisherWorker)) + + assert ObanHelpers.member?( %{ - args: %{ - "params" => %{ - "callback" => ^expected_callback, - "unreachable_since" => ^expected_dt - } + "op" => "publish_one", + "params" => %{ + "callback" => expected_callback, + "unreachable_since" => expected_dt } - } - ] = all_enqueued(worker: Pleroma.Workers.Publisher) + }, + all_enqueued(worker: PublisherWorker) + ) end test "it federates only to reachable instances via Salmon" do @@ -172,16 +185,18 @@ test "it federates only to reachable instances via Salmon" do expected_dt = NaiveDateTime.to_iso8601(dt) - assert [ + ObanHelpers.perform(all_enqueued(worker: PublisherWorker)) + + assert ObanHelpers.member?( %{ - args: %{ - "params" => %{ - "recipient_id" => ^remote_user2_id, - "unreachable_since" => ^expected_dt - } + "op" => "publish_one", + "params" => %{ + "recipient_id" => remote_user2_id, + "unreachable_since" => expected_dt } - } - ] = all_enqueued(worker: Pleroma.Workers.Publisher) + }, + all_enqueued(worker: PublisherWorker) + ) end end @@ -201,7 +216,8 @@ test "successfully processes incoming AP docs with correct origin" do "to" => ["https://www.w3.org/ns/activitystreams#Public"] } - {:ok, _activity} = Federator.incoming_ap_doc(params) + assert {:ok, job} = Federator.incoming_ap_doc(params) + assert {:ok, _activity} = ObanHelpers.perform(job) end test "rejects incoming AP docs with incorrect origin" do @@ -219,7 +235,8 @@ test "rejects incoming AP docs with incorrect origin" do "to" => ["https://www.w3.org/ns/activitystreams#Public"] } - :error = Federator.incoming_ap_doc(params) + assert {:ok, job} = Federator.incoming_ap_doc(params) + assert :error = ObanHelpers.perform(job) end end end diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs index 74386d7db..b704a558a 100644 --- a/test/web/websub/websub_test.exs +++ b/test/web/websub/websub_test.exs @@ -4,11 +4,14 @@ defmodule Pleroma.Web.WebsubTest do use Pleroma.DataCase + use Oban.Testing, repo: Pleroma.Repo + alias Pleroma.ObanHelpers alias Pleroma.Web.Router.Helpers alias Pleroma.Web.Websub alias Pleroma.Web.Websub.WebsubClientSubscription alias Pleroma.Web.Websub.WebsubServerSubscription + alias Pleroma.Workers.Subscriber, as: SubscriberWorker import Pleroma.Factory import Tesla.Mock @@ -224,6 +227,7 @@ test "it renews subscriptions that have less than a day of time left" do }) _refresh = Websub.refresh_subscriptions() + ObanHelpers.perform(all_enqueued(worker: SubscriberWorker)) assert still_good == Repo.get(WebsubClientSubscription, still_good.id) refute needs_refresh == Repo.get(WebsubClientSubscription, needs_refresh.id) From 33a5fc4a70b6f9b8c2d8c03a412d7eec8d5b3db1 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Sat, 10 Aug 2019 20:38:31 +0300 Subject: [PATCH 018/400] [#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime. --- lib/pleroma/digest_email_worker.ex | 4 +--- lib/pleroma/instances/instance.ex | 8 +++++++- test/conversation_test.exs | 2 ++ test/support/oban_helpers.ex | 6 ++++++ test/web/federator_test.exs | 3 ++- test/web/instances/instance_test.exs | 3 ++- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/digest_email_worker.ex index 18e67d39b..3b0e2bca6 100644 --- a/lib/pleroma/digest_email_worker.ex +++ b/lib/pleroma/digest_email_worker.ex @@ -1,8 +1,6 @@ defmodule Pleroma.DigestEmailWorker do import Ecto.Query - @queue_name :digest_emails - def perform do config = Pleroma.Config.get([:email_notifications, :digest]) negative_interval = -Map.fetch!(config, :interval) @@ -17,7 +15,7 @@ def perform do select: u ) |> Pleroma.Repo.all() - |> Enum.each(&PleromaJobQueue.enqueue(@queue_name, __MODULE__, [&1])) + |> Enum.each(&PleromaJobQueue.enqueue(:digest_emails, __MODULE__, [&1])) end @doc """ diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 4d7ed4ca1..544c4b687 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -90,7 +90,7 @@ def set_reachable(_), do: {:error, nil} def set_unreachable(url_or_host, unreachable_since \\ nil) def set_unreachable(url_or_host, unreachable_since) when is_binary(url_or_host) do - unreachable_since = unreachable_since || DateTime.utc_now() + unreachable_since = parse_datetime(unreachable_since) || NaiveDateTime.utc_now() host = host(url_or_host) existing_record = Repo.get_by(Instance, %{host: host}) @@ -114,4 +114,10 @@ def set_unreachable(url_or_host, unreachable_since) when is_binary(url_or_host) end def set_unreachable(_, _), do: {:error, nil} + + defp parse_datetime(datetime) when is_binary(datetime) do + NaiveDateTime.from_iso8601(datetime) + end + + defp parse_datetime(datetime), do: datetime end diff --git a/test/conversation_test.exs b/test/conversation_test.exs index aa193e0d4..2ebbcab76 100644 --- a/test/conversation_test.exs +++ b/test/conversation_test.exs @@ -28,6 +28,8 @@ test "it goes through old direct conversations" do {:ok, _activity} = CommonAPI.post(user, %{"visibility" => "direct", "status" => "hey @#{other_user.nickname}"}) + Pleroma.ObanHelpers.perform_all() + Repo.delete_all(Conversation) Repo.delete_all(Conversation.Participation) diff --git a/test/support/oban_helpers.ex b/test/support/oban_helpers.ex index 54b5a9566..ecc03ba1a 100644 --- a/test/support/oban_helpers.ex +++ b/test/support/oban_helpers.ex @@ -9,6 +9,12 @@ defmodule Pleroma.ObanHelpers do alias Pleroma.Repo + def perform_all do + Oban.Job + |> Repo.all() + |> perform() + end + def perform(%Oban.Job{} = job) do res = apply(String.to_existing_atom("Elixir." <> job.worker), :perform, [job]) Repo.delete(job) diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index d3a28d50e..e0be4342b 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -249,7 +249,8 @@ test "it does not crash if MRF rejects the post" do File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!() - assert Federator.incoming_ap_doc(params) == :error + assert {:ok, job} = Federator.incoming_ap_doc(params) + assert :error = ObanHelpers.perform(job) Pleroma.Config.put([:instance, :rewrite_policy], policies) Pleroma.Config.put(:mrf_keyword, mrf_keyword_policy) diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs index d28730994..a1bdd45d3 100644 --- a/test/web/instances/instance_test.exs +++ b/test/web/instances/instance_test.exs @@ -22,7 +22,8 @@ defmodule Pleroma.Instances.InstanceTest do describe "set_reachable/1" do test "clears `unreachable_since` of existing matching Instance record having non-nil `unreachable_since`" do - instance = insert(:instance, unreachable_since: NaiveDateTime.utc_now()) + unreachable_since = NaiveDateTime.to_iso8601(NaiveDateTime.utc_now()) + instance = insert(:instance, unreachable_since: unreachable_since) assert {:ok, instance} = Instance.set_reachable(instance.host) refute instance.unreachable_since From 0e1c481a94392b69833fbe6afc184ebbd90e1330 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Tue, 13 Aug 2019 20:20:26 +0300 Subject: [PATCH 019/400] [#1149] Added more oban workers. Refactoring. --- lib/pleroma/digest_email_worker.ex | 11 ++- lib/pleroma/scheduled_activity_worker.ex | 8 +- lib/pleroma/user.ex | 55 +++++++---- lib/pleroma/web/activity_pub/activity_pub.ex | 7 +- .../mrf/mediaproxy_warming_policy.ex | 12 ++- .../web/activity_pub/transmogrifier.ex | 7 +- lib/pleroma/web/federator/federator.ex | 98 ++++++++++++++++++- lib/pleroma/web/oauth/token/clean_worker.ex | 10 +- lib/pleroma/web/push/push.ex | 12 ++- .../controllers/util_controller.ex | 14 +-- lib/pleroma/workers/background_worker.ex | 66 +++++++++++++ lib/pleroma/workers/helper.ex | 13 +++ lib/pleroma/workers/mailer.ex | 18 ++++ lib/pleroma/workers/publisher.ex | 20 +--- lib/pleroma/workers/receiver.ex | 46 +-------- .../workers/scheduled_activity_worker.ex | 15 +++ lib/pleroma/workers/subscriber.ex | 23 +---- lib/pleroma/workers/transmogrifier.ex | 18 ++++ lib/pleroma/workers/web_pusher.ex | 19 ++++ test/activity_test.exs | 2 +- test/conversation_test.exs | 2 +- test/notification_test.exs | 5 +- test/support/oban_helpers.ex | 2 +- test/user_test.exs | 19 ++-- .../activity_pub_controller_test.exs | 2 +- .../mrf/mediaproxy_warming_policy_test.exs | 6 ++ test/web/activity_pub/transmogrifier_test.exs | 4 + test/web/federator_test.exs | 2 +- test/web/twitter_api/util_controller_test.exs | 43 ++++---- test/web/websub/websub_test.exs | 2 +- 30 files changed, 402 insertions(+), 159 deletions(-) create mode 100644 lib/pleroma/workers/background_worker.ex create mode 100644 lib/pleroma/workers/helper.ex create mode 100644 lib/pleroma/workers/mailer.ex create mode 100644 lib/pleroma/workers/scheduled_activity_worker.ex create mode 100644 lib/pleroma/workers/transmogrifier.ex create mode 100644 lib/pleroma/workers/web_pusher.ex diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/digest_email_worker.ex index 3b0e2bca6..6e44cc955 100644 --- a/lib/pleroma/digest_email_worker.ex +++ b/lib/pleroma/digest_email_worker.ex @@ -1,6 +1,11 @@ defmodule Pleroma.DigestEmailWorker do + alias Pleroma.Repo + alias Pleroma.Workers.Mailer, as: MailerWorker + import Ecto.Query + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + def perform do config = Pleroma.Config.get([:email_notifications, :digest]) negative_interval = -Map.fetch!(config, :interval) @@ -15,7 +20,11 @@ def perform do select: u ) |> Pleroma.Repo.all() - |> Enum.each(&PleromaJobQueue.enqueue(:digest_emails, __MODULE__, [&1])) + |> Enum.each(fn user -> + %{"op" => "digest_email", "user_id" => user.id} + |> MailerWorker.new([queue: "digest_emails"] ++ worker_args(:digest_emails)) + |> Repo.insert() + end) end @doc """ diff --git a/lib/pleroma/scheduled_activity_worker.ex b/lib/pleroma/scheduled_activity_worker.ex index 65b38622f..cabea51ca 100644 --- a/lib/pleroma/scheduled_activity_worker.ex +++ b/lib/pleroma/scheduled_activity_worker.ex @@ -8,14 +8,18 @@ defmodule Pleroma.ScheduledActivityWorker do """ alias Pleroma.Config + alias Pleroma.Repo alias Pleroma.ScheduledActivity alias Pleroma.User alias Pleroma.Web.CommonAPI + use GenServer require Logger @schedule_interval :timer.minutes(1) + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + def start_link do GenServer.start_link(__MODULE__, nil) end @@ -45,7 +49,9 @@ def perform(:execute, scheduled_activity_id) do def handle_info(:perform, state) do ScheduledActivity.due_activities(@schedule_interval) |> Enum.each(fn scheduled_activity -> - PleromaJobQueue.enqueue(:scheduled_activities, __MODULE__, [:execute, scheduled_activity.id]) + %{"op" => "execute", "activity_id" => scheduled_activity.id} + |> Pleroma.Workers.ScheduledActivityWorker.new(worker_args(:scheduled_activities)) + |> Repo.insert() end) schedule_next() diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 7d18f099e..bc2102ca7 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -26,6 +26,7 @@ defmodule Pleroma.User do alias Pleroma.Web.OStatus alias Pleroma.Web.RelMe alias Pleroma.Web.Websub + alias Pleroma.Workers.BackgroundWorker require Logger @@ -39,6 +40,8 @@ defmodule Pleroma.User do @strict_local_nickname_regex ~r/^[a-zA-Z\d]+$/ @extended_local_nickname_regex ~r/^[a-zA-Z\d_-]+$/ + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + schema "users" do field(:bio, :string) field(:email, :string) @@ -579,8 +582,11 @@ def get_or_fetch_by_nickname(nickname) do end @doc "Fetch some posts when the user has just been federated with" - def fetch_initial_posts(user), - do: PleromaJobQueue.enqueue(:background, __MODULE__, [:fetch_initial_posts, user]) + def fetch_initial_posts(user) do + %{"op" => "fetch_initial_posts", "user_id" => user.id} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() + end @spec get_followers_query(User.t(), pos_integer() | nil) :: Ecto.Query.t() def get_followers_query(%User{} = user, nil) do @@ -1001,7 +1007,9 @@ def unblock_domain(user, domain) do end def deactivate_async(user, status \\ true) do - PleromaJobQueue.enqueue(:background, __MODULE__, [:deactivate_async, user, status]) + %{"op" => "deactivate_user", "user_id" => user.id, "status" => status} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() end def deactivate(%User{} = user, status \\ true) do @@ -1029,9 +1037,11 @@ def update_notification_settings(%User{} = user, settings \\ %{}) do |> update_and_set_cache() end - @spec delete(User.t()) :: :ok - def delete(%User{} = user), - do: PleromaJobQueue.enqueue(:background, __MODULE__, [:delete, user]) + def delete(%User{} = user) do + %{"op" => "delete_user", "user_id" => user.id} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() + end @spec perform(atom(), User.t()) :: {:ok, User.t()} def perform(:delete, %User{} = user) do @@ -1138,21 +1148,26 @@ def external_users(opts \\ []) do Repo.all(query) end - def blocks_import(%User{} = blocker, blocked_identifiers) when is_list(blocked_identifiers), - do: - PleromaJobQueue.enqueue(:background, __MODULE__, [ - :blocks_import, - blocker, - blocked_identifiers - ]) + def blocks_import(%User{} = blocker, blocked_identifiers) when is_list(blocked_identifiers) do + %{ + "op" => "blocks_import", + "blocker_id" => blocker.id, + "blocked_identifiers" => blocked_identifiers + } + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() + end - def follow_import(%User{} = follower, followed_identifiers) when is_list(followed_identifiers), - do: - PleromaJobQueue.enqueue(:background, __MODULE__, [ - :follow_import, - follower, - followed_identifiers - ]) + def follow_import(%User{} = follower, followed_identifiers) + when is_list(followed_identifiers) do + %{ + "op" => "follow_import", + "follower_id" => follower.id, + "followed_identifiers" => followed_identifiers + } + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() + end def delete_user_activities(%User{ap_id: ap_id} = user) do ap_id diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 1a279a7df..8be8ac86f 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -17,6 +17,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do alias Pleroma.Web.ActivityPub.MRF alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.WebFinger + alias Pleroma.Workers.BackgroundWorker import Ecto.Query import Pleroma.Web.ActivityPub.Utils @@ -25,6 +26,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do require Logger require Pleroma.Constants + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + # For Announce activities, we filter the recipients based on following status for any actors # that match actual users. See issue #164 for more information about why this is necessary. defp get_recipients(%{"type" => "Announce"} = data) do @@ -145,7 +148,9 @@ def insert(map, local \\ true, fake \\ false) when is_map(map) do activity end - PleromaJobQueue.enqueue(:background, Pleroma.Web.RichMedia.Helpers, [:fetch, activity]) + %{"op" => "fetch_data_for_activity", "activity_id" => activity.id} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() Notification.create_notifications(activity) diff --git a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex index 01d21a299..1df3bb5b6 100644 --- a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex @@ -7,7 +7,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do @behaviour Pleroma.Web.ActivityPub.MRF alias Pleroma.HTTP + alias Pleroma.Repo alias Pleroma.Web.MediaProxy + alias Pleroma.Workers.BackgroundWorker require Logger @@ -16,6 +18,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do recv_timeout: 10_000 ] + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + def perform(:prefetch, url) do Logger.info("Prefetching #{inspect(url)}") @@ -30,7 +34,9 @@ def perform(:preload, %{"object" => %{"attachment" => attachments}} = _message) url |> Enum.each(fn %{"href" => href} -> - PleromaJobQueue.enqueue(:background, __MODULE__, [:prefetch, href]) + %{"op" => "media_proxy_prefetch", "url" => href} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() x -> Logger.debug("Unhandled attachment URL object #{inspect(x)}") @@ -46,7 +52,9 @@ def filter( %{"type" => "Create", "object" => %{"attachment" => attachments} = _object} = message ) when is_list(attachments) and length(attachments) > 0 do - PleromaJobQueue.enqueue(:background, __MODULE__, [:preload, message]) + %{"op" => "media_proxy_preload", "message" => message} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() {:ok, message} end diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 5403b71d8..0f117cd04 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -15,12 +15,15 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Visibility alias Pleroma.Web.Federator + alias Pleroma.Workers.Transmogrifier, as: TransmogrifierWorker import Ecto.Query require Logger require Pleroma.Constants + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + @doc """ Modifies an incoming AP object (mastodon format) to our internal format. """ @@ -1073,7 +1076,9 @@ def upgrade_user_from_ap_id(ap_id) do already_ap <- User.ap_enabled?(user), {:ok, user} <- user |> User.upgrade_changeset(data) |> User.update_and_set_cache() do unless already_ap do - PleromaJobQueue.enqueue(:transmogrifier, __MODULE__, [:user_upgrade, user]) + %{"op" => "user_upgrade", "user_id" => user.id} + |> TransmogrifierWorker.new(worker_args(:transmogrifier)) + |> Repo.insert() end {:ok, user} diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index bb9eadfee..d85fe824f 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -3,12 +3,23 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Federator do + alias Pleroma.Activity + alias Pleroma.Object.Containment + alias Pleroma.User + alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.Transmogrifier + alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.Federator.Publisher + alias Pleroma.Web.OStatus + alias Pleroma.Web.Websub alias Pleroma.Workers.Publisher, as: PublisherWorker alias Pleroma.Workers.Receiver, as: ReceiverWorker alias Pleroma.Workers.Subscriber, as: SubscriberWorker require Logger + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + def init do # 1 minute refresh_subscriptions(schedule_in: 60) @@ -41,7 +52,7 @@ def incoming_ap_doc(params) do end def publish(%{id: "pleroma:fakeid"} = activity) do - PublisherWorker.perform_publish(activity) + perform(:publish, activity) end def publish(activity) do @@ -68,11 +79,88 @@ def refresh_subscriptions(worker_args \\ []) do |> Pleroma.Repo.insert() end - defp worker_args(queue) do - if max_attempts = Pleroma.Config.get([:workers, :retries, queue]) do - [max_attempts: max_attempts] + # Job Worker Callbacks + + @spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()} + def perform(:publish_one, module, params) do + apply(module, :publish_one, [params]) + end + + def perform(:publish, activity) do + Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end) + + with %User{} = actor <- User.get_cached_by_ap_id(activity.data["actor"]), + {:ok, actor} <- User.ensure_keys_present(actor) do + Publisher.publish(actor, activity) + end + end + + def perform(:incoming_doc, doc) do + Logger.info("Got document, trying to parse") + OStatus.handle_incoming(doc) + end + + def perform(:incoming_ap_doc, params) do + Logger.info("Handling incoming AP activity") + + params = Utils.normalize_params(params) + + # NOTE: we use the actor ID to do the containment, this is fine because an + # actor shouldn't be acting on objects outside their own AP server. + with {:ok, _user} <- ap_enabled_actor(params["actor"]), + nil <- Activity.normalize(params["id"]), + :ok <- Containment.contain_origin_from_id(params["actor"], params), + {:ok, activity} <- Transmogrifier.handle_incoming(params) do + {:ok, activity} else - [] + %Activity{} -> + Logger.info("Already had #{params["id"]}") + :error + + _e -> + # Just drop those for now + Logger.info("Unhandled activity") + Logger.info(Jason.encode!(params, pretty: true)) + :error + end + end + + def perform(:request_subscription, websub) do + Logger.debug("Refreshing #{websub.topic}") + + with {:ok, websub} <- Websub.request_subscription(websub) do + Logger.debug("Successfully refreshed #{websub.topic}") + else + _e -> Logger.debug("Couldn't refresh #{websub.topic}") + end + end + + def perform(:verify_websub, websub) do + Logger.debug(fn -> + "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" + end) + + Websub.verify(websub) + end + + def perform(:refresh_subscriptions) do + Logger.debug("Federator running refresh subscriptions") + Websub.refresh_subscriptions() + + spawn(fn -> + # 6 hours + Process.sleep(1000 * 60 * 60 * 6) + refresh_subscriptions() + end) + end + + def ap_enabled_actor(id) do + user = User.get_cached_by_ap_id(id) + + if User.ap_enabled?(user) do + {:ok, user} + else + ActivityPub.make_user_from_ap_id(id) end end end diff --git a/lib/pleroma/web/oauth/token/clean_worker.ex b/lib/pleroma/web/oauth/token/clean_worker.ex index dca852449..c0c9c3653 100644 --- a/lib/pleroma/web/oauth/token/clean_worker.ex +++ b/lib/pleroma/web/oauth/token/clean_worker.ex @@ -14,9 +14,12 @@ defmodule Pleroma.Web.OAuth.Token.CleanWorker do [:oauth2, :clean_expired_tokens_interval], 86_400_000 ) - @queue :background + alias Pleroma.Repo alias Pleroma.Web.OAuth.Token + alias Pleroma.Workers.BackgroundWorker + + defdelegate worker_args(queue), to: Pleroma.Workers.Helper def start_link, do: GenServer.start_link(__MODULE__, nil) @@ -31,8 +34,11 @@ def init(_) do @doc false def handle_info(:perform, state) do + %{"op" => "clean_expired_tokens"} + |> BackgroundWorker.new(worker_args(:background)) + |> Repo.insert() + Process.send_after(self(), :perform, @interval) - PleromaJobQueue.enqueue(@queue, __MODULE__, [:clean]) {:noreply, state} end diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push/push.ex index 729dad02a..b4f0e5127 100644 --- a/lib/pleroma/web/push/push.ex +++ b/lib/pleroma/web/push/push.ex @@ -3,10 +3,13 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Push do - alias Pleroma.Web.Push.Impl + alias Pleroma.Repo + alias Pleroma.Workers.WebPusher require Logger + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + def init do unless enabled() do Logger.warn(""" @@ -31,6 +34,9 @@ def enabled do end end - def send(notification), - do: PleromaJobQueue.enqueue(:web_push, Impl, [notification]) + def send(notification) do + %{"op" => "web_push", "notification_id" => notification.id} + |> WebPusher.new(worker_args(:web_push)) + |> Repo.insert() + end end diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 3405bd3b7..7ba4ad305 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -265,12 +265,7 @@ def follow_import(%{assigns: %{user: follower}} = conn, %{"list" => list}) do String.split(line, ",") |> List.first() end) |> List.delete("Account address") do - PleromaJobQueue.enqueue(:background, User, [ - :follow_import, - follower, - followed_identifiers - ]) - + User.follow_import(follower, followed_identifiers) json(conn, "job started") end end @@ -281,12 +276,7 @@ def blocks_import(conn, %{"list" => %Plug.Upload{} = listfile}) do def blocks_import(%{assigns: %{user: blocker}} = conn, %{"list" => list}) do with blocked_identifiers <- String.split(list) do - PleromaJobQueue.enqueue(:background, User, [ - :blocks_import, - blocker, - blocked_identifiers - ]) - + User.blocks_import(blocker, blocked_identifiers) json(conn, "job started") end end diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex new file mode 100644 index 000000000..3ab2b6bcc --- /dev/null +++ b/lib/pleroma/workers/background_worker.ex @@ -0,0 +1,66 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.BackgroundWorker do + alias Pleroma.Activity + alias Pleroma.User + alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy + alias Pleroma.Web.OAuth.Token.CleanWorker + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "background", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}) do + user = User.get_by_id(user_id) + User.perform(:fetch_initial_posts, user) + end + + def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}) do + user = User.get_by_id(user_id) + User.perform(:deactivate_async, user, status) + end + + def perform(%{"op" => "delete_user", "user_id" => user_id}) do + user = User.get_by_id(user_id) + User.perform(:delete, user) + end + + def perform(%{ + "op" => "blocks_import", + "blocker_id" => blocker_id, + "blocked_identifiers" => blocked_identifiers + }) do + blocker = User.get_by_id(blocker_id) + User.perform(:blocks_import, blocker, blocked_identifiers) + end + + def perform(%{ + "op" => "follow_import", + "follower_id" => follower_id, + "followed_identifiers" => followed_identifiers + }) do + follower = User.get_by_id(follower_id) + User.perform(:follow_import, follower, followed_identifiers) + end + + def perform(%{"op" => "clean_expired_tokens"}) do + CleanWorker.perform(:clean) + end + + def perform(%{"op" => "media_proxy_preload", "message" => message}) do + MediaProxyWarmingPolicy.perform(:preload, message) + end + + def perform(%{"op" => "media_proxy_prefetch", "url" => url}) do + MediaProxyWarmingPolicy.perform(:prefetch, url) + end + + def perform(%{"op" => "fetch_data_for_activity", "activity_id" => activity_id}) do + activity = Activity.get_by_id(activity_id) + Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity) + end +end diff --git a/lib/pleroma/workers/helper.ex b/lib/pleroma/workers/helper.ex new file mode 100644 index 000000000..3286ce0e8 --- /dev/null +++ b/lib/pleroma/workers/helper.ex @@ -0,0 +1,13 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Helper do + def worker_args(queue) do + if max_attempts = Pleroma.Config.get([:workers, :retries, queue]) do + [max_attempts: max_attempts] + else + [] + end + end +end diff --git a/lib/pleroma/workers/mailer.ex b/lib/pleroma/workers/mailer.ex new file mode 100644 index 000000000..da7fa6fd5 --- /dev/null +++ b/lib/pleroma/workers/mailer.ex @@ -0,0 +1,18 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Mailer do + alias Pleroma.User + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "mailer", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "digest_email", "user_id" => user_id}) do + user = User.get_by_id(user_id) + Pleroma.DigestEmailWorker.perform(user) + end +end diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher.ex index 67871977a..c890ffb79 100644 --- a/lib/pleroma/workers/publisher.ex +++ b/lib/pleroma/workers/publisher.ex @@ -4,7 +4,7 @@ defmodule Pleroma.Workers.Publisher do alias Pleroma.Activity - alias Pleroma.User + alias Pleroma.Web.Federator # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, @@ -13,23 +13,11 @@ defmodule Pleroma.Workers.Publisher do @impl Oban.Worker def perform(%{"op" => "publish", "activity_id" => activity_id}) do - with %Activity{} = activity <- Activity.get_by_id(activity_id) do - perform_publish(activity) - else - _ -> raise "Non-existing activity: #{activity_id}" - end + activity = Activity.get_by_id(activity_id) + Federator.perform(:publish, activity) end def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}) do - module_name - |> String.to_atom() - |> apply(:publish_one, [params]) - end - - def perform_publish(%Activity{} = activity) do - with %User{} = actor <- User.get_cached_by_ap_id(activity.data["actor"]), - {:ok, actor} <- User.ensure_keys_present(actor) do - Pleroma.Web.Federator.Publisher.publish(actor, activity) - end + Federator.perform(:publish_one, String.to_atom(module_name), params) end end diff --git a/lib/pleroma/workers/receiver.ex b/lib/pleroma/workers/receiver.ex index 43558b4e6..d3de95716 100644 --- a/lib/pleroma/workers/receiver.ex +++ b/lib/pleroma/workers/receiver.ex @@ -3,15 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.Receiver do - alias Pleroma.Activity - alias Pleroma.Object.Containment - alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.ActivityPub.Transmogrifier - alias Pleroma.Web.ActivityPub.Utils - alias Pleroma.Web.OStatus - - require Logger + alias Pleroma.Web.Federator # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, @@ -20,42 +12,10 @@ defmodule Pleroma.Workers.Receiver do @impl Oban.Worker def perform(%{"op" => "incoming_doc", "body" => doc}) do - Logger.info("Got incoming document, trying to parse") - OStatus.handle_incoming(doc) + Federator.perform(:incoming_doc, doc) end def perform(%{"op" => "incoming_ap_doc", "params" => params}) do - Logger.info("Handling incoming AP activity") - - params = Utils.normalize_params(params) - - # NOTE: we use the actor ID to do the containment, this is fine because an - # actor shouldn't be acting on objects outside their own AP server. - with {:ok, _user} <- ap_enabled_actor(params["actor"]), - nil <- Activity.normalize(params["id"]), - :ok <- Containment.contain_origin_from_id(params["actor"], params), - {:ok, activity} <- Transmogrifier.handle_incoming(params) do - {:ok, activity} - else - %Activity{} -> - Logger.info("Already had #{params["id"]}") - :error - - _e -> - # Just drop those for now - Logger.info("Unhandled activity") - Logger.info(Jason.encode!(params, pretty: true)) - :error - end - end - - defp ap_enabled_actor(id) do - user = User.get_cached_by_ap_id(id) - - if User.ap_enabled?(user) do - {:ok, user} - else - ActivityPub.make_user_from_ap_id(id) - end + Federator.perform(:incoming_ap_doc, params) end end diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex new file mode 100644 index 000000000..a49834fd8 --- /dev/null +++ b/lib/pleroma/workers/scheduled_activity_worker.ex @@ -0,0 +1,15 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.ScheduledActivityWorker do + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "scheduled_activities", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "execute", "activity_id" => activity_id}) do + Pleroma.ScheduledActivityWorker.perform(:execute, activity_id) + end +end diff --git a/lib/pleroma/workers/subscriber.ex b/lib/pleroma/workers/subscriber.ex index a8c01bb10..6af3ad0a1 100644 --- a/lib/pleroma/workers/subscriber.ex +++ b/lib/pleroma/workers/subscriber.ex @@ -4,11 +4,9 @@ defmodule Pleroma.Workers.Subscriber do alias Pleroma.Repo - alias Pleroma.Web.Websub + alias Pleroma.Web.Federator alias Pleroma.Web.Websub.WebsubClientSubscription - require Logger - # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "federator_outgoing", @@ -16,29 +14,16 @@ defmodule Pleroma.Workers.Subscriber do @impl Oban.Worker def perform(%{"op" => "refresh_subscriptions"}) do - Websub.refresh_subscriptions() - # Schedule the next run in 6 hours - Pleroma.Web.Federator.refresh_subscriptions(schedule_in: 3600 * 6) + Federator.perform(:refresh_subscriptions) end def perform(%{"op" => "request_subscription", "websub_id" => websub_id}) do websub = Repo.get(WebsubClientSubscription, websub_id) - Logger.debug("Refreshing #{websub.topic}") - - with {:ok, websub} <- Websub.request_subscription(websub) do - Logger.debug("Successfully refreshed #{websub.topic}") - else - _e -> Logger.debug("Couldn't refresh #{websub.topic}") - end + Federator.perform(:request_subscription, websub) end def perform(%{"op" => "verify_websub", "websub_id" => websub_id}) do websub = Repo.get(WebsubClientSubscription, websub_id) - - Logger.debug(fn -> - "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" - end) - - Websub.verify(websub) + Federator.perform(:verify_websub, websub) end end diff --git a/lib/pleroma/workers/transmogrifier.ex b/lib/pleroma/workers/transmogrifier.ex new file mode 100644 index 000000000..c6b4fab47 --- /dev/null +++ b/lib/pleroma/workers/transmogrifier.ex @@ -0,0 +1,18 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.Transmogrifier do + alias Pleroma.User + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "transmogrifier", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "user_upgrade", "user_id" => user_id}) do + user = User.get_by_id(user_id) + Pleroma.Web.ActivityPub.Transmogrifier.perform(:user_upgrade, user) + end +end diff --git a/lib/pleroma/workers/web_pusher.ex b/lib/pleroma/workers/web_pusher.ex new file mode 100644 index 000000000..b99581eb0 --- /dev/null +++ b/lib/pleroma/workers/web_pusher.ex @@ -0,0 +1,19 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.WebPusher do + alias Pleroma.Notification + alias Pleroma.Repo + + # Note: `max_attempts` is intended to be overridden in `new/1` call + use Oban.Worker, + queue: "web_push", + max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + + @impl Oban.Worker + def perform(%{"op" => "web_push", "notification_id" => notification_id}) do + notification = Repo.get(Notification, notification_id) + Pleroma.Web.Push.Impl.perform(notification) + end +end diff --git a/test/activity_test.exs b/test/activity_test.exs index b9c12adb2..658c47837 100644 --- a/test/activity_test.exs +++ b/test/activity_test.exs @@ -6,8 +6,8 @@ defmodule Pleroma.ActivityTest do use Pleroma.DataCase alias Pleroma.Activity alias Pleroma.Bookmark - alias Pleroma.ObanHelpers alias Pleroma.Object + alias Pleroma.Tests.ObanHelpers alias Pleroma.ThreadMute import Pleroma.Factory diff --git a/test/conversation_test.exs b/test/conversation_test.exs index 2ebbcab76..f917aa691 100644 --- a/test/conversation_test.exs +++ b/test/conversation_test.exs @@ -28,7 +28,7 @@ test "it goes through old direct conversations" do {:ok, _activity} = CommonAPI.post(user, %{"visibility" => "direct", "status" => "hey @#{other_user.nickname}"}) - Pleroma.ObanHelpers.perform_all() + Pleroma.Tests.ObanHelpers.perform_all() Repo.delete_all(Conversation) Repo.delete_all(Conversation.Participation) diff --git a/test/notification_test.exs b/test/notification_test.exs index 80ea2a085..e1c9f4f93 100644 --- a/test/notification_test.exs +++ b/test/notification_test.exs @@ -8,6 +8,7 @@ defmodule Pleroma.NotificationTest do import Pleroma.Factory alias Pleroma.Notification + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.CommonAPI @@ -621,7 +622,8 @@ test "notifications are deleted if a local user is deleted" do refute Enum.empty?(Notification.for_user(other_user)) - User.delete(user) + {:ok, job} = User.delete(user) + ObanHelpers.perform(job) assert Enum.empty?(Notification.for_user(other_user)) end @@ -666,6 +668,7 @@ test "notifications are deleted if a remote user is deleted" do } {:ok, _delete_activity} = Transmogrifier.handle_incoming(delete_user_message) + ObanHelpers.perform_all() assert Enum.empty?(Notification.for_user(local_user)) end diff --git a/test/support/oban_helpers.ex b/test/support/oban_helpers.ex index ecc03ba1a..d379c9ec7 100644 --- a/test/support/oban_helpers.ex +++ b/test/support/oban_helpers.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2018 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.ObanHelpers do +defmodule Pleroma.Tests.ObanHelpers do @moduledoc """ Oban test helpers. """ diff --git a/test/user_test.exs b/test/user_test.exs index 8617752d7..9c2117a0b 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -5,9 +5,9 @@ defmodule Pleroma.UserTest do alias Pleroma.Activity alias Pleroma.Builders.UserBuilder - alias Pleroma.ObanHelpers alias Pleroma.Object alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI @@ -676,7 +676,9 @@ test "it imports user followings from list" do user3.nickname ] - result = User.follow_import(user1, identifiers) + {:ok, job} = User.follow_import(user1, identifiers) + result = ObanHelpers.perform(job) + assert is_list(result) assert result == [user2, user3] end @@ -887,7 +889,9 @@ test "it imports user blocks from list" do user3.nickname ] - result = User.blocks_import(user1, identifiers) + {:ok, job} = User.blocks_import(user1, identifiers) + result = ObanHelpers.perform(job) + assert is_list(result) assert result == [user2, user3] end @@ -1013,7 +1017,8 @@ test "it deletes a user, all follow relationships and all activities", %{user: u {:ok, like_two, _} = CommonAPI.favorite(activity.id, follower) {:ok, repeat, _} = CommonAPI.repeat(activity_two.id, user) - {:ok, _} = User.delete(user) + {:ok, job} = User.delete(user) + {:ok, _user} = ObanHelpers.perform(job) follower = User.get_cached_by_id(follower.id) @@ -1043,7 +1048,8 @@ test "it sends out User Delete activity", %{user: user} do {:ok, follower} = User.get_or_fetch_by_ap_id("http://mastodon.example.org/users/admin") {:ok, _} = User.follow(follower, user) - {:ok, _user} = User.delete(user) + {:ok, job} = User.delete(user) + {:ok, _user} = ObanHelpers.perform(job) assert ObanHelpers.member?( %{ @@ -1100,7 +1106,8 @@ test "invalidate_cache works" do test "User.delete() plugs any possible zombie objects" do user = insert(:user) - {:ok, _} = User.delete(user) + {:ok, job} = User.delete(user) + {:ok, _} = ObanHelpers.perform(job) {:ok, cached_user} = Cachex.get(:user_cache, "ap_id:#{user.ap_id}") diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index d7f0a8264..f46353fdd 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -9,8 +9,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do import Pleroma.Factory alias Pleroma.Activity alias Pleroma.Instances - alias Pleroma.ObanHelpers alias Pleroma.Object + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ObjectView alias Pleroma.Web.ActivityPub.UserView diff --git a/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs b/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs index 372e789be..95a809d25 100644 --- a/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs +++ b/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs @@ -6,6 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do use Pleroma.DataCase alias Pleroma.HTTP + alias Pleroma.Tests.ObanHelpers alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy import Mock @@ -24,6 +25,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do test "it prefetches media proxy URIs" do with_mock HTTP, get: fn _, _, _ -> {:ok, []} end do MediaProxyWarmingPolicy.filter(@message) + + ObanHelpers.perform_all() + # Performing jobs which has been just enqueued + ObanHelpers.perform_all() + assert called(HTTP.get(:_, :_, :_)) end end diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index e7498e005..52f46c141 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -8,6 +8,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do alias Pleroma.Object alias Pleroma.Object.Fetcher alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Transmogrifier @@ -563,6 +564,7 @@ test "it works for incoming user deletes" do |> Poison.decode!() {:ok, _} = Transmogrifier.handle_incoming(data) + ObanHelpers.perform_all() refute User.get_cached_by_ap_id(ap_id) end @@ -1132,6 +1134,8 @@ test "it upgrades a user to activitypub" do assert user.info.note_count == 1 {:ok, user} = Transmogrifier.upgrade_user_from_ap_id("https://niu.moe/users/rye") + ObanHelpers.perform_all() + assert user.info.ap_enabled assert user.info.note_count == 1 assert user.follower_address == "https://niu.moe/users/rye/followers" diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index e0be4342b..9ca341b6d 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Web.FederatorTest do alias Pleroma.Instances - alias Pleroma.ObanHelpers + alias Pleroma.Tests.ObanHelpers alias Pleroma.Web.CommonAPI alias Pleroma.Web.Federator alias Pleroma.Workers.Publisher, as: PublisherWorker diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs index 640579c09..e3f129f72 100644 --- a/test/web/twitter_api/util_controller_test.exs +++ b/test/web/twitter_api/util_controller_test.exs @@ -4,9 +4,11 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do use Pleroma.Web.ConnCase + use Oban.Testing, repo: Pleroma.Repo alias Pleroma.Notification alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.CommonAPI import Pleroma.Factory @@ -50,8 +52,7 @@ test "it imports follow lists from file", %{conn: conn} do {File, [], read!: fn "follow_list.txt" -> "Account address,Show boosts\n#{user2.ap_id},true" - end}, - {PleromaJobQueue, [:passthrough], []} + end} ]) do response = conn @@ -59,15 +60,16 @@ test "it imports follow lists from file", %{conn: conn} do |> post("/api/pleroma/follow_import", %{"list" => %Plug.Upload{path: "follow_list.txt"}}) |> json_response(:ok) - assert called( - PleromaJobQueue.enqueue( - :background, - User, - [:follow_import, user1, [user2.ap_id]] - ) - ) - assert response == "job started" + + assert ObanHelpers.member?( + %{ + "op" => "follow_import", + "follower_id" => user1.id, + "followed_identifiers" => [user2.ap_id] + }, + all_enqueued(worker: Pleroma.Workers.BackgroundWorker) + ) end end @@ -126,8 +128,7 @@ test "it imports blocks users from file", %{conn: conn} do user3 = insert(:user) with_mocks([ - {File, [], read!: fn "blocks_list.txt" -> "#{user2.ap_id} #{user3.ap_id}" end}, - {PleromaJobQueue, [:passthrough], []} + {File, [], read!: fn "blocks_list.txt" -> "#{user2.ap_id} #{user3.ap_id}" end} ]) do response = conn @@ -135,15 +136,16 @@ test "it imports blocks users from file", %{conn: conn} do |> post("/api/pleroma/blocks_import", %{"list" => %Plug.Upload{path: "blocks_list.txt"}}) |> json_response(:ok) - assert called( - PleromaJobQueue.enqueue( - :background, - User, - [:blocks_import, user1, [user2.ap_id, user3.ap_id]] - ) - ) - assert response == "job started" + + assert ObanHelpers.member?( + %{ + "op" => "blocks_import", + "blocker_id" => user1.id, + "blocked_identifiers" => [user2.ap_id, user3.ap_id] + }, + all_enqueued(worker: Pleroma.Workers.BackgroundWorker) + ) end end end @@ -607,6 +609,7 @@ test "it returns HTTP 200", %{conn: conn} do |> json_response(:ok) assert response == %{"status" => "success"} + ObanHelpers.perform_all() user = User.get_cached_by_id(user.id) diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs index b704a558a..414610879 100644 --- a/test/web/websub/websub_test.exs +++ b/test/web/websub/websub_test.exs @@ -6,7 +6,7 @@ defmodule Pleroma.Web.WebsubTest do use Pleroma.DataCase use Oban.Testing, repo: Pleroma.Repo - alias Pleroma.ObanHelpers + alias Pleroma.Tests.ObanHelpers alias Pleroma.Web.Router.Helpers alias Pleroma.Web.Websub alias Pleroma.Web.Websub.WebsubClientSubscription From a180c1360ecdbed76eccf3435bb2c831356746bc Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Wed, 14 Aug 2019 21:42:21 +0300 Subject: [PATCH 020/400] [#1149] Oban mailer job. Adjusted tests. --- lib/pleroma/application.ex | 1 + lib/pleroma/emails/mailer.ex | 13 ++++++++++++- lib/pleroma/workers/mailer.ex | 9 +++++++++ test/mix/tasks/pleroma.digest_test.exs | 3 +++ .../mastodon_api/mastodon_api_controller_test.exs | 4 ++++ .../web/twitter_api/twitter_api_controller_test.exs | 4 ++++ test/web/twitter_api/twitter_api_test.exs | 2 ++ 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 5550a4902..7cf60f44a 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -233,6 +233,7 @@ defp hackney_pool_children do defp after_supervisor_start do with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest], true <- digest_config[:active] do + # TODO: consider replacing with `quantum` scheduler PleromaJobQueue.schedule( digest_config[:schedule], :digest_emails, diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex index 2e4657b7c..bb534f602 100644 --- a/lib/pleroma/emails/mailer.ex +++ b/lib/pleroma/emails/mailer.ex @@ -9,6 +9,8 @@ defmodule Pleroma.Emails.Mailer do The module contains functions to delivery email using Swoosh.Mailer. """ + alias Pleroma.Repo + alias Pleroma.Workers.Mailer, as: MailerWorker alias Swoosh.DeliveryError @otp_app :pleroma @@ -17,9 +19,18 @@ defmodule Pleroma.Emails.Mailer do @spec enabled?() :: boolean() def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled]) + defdelegate worker_args(queue), to: Pleroma.Workers.Helper + @doc "add email to queue" def deliver_async(email, config \\ []) do - PleromaJobQueue.enqueue(:mailer, __MODULE__, [:deliver_async, email, config]) + encoded_email = + email + |> :erlang.term_to_binary() + |> Base.encode64() + + %{"op" => "email", "encoded_email" => encoded_email, "config" => config} + |> MailerWorker.new(worker_args(:mailer)) + |> Repo.insert() end @doc "callback to perform send email from queue" diff --git a/lib/pleroma/workers/mailer.ex b/lib/pleroma/workers/mailer.ex index da7fa6fd5..8bf9952bc 100644 --- a/lib/pleroma/workers/mailer.ex +++ b/lib/pleroma/workers/mailer.ex @@ -11,6 +11,15 @@ defmodule Pleroma.Workers.Mailer do max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) @impl Oban.Worker + def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}) do + email = + encoded_email + |> Base.decode64!() + |> :erlang.binary_to_term() + + Pleroma.Emails.Mailer.deliver(email, config) + end + def perform(%{"op" => "digest_email", "user_id" => user_id}) do user = User.get_by_id(user_id) Pleroma.DigestEmailWorker.perform(user) diff --git a/test/mix/tasks/pleroma.digest_test.exs b/test/mix/tasks/pleroma.digest_test.exs index 595f64ed7..5fbeac0d6 100644 --- a/test/mix/tasks/pleroma.digest_test.exs +++ b/test/mix/tasks/pleroma.digest_test.exs @@ -4,6 +4,7 @@ defmodule Mix.Tasks.Pleroma.DigestTest do import Pleroma.Factory import Swoosh.TestAssertions + alias Pleroma.Tests.ObanHelpers alias Pleroma.Web.CommonAPI setup_all do @@ -39,6 +40,8 @@ test "Sends digest to the given user" do :ok = Mix.Tasks.Pleroma.Digest.run(["test", user2.nickname, yesterday_date]) + ObanHelpers.perform_all() + assert_receive {:mix_shell, :info, [message]} assert message =~ "Digest email have been sent" diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index e49c4cc22..be9ff2568 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -11,6 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do alias Pleroma.Object alias Pleroma.Repo alias Pleroma.ScheduledActivity + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI @@ -3871,6 +3872,7 @@ test "it creates a PasswordResetToken record for user", %{user: user} do end test "it sends an email to user", %{user: user} do + ObanHelpers.perform_all() token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id) email = Pleroma.Emails.UserEmail.password_reset_email(user, token_record.token) @@ -3934,6 +3936,8 @@ test "resend account confirmation email", %{conn: conn, user: user} do |> post("/api/v1/pleroma/accounts/confirmation_resend?email=#{user.email}") |> json_response(:no_content) + ObanHelpers.perform_all() + email = Pleroma.Emails.UserEmail.account_confirmation_email(user) notify_email = Pleroma.Config.get([:instance, :notify_email]) instance_name = Pleroma.Config.get([:instance, :name]) diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 8bb8aa36d..9ac4ff929 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -12,6 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do alias Pleroma.Notification alias Pleroma.Object alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI @@ -1099,6 +1100,7 @@ test "it creates a PasswordResetToken record for user", %{user: user} do end test "it sends an email to user", %{user: user} do + ObanHelpers.perform_all() token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id) email = Pleroma.Emails.UserEmail.password_reset_email(user, token_record.token) @@ -1209,6 +1211,8 @@ test "it sends confirmation email", %{conn: conn, user: user} do |> assign(:user, user) |> post("/api/account/resend_confirmation_email?email=#{user.email}") + ObanHelpers.perform_all() + email = Pleroma.Emails.UserEmail.account_confirmation_email(user) notify_email = Pleroma.Config.get([:instance, :notify_email]) instance_name = Pleroma.Config.get([:instance, :name]) diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index cbe83852e..bf063a0de 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -7,6 +7,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do alias Pleroma.Activity alias Pleroma.Object alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.UserInviteToken alias Pleroma.Web.ActivityPub.ActivityPub @@ -321,6 +322,7 @@ test "it sends confirmation email if :account_activation_required is specified i } {:ok, user} = TwitterAPI.register_user(data) + ObanHelpers.perform_all() assert user.info.confirmation_pending From 37229af15fe6d540e7b4a0b6e89f548a100d51c7 Mon Sep 17 00:00:00 2001 From: Sachin Joshi Date: Thu, 22 Aug 2019 00:15:00 +0545 Subject: [PATCH 021/400] remove old user create and delete routes for admin --- lib/pleroma/web/router.ex | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index eb3ee03f3..445cf62e2 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -151,10 +151,6 @@ defmodule Pleroma.Web.Router do post("/users/follow", AdminAPIController, :user_follow) post("/users/unfollow", AdminAPIController, :user_unfollow) - # TODO: to be removed at version 1.0 - delete("/user", AdminAPIController, :user_delete) - post("/user", AdminAPIController, :user_create) - delete("/users", AdminAPIController, :user_delete) post("/users", AdminAPIController, :users_create) patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation) From 64bfb41c553a45855e86737298185c1395bbb350 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Thu, 22 Aug 2019 06:57:55 +0300 Subject: [PATCH 022/400] fixed unfollow for relay actor --- .../activity_pub/activity_pub_controller.ex | 14 +++++++++ lib/pleroma/web/activity_pub/relay.ex | 3 +- lib/pleroma/web/router.ex | 3 ++ .../activity_pub_controller_test.exs | 29 +++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index 133a726c5..e72ec5500 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -104,6 +104,13 @@ def activity(conn, %{"uuid" => uuid}) do end end + # GET /relay/following + def following(%{assigns: %{relay: true}} = conn, _params) do + conn + |> put_resp_header("content-type", "application/activity+json") + |> json(UserView.render("following.json", %{user: Relay.get_actor()})) + end + def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do with %User{} = user <- User.get_cached_by_nickname(nickname), {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user), @@ -131,6 +138,13 @@ def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname}) d end end + # GET /relay/followers + def followers(%{assigns: %{relay: true}} = conn, _params) do + conn + |> put_resp_header("content-type", "application/activity+json") + |> json(UserView.render("followers.json", %{user: Relay.get_actor()})) + end + def followers(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "page" => page}) do with %User{} = user <- User.get_cached_by_nickname(nickname), {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user), diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex index 5f18cc64a..905e85cc6 100644 --- a/lib/pleroma/web/activity_pub/relay.ex +++ b/lib/pleroma/web/activity_pub/relay.ex @@ -36,7 +36,8 @@ def follow(target_instance) do def unfollow(target_instance) do with %User{} = local_user <- get_actor(), {:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance), - {:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do + {:ok, activity} <- ActivityPub.unfollow(local_user, target_user), + {:ok, _, _} <- User.unfollow(local_user, target_user) do Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}") {:ok, activity} else diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 1eb6f7b9d..469e46f5d 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -687,6 +687,9 @@ defmodule Pleroma.Web.Router do get("/", ActivityPubController, :relay) post("/inbox", ActivityPubController, :inbox) + + get("/following", ActivityPubController, :following, assigns: %{relay: true}) + get("/followers", ActivityPubController, :followers, assigns: %{relay: true}) end scope "/internal/fetch", Pleroma.Web.ActivityPub do diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 77f5e39fa..cf71066fd 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -12,6 +12,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do alias Pleroma.Web.ActivityPub.ObjectView alias Pleroma.Web.ActivityPub.UserView alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.ActivityPub.Relay alias Pleroma.Web.CommonAPI setup_all do @@ -593,6 +594,34 @@ test "it increases like count when receiving a like action", %{conn: conn} do end end + describe "/relay/followers" do + test "it returns relay followers", %{conn: conn} do + relay_actor = Relay.get_actor() + user = insert(:user) + User.follow(user, relay_actor) + + result = + conn + |> assign(:relay, true) + |> get("/relay/followers") + |> json_response(200) + + assert result["first"]["orderedItems"] == [user.ap_id] + end + end + + describe "/relay/following" do + test "it returns relay following", %{conn: conn} do + result = + conn + |> assign(:relay, true) + |> get("/relay/following") + |> json_response(200) + + assert result["first"]["orderedItems"] == [] + end + end + describe "/users/:nickname/followers" do test "it returns the followers in a collection", %{conn: conn} do user = insert(:user) From 399ca9133b67725242f76093103e9909e2337e72 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Thu, 22 Aug 2019 21:32:40 +0300 Subject: [PATCH 023/400] fix test --- lib/pleroma/web/activity_pub/relay.ex | 4 ++-- test/web/activity_pub/activity_pub_controller_test.exs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex index 905e85cc6..ce3e30874 100644 --- a/lib/pleroma/web/activity_pub/relay.ex +++ b/lib/pleroma/web/activity_pub/relay.ex @@ -36,8 +36,8 @@ def follow(target_instance) do def unfollow(target_instance) do with %User{} = local_user <- get_actor(), {:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance), - {:ok, activity} <- ActivityPub.unfollow(local_user, target_user), - {:ok, _, _} <- User.unfollow(local_user, target_user) do + {:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do + User.unfollow(local_user, target_user) Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}") {:ok, activity} else diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index cf71066fd..5192e734f 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -10,9 +10,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do alias Pleroma.Object alias Pleroma.User alias Pleroma.Web.ActivityPub.ObjectView + alias Pleroma.Web.ActivityPub.Relay alias Pleroma.Web.ActivityPub.UserView alias Pleroma.Web.ActivityPub.Utils - alias Pleroma.Web.ActivityPub.Relay alias Pleroma.Web.CommonAPI setup_all do From 8dc6a6b210e56ec1a175a3496466d1f8aa62f128 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Thu, 22 Aug 2019 22:39:06 +0300 Subject: [PATCH 024/400] fix /inbox for Relay --- lib/pleroma/object/fetcher.ex | 4 +--- lib/pleroma/signature.ex | 6 ++++++ lib/pleroma/web/activity_pub/publisher.ex | 4 +--- lib/pleroma/web/router.ex | 10 +++++++++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 8d79ddb1f..c1795ae0f 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -117,9 +117,7 @@ defp maybe_date_fetch(headers, date) do def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do Logger.info("Fetching object #{id} via AP") - date = - NaiveDateTime.utc_now() - |> Timex.format!("{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT") + date = Pleroma.Signature.signed_date() headers = [{:Accept, "application/activity+json"}] diff --git a/lib/pleroma/signature.ex b/lib/pleroma/signature.ex index 15bf3c317..f20aeb0d5 100644 --- a/lib/pleroma/signature.ex +++ b/lib/pleroma/signature.ex @@ -53,4 +53,10 @@ def sign(%User{} = user, headers) do HTTPSignatures.sign(private_key, user.ap_id <> "#main-key", headers) end end + + def signed_date, do: signed_date(NaiveDateTime.utc_now()) + + def signed_date(%NaiveDateTime{} = date) do + Timex.format!(date, "{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT") + end end diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex index 262529b84..c97405690 100644 --- a/lib/pleroma/web/activity_pub/publisher.ex +++ b/lib/pleroma/web/activity_pub/publisher.ex @@ -50,9 +50,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa digest = "SHA-256=" <> (:crypto.hash(:sha256, json) |> Base.encode64()) - date = - NaiveDateTime.utc_now() - |> Timex.format!("{WDshort}, {0D} {Mshort} {YYYY} {h24}:{m}:{s} GMT") + date = Pleroma.Signature.signed_date() signature = Pleroma.Signature.sign(actor, %{ diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 469e46f5d..c2e6e8819 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -133,6 +133,10 @@ defmodule Pleroma.Web.Router do }) end + pipeline :http_signature do + plug(Pleroma.Web.Plugs.HTTPSignaturePlug) + end + scope "/api/pleroma", Pleroma.Web.TwitterAPI do pipe_through(:pleroma_api) @@ -686,7 +690,11 @@ defmodule Pleroma.Web.Router do pipe_through(:ap_service_actor) get("/", ActivityPubController, :relay) - post("/inbox", ActivityPubController, :inbox) + + scope [] do + pipe_through(:http_signature) + post("/inbox", ActivityPubController, :inbox) + end get("/following", ActivityPubController, :following, assigns: %{relay: true}) get("/followers", ActivityPubController, :followers, assigns: %{relay: true}) From c29686309eaf2cdae039ce813755c0e23cdc4a03 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 23 Aug 2019 09:23:10 +0300 Subject: [PATCH 025/400] [#1149] Upgraded `oban` from 0.6.0 to 0.7.1. --- config/config.exs | 1 - lib/pleroma/application.ex | 5 +-- lib/pleroma/workers/background_worker.ex | 42 +++++++++++-------- lib/pleroma/workers/mailer.ex | 6 +-- lib/pleroma/workers/publisher.ex | 6 +-- lib/pleroma/workers/receiver.ex | 6 +-- .../workers/scheduled_activity_worker.ex | 4 +- lib/pleroma/workers/subscriber.ex | 8 ++-- lib/pleroma/workers/transmogrifier.ex | 4 +- lib/pleroma/workers/web_pusher.ex | 4 +- mix.exs | 2 +- mix.lock | 10 ++--- test/support/oban_helpers.ex | 2 +- 13 files changed, 51 insertions(+), 49 deletions(-) diff --git a/config/config.exs b/config/config.exs index 9794997d9..1a6348bcd 100644 --- a/config/config.exs +++ b/config/config.exs @@ -469,7 +469,6 @@ config :pleroma, :workers, retries: [ - compile_time_default: 1, federator_incoming: 5, federator_outgoing: 5 ] diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 2e2922d28..384b03aa9 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -41,10 +41,7 @@ def start(_type, _args) do hackney_pool_children() ++ [ Pleroma.Stats, - %{ - id: Oban, - start: {Oban, :start_link, [Application.get_env(:pleroma, Oban)]} - }, + {Oban, Application.get_env(:pleroma, Oban)}, %{ id: :web_push_init, start: {Task, :start_link, [&Pleroma.Web.Push.init/0]}, diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex index 3ab2b6bcc..3c021b9b4 100644 --- a/lib/pleroma/workers/background_worker.ex +++ b/lib/pleroma/workers/background_worker.ex @@ -11,55 +11,61 @@ defmodule Pleroma.Workers.BackgroundWorker do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "background", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}) do + def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do user = User.get_by_id(user_id) User.perform(:fetch_initial_posts, user) end - def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}) do + def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}, _job) do user = User.get_by_id(user_id) User.perform(:deactivate_async, user, status) end - def perform(%{"op" => "delete_user", "user_id" => user_id}) do + def perform(%{"op" => "delete_user", "user_id" => user_id}, _job) do user = User.get_by_id(user_id) User.perform(:delete, user) end - def perform(%{ - "op" => "blocks_import", - "blocker_id" => blocker_id, - "blocked_identifiers" => blocked_identifiers - }) do + def perform( + %{ + "op" => "blocks_import", + "blocker_id" => blocker_id, + "blocked_identifiers" => blocked_identifiers + }, + _job + ) do blocker = User.get_by_id(blocker_id) User.perform(:blocks_import, blocker, blocked_identifiers) end - def perform(%{ - "op" => "follow_import", - "follower_id" => follower_id, - "followed_identifiers" => followed_identifiers - }) do + def perform( + %{ + "op" => "follow_import", + "follower_id" => follower_id, + "followed_identifiers" => followed_identifiers + }, + _job + ) do follower = User.get_by_id(follower_id) User.perform(:follow_import, follower, followed_identifiers) end - def perform(%{"op" => "clean_expired_tokens"}) do + def perform(%{"op" => "clean_expired_tokens"}, _job) do CleanWorker.perform(:clean) end - def perform(%{"op" => "media_proxy_preload", "message" => message}) do + def perform(%{"op" => "media_proxy_preload", "message" => message}, _job) do MediaProxyWarmingPolicy.perform(:preload, message) end - def perform(%{"op" => "media_proxy_prefetch", "url" => url}) do + def perform(%{"op" => "media_proxy_prefetch", "url" => url}, _job) do MediaProxyWarmingPolicy.perform(:prefetch, url) end - def perform(%{"op" => "fetch_data_for_activity", "activity_id" => activity_id}) do + def perform(%{"op" => "fetch_data_for_activity", "activity_id" => activity_id}, _job) do activity = Activity.get_by_id(activity_id) Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity) end diff --git a/lib/pleroma/workers/mailer.ex b/lib/pleroma/workers/mailer.ex index 8bf9952bc..1cce2ea03 100644 --- a/lib/pleroma/workers/mailer.ex +++ b/lib/pleroma/workers/mailer.ex @@ -8,10 +8,10 @@ defmodule Pleroma.Workers.Mailer do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "mailer", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}) do + def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}, _job) do email = encoded_email |> Base.decode64!() @@ -20,7 +20,7 @@ def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => con Pleroma.Emails.Mailer.deliver(email, config) end - def perform(%{"op" => "digest_email", "user_id" => user_id}) do + def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do user = User.get_by_id(user_id) Pleroma.DigestEmailWorker.perform(user) end diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher.ex index c890ffb79..0a9084589 100644 --- a/lib/pleroma/workers/publisher.ex +++ b/lib/pleroma/workers/publisher.ex @@ -9,15 +9,15 @@ defmodule Pleroma.Workers.Publisher do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "federator_outgoing", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "publish", "activity_id" => activity_id}) do + def perform(%{"op" => "publish", "activity_id" => activity_id}, _job) do activity = Activity.get_by_id(activity_id) Federator.perform(:publish, activity) end - def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}) do + def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}, _job) do Federator.perform(:publish_one, String.to_atom(module_name), params) end end diff --git a/lib/pleroma/workers/receiver.ex b/lib/pleroma/workers/receiver.ex index d3de95716..4ee270d74 100644 --- a/lib/pleroma/workers/receiver.ex +++ b/lib/pleroma/workers/receiver.ex @@ -8,14 +8,14 @@ defmodule Pleroma.Workers.Receiver do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "federator_incoming", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "incoming_doc", "body" => doc}) do + def perform(%{"op" => "incoming_doc", "body" => doc}, _job) do Federator.perform(:incoming_doc, doc) end - def perform(%{"op" => "incoming_ap_doc", "params" => params}) do + def perform(%{"op" => "incoming_ap_doc", "params" => params}, _job) do Federator.perform(:incoming_ap_doc, params) end end diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex index a49834fd8..d9724c78a 100644 --- a/lib/pleroma/workers/scheduled_activity_worker.ex +++ b/lib/pleroma/workers/scheduled_activity_worker.ex @@ -6,10 +6,10 @@ defmodule Pleroma.Workers.ScheduledActivityWorker do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "scheduled_activities", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "execute", "activity_id" => activity_id}) do + def perform(%{"op" => "execute", "activity_id" => activity_id}, _job) do Pleroma.ScheduledActivityWorker.perform(:execute, activity_id) end end diff --git a/lib/pleroma/workers/subscriber.ex b/lib/pleroma/workers/subscriber.ex index 6af3ad0a1..783c44173 100644 --- a/lib/pleroma/workers/subscriber.ex +++ b/lib/pleroma/workers/subscriber.ex @@ -10,19 +10,19 @@ defmodule Pleroma.Workers.Subscriber do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "federator_outgoing", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "refresh_subscriptions"}) do + def perform(%{"op" => "refresh_subscriptions"}, _job) do Federator.perform(:refresh_subscriptions) end - def perform(%{"op" => "request_subscription", "websub_id" => websub_id}) do + def perform(%{"op" => "request_subscription", "websub_id" => websub_id}, _job) do websub = Repo.get(WebsubClientSubscription, websub_id) Federator.perform(:request_subscription, websub) end - def perform(%{"op" => "verify_websub", "websub_id" => websub_id}) do + def perform(%{"op" => "verify_websub", "websub_id" => websub_id}, _job) do websub = Repo.get(WebsubClientSubscription, websub_id) Federator.perform(:verify_websub, websub) end diff --git a/lib/pleroma/workers/transmogrifier.ex b/lib/pleroma/workers/transmogrifier.ex index c6b4fab47..e13202c06 100644 --- a/lib/pleroma/workers/transmogrifier.ex +++ b/lib/pleroma/workers/transmogrifier.ex @@ -8,10 +8,10 @@ defmodule Pleroma.Workers.Transmogrifier do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "transmogrifier", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "user_upgrade", "user_id" => user_id}) do + def perform(%{"op" => "user_upgrade", "user_id" => user_id}, _job) do user = User.get_by_id(user_id) Pleroma.Web.ActivityPub.Transmogrifier.perform(:user_upgrade, user) end diff --git a/lib/pleroma/workers/web_pusher.ex b/lib/pleroma/workers/web_pusher.ex index b99581eb0..7b78bb3ea 100644 --- a/lib/pleroma/workers/web_pusher.ex +++ b/lib/pleroma/workers/web_pusher.ex @@ -9,10 +9,10 @@ defmodule Pleroma.Workers.WebPusher do # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, queue: "web_push", - max_attempts: Pleroma.Config.get([:workers, :retries, :compile_time_default]) + max_attempts: 1 @impl Oban.Worker - def perform(%{"op" => "web_push", "notification_id" => notification_id}) do + def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) do notification = Repo.get(Notification, notification_id) Pleroma.Web.Push.Impl.perform(notification) end diff --git a/mix.exs b/mix.exs index b651520ed..eb023313d 100644 --- a/mix.exs +++ b/mix.exs @@ -101,7 +101,7 @@ defp deps do {:phoenix_ecto, "~> 4.0"}, {:ecto_sql, "~> 3.1"}, {:postgrex, ">= 0.13.5"}, - {:oban, "~> 0.6"}, + {:oban, "~> 0.7"}, {:gettext, "~> 0.15"}, {:comeonin, "~> 4.1.1"}, {:pbkdf2_elixir, "~> 0.12.3"}, diff --git a/mix.lock b/mix.lock index 52932c9ef..8b8596375 100644 --- a/mix.lock +++ b/mix.lock @@ -17,12 +17,12 @@ "credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"}, "crontab": {:hex, :crontab, "1.1.7", "b9219f0bdc8678b94143655a8f229716c5810c0636a4489f98c0956137e53985", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"}, "crypt": {:git, "https://github.com/msantos/crypt", "1f2b58927ab57e72910191a7ebaeff984382a1d3", [ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"]}, - "db_connection": {:hex, :db_connection, "2.0.6", "bde2f85d047969c5b5800cb8f4b3ed6316c8cb11487afedac4aa5f93fd39abfa", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, + "db_connection": {:hex, :db_connection, "2.1.1", "a51e8a2ee54ef2ae6ec41a668c85787ed40cb8944928c191280fe34c15b76ae5", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, "decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"}, "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm"}, "earmark": {:hex, :earmark, "1.3.2", "b840562ea3d67795ffbb5bd88940b1bed0ed9fa32834915125ea7d02e35888a5", [:mix], [], "hexpm"}, - "ecto": {:hex, :ecto, "3.1.4", "69d852da7a9f04ede725855a35ede48d158ca11a404fe94f8b2fb3b2162cd3c9", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, - "ecto_sql": {:hex, :ecto_sql, "3.1.3", "2c536139190492d9de33c5fefac7323c5eaaa82e1b9bf93482a14649042f7cd9", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, + "ecto": {:hex, :ecto, "3.1.7", "fa21d06ef56cdc2fdaa62574e8c3ba34a2751d44ea34c30bc65f0728421043e5", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, + "ecto_sql": {:hex, :ecto_sql, "3.1.6", "1e80e30d16138a729c717f73dcb938590bcdb3a4502f3012414d0cbb261045d8", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0 or ~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, "esshd": {:hex, :esshd, "0.1.0", "6f93a2062adb43637edad0ea7357db2702a4b80dd9683482fe00f5134e97f4c1", [:mix], [], "hexpm"}, "eternal": {:hex, :eternal, "1.2.0", "e2a6b6ce3b8c248f7dc31451aefca57e3bdf0e48d73ae5043229380a67614c41", [:mix], [], "hexpm"}, "ex2ms": {:hex, :ex2ms, "1.5.0", "19e27f9212be9a96093fed8cdfbef0a2b56c21237196d26760f11dfcfae58e97", [:mix], [], "hexpm"}, @@ -57,7 +57,7 @@ "mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"}, "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"}, - "oban": {:hex, :oban, "0.6.0", "8b9b861355610e703e58a878bc29959f3f0e1b4cd1e90d785cf2bb2498d3b893", [:mix], [{:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, + "oban": {:hex, :oban, "0.7.1", "171bdd1b69c1a4a839f8c768f5e962fc22d1de1513d459fb6b8e0cbd34817a9a", [:mix], [{:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"}, "pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.3", "6706a148809a29c306062862c803406e88f048277f6e85b68faf73291e820b84", [:mix], [], "hexpm"}, "phoenix": {:hex, :phoenix, "1.4.9", "746d098e10741c334d88143d3c94cab1756435f94387a63441792e66ec0ee974", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, @@ -71,7 +71,7 @@ "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"}, "plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"}, - "postgrex": {:hex, :postgrex, "0.14.3", "5754dee2fdf6e9e508cbf49ab138df964278700b764177e8f3871e658b345a1e", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, + "postgrex": {:hex, :postgrex, "0.15.0", "dd5349161019caeea93efa42f9b22f9d79995c3a86bdffb796427b4c9863b0f0", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "prometheus": {:hex, :prometheus, "4.4.1", "1e96073b3ed7788053768fea779cbc896ddc3bdd9ba60687f2ad50b252ac87d6", [:mix, :rebar3], [], "hexpm"}, "prometheus_ecto": {:hex, :prometheus_ecto, "1.4.1", "6c768ea9654de871e5b32fab2eac348467b3021604ebebbcbd8bcbe806a65ed5", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"}, "prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm"}, diff --git a/test/support/oban_helpers.ex b/test/support/oban_helpers.ex index d379c9ec7..989770926 100644 --- a/test/support/oban_helpers.ex +++ b/test/support/oban_helpers.ex @@ -16,7 +16,7 @@ def perform_all do end def perform(%Oban.Job{} = job) do - res = apply(String.to_existing_atom("Elixir." <> job.worker), :perform, [job]) + res = apply(String.to_existing_atom("Elixir." <> job.worker), :perform, [job.args, job]) Repo.delete(job) res end From c056736daaedb2a08557ee6c6a9bcb6bf44110ca Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 23 Aug 2019 16:11:39 +0300 Subject: [PATCH 026/400] [#1149] Publisher worker fix (atomized `params` keys). --- lib/pleroma/workers/publisher.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher.ex index 0a9084589..00fae99c7 100644 --- a/lib/pleroma/workers/publisher.ex +++ b/lib/pleroma/workers/publisher.ex @@ -18,6 +18,7 @@ def perform(%{"op" => "publish", "activity_id" => activity_id}, _job) do end def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}, _job) do + params = Map.new(params, fn {k, v} -> {String.to_atom(k), v} end) Federator.perform(:publish_one, String.to_atom(module_name), params) end end From 581123f8bb703023cb652267a1fc34292f862852 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 23 Aug 2019 18:28:23 +0300 Subject: [PATCH 027/400] [#1149] Introduced `quantum` job scheduler. Documentation & config changes. --- CHANGELOG.md | 2 ++ config/config.exs | 40 +++++++++++++++++--------- config/test.exs | 2 -- docs/config.md | 15 ++++++---- lib/pleroma/application.ex | 19 ++---------- lib/pleroma/scheduler.ex | 7 +++++ lib/pleroma/web/federator/federator.ex | 8 +----- mix.exs | 2 +- mix.lock | 6 +++- 9 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 lib/pleroma/scheduler.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b0f4f40e..6dc19e79f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template +- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) with [Oban](https://github.com/sorentwo/oban) +- Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler ### Fixed - Not being able to pin unlisted posts diff --git a/config/config.exs b/config/config.exs index 1a6348bcd..43d114d70 100644 --- a/config/config.exs +++ b/config/config.exs @@ -51,6 +51,24 @@ telemetry_event: [Pleroma.Repo.Instrumenter], migration_lock: nil +scheduled_jobs = + with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest], + true <- digest_config[:active] do + [{digest_config[:schedule], {Pleroma.DigestEmailWorker, :perform, []}}] + else + _ -> [] + end + +scheduled_jobs = + scheduled_jobs ++ + [{"0 */6 * * * *", {Pleroma.Web.Websub, :refresh_subscriptions, []}}] + +config :pleroma, Pleroma.Scheduler, + global: true, + overlap: true, + timezone: :utc, + jobs: scheduled_jobs + config :pleroma, Pleroma.Captcha, enabled: false, seconds_valid: 60, @@ -449,23 +467,19 @@ "web" ] -job_queues = [ - federator_incoming: 50, - federator_outgoing: 50, - web_push: 50, - mailer: 10, - transmogrifier: 20, - scheduled_activities: 10, - background: 5 -] - -config :pleroma_job_queue, :queues, job_queues - config :pleroma, Oban, repo: Pleroma.Repo, verbose: false, prune: {:maxage, 60 * 60 * 24 * 7}, - queues: job_queues + queues: [ + federator_incoming: 50, + federator_outgoing: 50, + web_push: 50, + mailer: 10, + transmogrifier: 20, + scheduled_activities: 10, + background: 5 + ] config :pleroma, :workers, retries: [ diff --git a/config/test.exs b/config/test.exs index a0fa67516..62f2a04d2 100644 --- a/config/test.exs +++ b/config/test.exs @@ -61,8 +61,6 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma_job_queue, disabled: true - config :pleroma, Oban, queues: false, prune: :disabled diff --git a/docs/config.md b/docs/config.md index ae8afad89..81923c640 100644 --- a/docs/config.md +++ b/docs/config.md @@ -400,9 +400,9 @@ You can then do curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerandomtoken" ``` -## :pleroma_job_queue +## Oban -[Pleroma Job Queue](https://git.pleroma.social/pleroma/pleroma_job_queue) configuration: a list of queues with maximum concurrent jobs. +[Oban](https://github.com/sorentwo/oban) asynchronous job processor configuration. Pleroma has the following queues: @@ -416,12 +416,15 @@ Pleroma has the following queues: Example: ```elixir -config :pleroma_job_queue, :queues, - federator_incoming: 50, - federator_outgoing: 50 +config :pleroma, Oban, + repo: Pleroma.Repo, + queues: [ + federator_incoming: 50, + federator_outgoing: 50 + ] ``` -This config contains two queues: `federator_incoming` and `federator_outgoing`. Both have the `max_jobs` set to `50`. +This config contains two queues: `federator_incoming` and `federator_outgoing`. Both have the number of max concurrent jobs set to `50`. ## Pleroma.Web.Metadata * `providers`: a list of metadata providers to enable. Providers available: diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 384b03aa9..ce2d3ab59 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -31,6 +31,7 @@ def start(_type, _args) do children = [ Pleroma.Repo, + Pleroma.Scheduler, Pleroma.Config.TransferTask, Pleroma.Emoji, Pleroma.Captcha, @@ -69,9 +70,7 @@ def start(_type, _args) do # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html # for other strategies and supported options opts = [strategy: :one_for_one, name: Pleroma.Supervisor] - result = Supervisor.start_link(children, opts) - :ok = after_supervisor_start() - result + Supervisor.start_link(children, opts) end defp setup_instrumenters do @@ -162,18 +161,4 @@ defp hackney_pool_children do :hackney_pool.child_spec(pool, options) end end - - defp after_supervisor_start do - with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest], - true <- digest_config[:active] do - # TODO: consider replacing with `quantum` scheduler - PleromaJobQueue.schedule( - digest_config[:schedule], - :digest_emails, - Pleroma.DigestEmailWorker - ) - end - - :ok - end end diff --git a/lib/pleroma/scheduler.ex b/lib/pleroma/scheduler.ex new file mode 100644 index 000000000..d84cd99ad --- /dev/null +++ b/lib/pleroma/scheduler.ex @@ -0,0 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Scheduler do + use Quantum.Scheduler, otp_app: :pleroma +end diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index d85fe824f..cf7e50fee 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Web.Federator do defdelegate worker_args(queue), to: Pleroma.Workers.Helper def init do - # 1 minute + # To do: consider removing this call in favor of scheduled execution (`quantum`-based) refresh_subscriptions(schedule_in: 60) end @@ -146,12 +146,6 @@ def perform(:verify_websub, websub) do def perform(:refresh_subscriptions) do Logger.debug("Federator running refresh subscriptions") Websub.refresh_subscriptions() - - spawn(fn -> - # 6 hours - Process.sleep(1000 * 60 * 60 * 6) - refresh_subscriptions() - end) end def ap_enabled_actor(id) do diff --git a/mix.exs b/mix.exs index eb023313d..9d8ded1ff 100644 --- a/mix.exs +++ b/mix.exs @@ -102,6 +102,7 @@ defp deps do {:ecto_sql, "~> 3.1"}, {:postgrex, ">= 0.13.5"}, {:oban, "~> 0.7"}, + {:quantum, "~> 2.3"}, {:gettext, "~> 0.15"}, {:comeonin, "~> 4.1.1"}, {:pbkdf2_elixir, "~> 0.12.3"}, @@ -142,7 +143,6 @@ defp deps do {:http_signatures, git: "https://git.pleroma.social/pleroma/http_signatures.git", ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"}, - {:pleroma_job_queue, "~> 0.3"}, {:telemetry, "~> 0.3"}, {:prometheus_ex, "~> 3.0"}, {:prometheus_plugs, "~> 1.1"}, diff --git a/mix.lock b/mix.lock index 8b8596375..6ebc66271 100644 --- a/mix.lock +++ b/mix.lock @@ -36,6 +36,8 @@ "excoveralls": {:hex, :excoveralls, "0.11.1", "dd677fbdd49114fdbdbf445540ec735808250d56b011077798316505064edb2c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"}, "floki": {:hex, :floki, "0.20.4", "be42ac911fece24b4c72f3b5846774b6e61b83fe685c2fc9d62093277fb3bc86", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}, {:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"}, "gen_smtp": {:hex, :gen_smtp, "0.14.0", "39846a03522456077c6429b4badfd1d55e5e7d0fdfb65e935b7c5e38549d9202", [:rebar3], [], "hexpm"}, + "gen_stage": {:hex, :gen_stage, "0.14.2", "6a2a578a510c5bfca8a45e6b27552f613b41cf584b58210f017088d3d17d0b14", [:mix], [], "hexpm"}, + "gen_state_machine": {:hex, :gen_state_machine, "2.0.5", "9ac15ec6e66acac994cc442dcc2c6f9796cf380ec4b08267223014be1c728a95", [:mix], [], "hexpm"}, "gettext": {:hex, :gettext, "0.17.0", "abe21542c831887a2b16f4c94556db9c421ab301aee417b7c4fbde7fbdbe01ec", [:mix], [], "hexpm"}, "hackney": {:hex, :hackney, "1.15.1", "9f8f471c844b8ce395f7b6d8398139e26ddca9ebc171a8b91342ee15a19963f4", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "html_entities": {:hex, :html_entities, "0.4.0", "f2fee876858cf6aaa9db608820a3209e45a087c5177332799592142b50e89a6b", [:mix], [], "hexpm"}, @@ -46,6 +48,7 @@ "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, "joken": {:hex, :joken, "2.0.1", "ec9ab31bf660f343380da033b3316855197c8d4c6ef597fa3fcb451b326beb14", [:mix], [{:jose, "~> 1.9", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm"}, "jose": {:hex, :jose, "1.9.0", "4167c5f6d06ffaebffd15cdb8da61a108445ef5e85ab8f5a7ad926fdf3ada154", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"}, + "libring": {:hex, :libring, "1.4.0", "41246ba2f3fbc76b3971f6bce83119dfec1eee17e977a48d8a9cfaaf58c2a8d6", [:mix], [], "hexpm"}, "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, "meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm"}, @@ -65,7 +68,6 @@ "phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.2", "496c303bdf1b2e98a9d26e89af5bba3ab487ba3a3735f74bf1f4064d2a845a3e", [:mix], [], "hexpm"}, "phoenix_swoosh": {:hex, :phoenix_swoosh, "0.2.0", "a7e0b32077cd6d2323ae15198839b05d9caddfa20663fd85787479e81f89520e", [:mix], [{:phoenix, "~> 1.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.2", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:swoosh, "~> 0.1", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm"}, - "pleroma_job_queue": {:hex, :pleroma_job_queue, "0.3.0", "b84538d621f0c3d6fcc1cff9d5648d3faaf873b8b21b94e6503428a07a48ec47", [:mix], [{:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}], "hexpm"}, "plug": {:hex, :plug, "1.8.2", "0bcce1daa420f189a6491f3940cc77ea7fb1919761175c9c3b59800d897440fc", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm"}, "plug_cowboy": {:hex, :plug_cowboy, "2.1.0", "b75768153c3a8a9e8039d4b25bb9b14efbc58e9c4a6e6a270abff1cd30cbe320", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"}, "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"}, @@ -78,9 +80,11 @@ "prometheus_phoenix": {:hex, :prometheus_phoenix, "1.3.0", "c4b527e0b3a9ef1af26bdcfbfad3998f37795b9185d475ca610fe4388fdd3bb5", [:mix], [{:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.3 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm"}, "prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm"}, "quack": {:hex, :quack, "0.1.1", "cca7b4da1a233757fdb44b3334fce80c94785b3ad5a602053b7a002b5a8967bf", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: false]}, {:tesla, "~> 1.2.0", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm"}, + "quantum": {:hex, :quantum, "2.3.4", "72a0e8855e2adc101459eac8454787cb74ab4169de6ca50f670e72142d4960e9", [:mix], [{:calendar, "~> 0.17", [hex: :calendar, repo: "hexpm", optional: true]}, {:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.12", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:swarm, "~> 3.3", [hex: :swarm, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: true]}], "hexpm"}, "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"}, "recon": {:git, "https://github.com/ferd/recon.git", "75d70c7c08926d2f24f1ee6de14ee50fe8a52763", [tag: "2.4.0"]}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"}, + "swarm": {:hex, :swarm, "3.4.0", "64f8b30055d74640d2186c66354b33b999438692a91be275bb89cdc7e401f448", [:mix], [{:gen_state_machine, "~> 2.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:libring, "~> 1.0", [hex: :libring, repo: "hexpm", optional: false]}], "hexpm"}, "sweet_xml": {:hex, :sweet_xml, "0.6.6", "fc3e91ec5dd7c787b6195757fbcf0abc670cee1e4172687b45183032221b66b8", [:mix], [], "hexpm"}, "swoosh": {:hex, :swoosh, "0.23.2", "7dda95ff0bf54a2298328d6899c74dae1223777b43563ccebebb4b5d2b61df38", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"}, "syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]}, From 71700ea6d4104ecd2cc0afb0ac103e722b30fbb5 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Sat, 24 Aug 2019 09:27:32 +0300 Subject: [PATCH 028/400] [#1149] Updated docs & tests. --- docs/config.md | 6 ++++++ test/web/admin_api/admin_api_controller_test.exs | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/config.md b/docs/config.md index 81923c640..5b2c3a022 100644 --- a/docs/config.md +++ b/docs/config.md @@ -426,6 +426,12 @@ config :pleroma, Oban, This config contains two queues: `federator_incoming` and `federator_outgoing`. Both have the number of max concurrent jobs set to `50`. +## :workers + +Includes custom worker options not interpretable directly by `Oban`. + +* `retries` — keyword lists where keys are `Oban` queues (see above) and values are numbers of max attempts for failed jobs. + ## Pleroma.Web.Metadata * `providers`: a list of metadata providers to enable. Providers available: * Pleroma.Web.Metadata.Providers.OpenGraph diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 844cd0732..a867ac998 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1861,7 +1861,7 @@ test "queues key as atom", %{conn: conn} do post(conn, "/api/pleroma/admin/config", %{ configs: [ %{ - "group" => "pleroma_job_queue", + "group" => "oban", "key" => ":queues", "value" => [ %{"tuple" => [":federator_incoming", 50]}, @@ -1879,7 +1879,7 @@ test "queues key as atom", %{conn: conn} do assert json_response(conn, 200) == %{ "configs" => [ %{ - "group" => "pleroma_job_queue", + "group" => "oban", "key" => ":queues", "value" => [ %{"tuple" => [":federator_incoming", 50]}, From 73bcbf4fa3bcac7e3ef04049ae6e5768baa6b1d8 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Fri, 23 Aug 2019 21:17:14 +0300 Subject: [PATCH 029/400] add tests --- test/signature_test.exs | 14 ++++++++++++++ test/tasks/relay_test.exs | 4 +++- test/web/activity_pub/relay_test.exs | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/test/signature_test.exs b/test/signature_test.exs index 26337eaf9..d5bf63d7d 100644 --- a/test/signature_test.exs +++ b/test/signature_test.exs @@ -8,6 +8,7 @@ defmodule Pleroma.SignatureTest do import ExUnit.CaptureLog import Pleroma.Factory import Tesla.Mock + import Mock alias Pleroma.Signature @@ -114,4 +115,17 @@ test "it properly deduces the actor id for mastodon and pleroma" do "https://example.com/users/1234" end end + + describe "signed_date" do + test "it returns formatted current date" do + with_mock(NaiveDateTime, utc_now: fn -> ~N[2019-08-23 18:11:24.822233] end) do + assert Signature.signed_date() == "Fri, 23 Aug 2019 18:11:24 GMT" + end + end + + test "it returns formatted date" do + assert Signature.signed_date(~N[2019-08-23 08:11:24.822233]) == + "Fri, 23 Aug 2019 08:11:24 GMT" + end + end end diff --git a/test/tasks/relay_test.exs b/test/tasks/relay_test.exs index 0d341c8d6..7bde56606 100644 --- a/test/tasks/relay_test.exs +++ b/test/tasks/relay_test.exs @@ -50,7 +50,8 @@ test "relay is unfollowed" do %User{ap_id: follower_id} = local_user = Relay.get_actor() target_user = User.get_cached_by_ap_id(target_instance) follow_activity = Utils.fetch_latest_follow(local_user, target_user) - + User.follow(local_user, target_user) + assert "#{target_instance}/followers" in refresh_record(local_user).following Mix.Tasks.Pleroma.Relay.run(["unfollow", target_instance]) cancelled_activity = Activity.get_by_ap_id(follow_activity.data["id"]) @@ -67,6 +68,7 @@ test "relay is unfollowed" do assert undo_activity.data["type"] == "Undo" assert undo_activity.data["actor"] == local_user.ap_id assert undo_activity.data["object"] == cancelled_activity.data + refute "#{target_instance}/followers" in refresh_record(local_user).following end end diff --git a/test/web/activity_pub/relay_test.exs b/test/web/activity_pub/relay_test.exs index e10b808f7..aeef91cda 100644 --- a/test/web/activity_pub/relay_test.exs +++ b/test/web/activity_pub/relay_test.exs @@ -43,12 +43,15 @@ test "returns activity" do user = insert(:user) service_actor = Relay.get_actor() ActivityPub.follow(service_actor, user) + Pleroma.User.follow(service_actor, user) + assert "#{user.ap_id}/followers" in refresh_record(service_actor).following assert {:ok, %Activity{} = activity} = Relay.unfollow(user.ap_id) assert activity.actor == "#{Pleroma.Web.Endpoint.url()}/relay" assert user.ap_id in activity.recipients assert activity.data["type"] == "Undo" assert activity.data["actor"] == service_actor.ap_id assert activity.data["to"] == [user.ap_id] + refute "#{user.ap_id}/followers" in refresh_record(service_actor).following end end From ef9930ed8050a309f2d95df8f0504de2b1da4677 Mon Sep 17 00:00:00 2001 From: ultem Date: Sat, 24 Aug 2019 10:16:27 +0000 Subject: [PATCH 030/400] Minor corrections and clarification for Alpine standard v.3.10 --- docs/installation/alpine_linux_en.md | 33 +++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/docs/installation/alpine_linux_en.md b/docs/installation/alpine_linux_en.md index 1f300f353..c77618936 100644 --- a/docs/installation/alpine_linux_en.md +++ b/docs/installation/alpine_linux_en.md @@ -1,7 +1,9 @@ # Installing on Alpine Linux ## Installation -This guide is a step-by-step installation guide for Alpine Linux. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.linode.com/docs/tools-reference/custom-kernels-distros/install-alpine-linux-on-your-linode/#configuration). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su -l -s $SHELL -c 'command'` instead. +This guide is a step-by-step installation guide for Alpine Linux. The instructions were verified against Alpine v.3.10 standard image. You might miss additional dependencies if you use `netboot` instead. + +It assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.linode.com/docs/tools-reference/custom-kernels-distros/install-alpine-linux-on-your-linode/#configuration). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su -l -s $SHELL -c 'command'` instead. ### Required packages @@ -20,12 +22,13 @@ This guide is a step-by-step installation guide for Alpine Linux. It also assume ### Prepare the system -* First make sure to have the community repository enabled: +* The community repository must be enabled in `/etc/apk/repositories`. Depending on which version and mirror you use this looks like `http://alpine.42.fr/v3.10/community`. If you autogenerated the mirror during installation: ```shell -echo "https://nl.alpinelinux.org/alpine/latest-stable/community" | sudo tee -a /etc/apk/repository +awk 'NR==2' /etc/apk/repositories | sed 's/main/community/' | tee -a /etc/apk/repositories ``` + * Then update the system, if not already done: ```shell @@ -77,7 +80,8 @@ sudo rc-update add postgresql * Add a new system user for the Pleroma service: ```shell -sudo adduser -S -s /bin/false -h /opt/pleroma -H pleroma +sudo addgroup pleroma +sudo adduser -S -s /bin/false -h /opt/pleroma -H -G pleroma pleroma ``` **Note**: To execute a single command as the Pleroma system user, use `sudo -Hu pleroma command`. You can also switch to a shell by using `sudo -Hu pleroma $SHELL`. If you don’t have and want `sudo` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l pleroma -s $SHELL -c 'command'` and `su -l pleroma -s $SHELL` for starting a shell. @@ -164,7 +168,26 @@ If that doesn’t work, make sure, that nginx is not already running. If it stil sudo cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/conf.d/pleroma.conf ``` -* Before starting nginx edit the configuration and change it to your needs (e.g. change servername, change cert paths) +* Before starting nginx edit the configuration and change it to your needs. You must change change `server_name` and the paths to the certificates. You can use `nano` (install with `apk add nano` if missing). + +``` +server { + server_name your.domain; + listen 80; + ... +} + +server { + server_name your.domain; + listen 443 ssl http2; + ... + ssl_trusted_certificate /etc/letsencrypt/live/your.domain/chain.pem; + ssl_certificate /etc/letsencrypt/live/your.domain/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/your.domain/privkey.pem; + ... +} +``` + * Enable and start nginx: ```shell From 6062017493bd8c8749fcbe590121d20ef94df44f Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Sat, 24 Aug 2019 17:17:17 +0300 Subject: [PATCH 031/400] put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json") --- .../activity_pub/activity_pub_controller.ex | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index e72ec5500..ed801a7ae 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -41,7 +41,7 @@ def user(conn, %{"nickname" => nickname}) do with %User{} = user <- User.get_cached_by_nickname(nickname), {:ok, user} <- User.ensure_keys_present(user) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("user.json", %{user: user})) else nil -> {:error, :not_found} @@ -53,7 +53,7 @@ def object(conn, %{"uuid" => uuid}) do %Object{} = object <- Object.get_cached_by_ap_id(ap_id), {_, true} <- {:public?, Visibility.is_public?(object)} do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(ObjectView.render("object.json", %{object: object})) else {:public?, false} -> @@ -69,7 +69,7 @@ def object_likes(conn, %{"uuid" => uuid, "page" => page}) do {page, _} = Integer.parse(page) conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(ObjectView.render("likes.json", ap_id, likes, page)) else {:public?, false} -> @@ -83,7 +83,7 @@ def object_likes(conn, %{"uuid" => uuid}) do {_, true} <- {:public?, Visibility.is_public?(object)}, likes <- Utils.get_object_likes(object) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(ObjectView.render("likes.json", ap_id, likes)) else {:public?, false} -> @@ -96,7 +96,7 @@ def activity(conn, %{"uuid" => uuid}) do %Activity{} = activity <- Activity.normalize(ap_id), {_, true} <- {:public?, Visibility.is_public?(activity)} do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(ObjectView.render("object.json", %{object: activity})) else {:public?, false} -> @@ -107,7 +107,7 @@ def activity(conn, %{"uuid" => uuid}) do # GET /relay/following def following(%{assigns: %{relay: true}} = conn, _params) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("following.json", %{user: Relay.get_actor()})) end @@ -119,12 +119,12 @@ def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "p {page, _} = Integer.parse(page) conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("following.json", %{user: user, page: page, for: for_user})) else {:show_follows, _} -> conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> send_resp(403, "") end end @@ -133,7 +133,7 @@ def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname}) d with %User{} = user <- User.get_cached_by_nickname(nickname), {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("following.json", %{user: user, for: for_user})) end end @@ -141,7 +141,7 @@ def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname}) d # GET /relay/followers def followers(%{assigns: %{relay: true}} = conn, _params) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("followers.json", %{user: Relay.get_actor()})) end @@ -153,12 +153,12 @@ def followers(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname, "p {page, _} = Integer.parse(page) conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("followers.json", %{user: user, page: page, for: for_user})) else {:show_followers, _} -> conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> send_resp(403, "") end end @@ -167,7 +167,7 @@ def followers(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname}) d with %User{} = user <- User.get_cached_by_nickname(nickname), {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("followers.json", %{user: user, for: for_user})) end end @@ -176,7 +176,7 @@ def outbox(conn, %{"nickname" => nickname} = params) do with %User{} = user <- User.get_cached_by_nickname(nickname), {:ok, user} <- User.ensure_keys_present(user) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("outbox.json", %{user: user, max_id: params["max_id"]})) end end @@ -224,7 +224,7 @@ def inbox(conn, params) do defp represent_service_actor(%User{} = user, conn) do with {:ok, user} <- User.ensure_keys_present(user) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("user.json", %{user: user})) else nil -> {:error, :not_found} @@ -245,7 +245,7 @@ def internal_fetch(conn, _params) do def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("user.json", %{user: user})) end @@ -254,7 +254,7 @@ def whoami(_conn, _params), do: {:error, :not_found} def read_inbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = params) do if nickname == user.nickname do conn - |> put_resp_header("content-type", "application/activity+json") + |> put_resp_content_type("application/activity+json") |> json(UserView.render("inbox.json", %{user: user, max_id: params["max_id"]})) else err = From 654d291b6d151bc372bca849ce0b42f723e2bd94 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Sat, 24 Aug 2019 17:41:53 +0300 Subject: [PATCH 032/400] update tests --- lib/pleroma/web/activity_pub/relay.ex | 27 ++++++++------------ test/web/activity_pub/relay_test.exs | 36 ++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex index ce3e30874..c2ac38907 100644 --- a/lib/pleroma/web/activity_pub/relay.ex +++ b/lib/pleroma/web/activity_pub/relay.ex @@ -22,13 +22,7 @@ def follow(target_instance) do Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}") {:ok, activity} else - {:error, _} = error -> - Logger.error("error: #{inspect(error)}") - error - - e -> - Logger.error("error: #{inspect(e)}") - {:error, e} + error -> format_error(error) end end @@ -41,13 +35,7 @@ def unfollow(target_instance) do Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}") {:ok, activity} else - {:error, _} = error -> - Logger.error("error: #{inspect(error)}") - error - - e -> - Logger.error("error: #{inspect(e)}") - {:error, e} + error -> format_error(error) end end @@ -57,11 +45,16 @@ def publish(%Activity{data: %{"type" => "Create"}} = activity) do %Object{} = object <- Object.normalize(activity) do ActivityPub.announce(user, object, nil, true, false) else - e -> - Logger.error("error: #{inspect(e)}") - {:error, inspect(e)} + error -> format_error(error) end end def publish(_), do: {:error, "Not implemented"} + + defp format_error({:error, error}), do: format_error(error) + + defp format_error(error) do + Logger.error("error: #{inspect(error)}") + {:error, error} + end end diff --git a/test/web/activity_pub/relay_test.exs b/test/web/activity_pub/relay_test.exs index aeef91cda..4f7d592a6 100644 --- a/test/web/activity_pub/relay_test.exs +++ b/test/web/activity_pub/relay_test.exs @@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.RelayTest do alias Pleroma.Web.ActivityPub.Relay import Pleroma.Factory + import Mock test "gets an actor for the relay" do user = Relay.get_actor() @@ -56,6 +57,8 @@ test "returns activity" do end describe "publish/1" do + clear_config([:instance, :federating]) + test "returns error when activity not `Create` type" do activity = insert(:like_activity) assert Relay.publish(activity) == {:error, "Not implemented"} @@ -66,13 +69,44 @@ test "returns error when activity not public" do assert Relay.publish(activity) == {:error, false} end - test "returns announce activity" do + test "returns error when object is unknown" do + activity = + insert(:note_activity, + data: %{ + "type" => "Create", + "object" => "http://mastodon.example.org/eee/99541947525187367" + } + ) + + assert Relay.publish(activity) == {:error, nil} + end + + test_with_mock "returns announce activity and publish to federate", + Pleroma.Web.Federator, + [:passthrough], + [] do + Pleroma.Config.put([:instance, :federating], true) service_actor = Relay.get_actor() note = insert(:note_activity) assert {:ok, %Activity{} = activity, %Object{} = obj} = Relay.publish(note) assert activity.data["type"] == "Announce" assert activity.data["actor"] == service_actor.ap_id assert activity.data["object"] == obj.data["id"] + assert called(Pleroma.Web.Federator.publish(activity, 5)) + end + + test_with_mock "returns announce activity and not publish to federate", + Pleroma.Web.Federator, + [:passthrough], + [] do + Pleroma.Config.put([:instance, :federating], false) + service_actor = Relay.get_actor() + note = insert(:note_activity) + assert {:ok, %Activity{} = activity, %Object{} = obj} = Relay.publish(note) + assert activity.data["type"] == "Announce" + assert activity.data["actor"] == service_actor.ap_id + assert activity.data["object"] == obj.data["id"] + refute called(Pleroma.Web.Federator.publish(activity, 5)) end end end From 1692fa89458f0f83f69ffa2f85a998869b8fe454 Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Aug 2019 17:22:26 +0200 Subject: [PATCH 033/400] ActivityExpirationWorker: Fix merge issues. --- lib/pleroma/activity_expiration_worker.ex | 2 +- lib/pleroma/application.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex index a341f58df..0f9e715f8 100644 --- a/lib/pleroma/activity_expiration_worker.ex +++ b/lib/pleroma/activity_expiration_worker.ex @@ -15,7 +15,7 @@ defmodule Pleroma.ActivityExpirationWorker do @schedule_interval :timer.minutes(1) - def start_link do + def start_link(_) do GenServer.start_link(__MODULE__, nil) end diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 1e4de272c..483ac1f39 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -36,7 +36,7 @@ def start(_type, _args) do Pleroma.Captcha, Pleroma.FlakeId, Pleroma.ScheduledActivityWorker, - Pleroma.ActiviyExpirationWorker + Pleroma.ActivityExpirationWorker ] ++ cachex_children() ++ hackney_pool_children() ++ From efb8818e9ee280b53eac17699e8114e8af82b03b Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Aug 2019 17:22:48 +0200 Subject: [PATCH 034/400] Activity Expiration: Switch to 'expires_in' system. --- lib/pleroma/web/common_api/common_api.ex | 15 +++++++++++---- test/web/common_api/common_api_test.exs | 4 +--- .../mastodon_api/mastodon_api_controller_test.exs | 9 ++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 69120cc19..5faddc9f4 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -201,16 +201,23 @@ def get_replied_to_visibility(activity) do end end - defp check_expiry_date(expiry_str) do - {:ok, expiry} = Ecto.Type.cast(:naive_datetime, expiry_str) + defp check_expiry_date({:ok, nil} = res), do: res - if is_nil(expiry) || ActivityExpiration.expires_late_enough?(expiry) do + defp check_expiry_date({:ok, in_seconds}) do + expiry = NaiveDateTime.utc_now() |> NaiveDateTime.add(in_seconds) + + if ActivityExpiration.expires_late_enough?(expiry) do {:ok, expiry} else {:error, "Expiry date is too soon"} end end + defp check_expiry_date(expiry_str) do + Ecto.Type.cast(:integer, expiry_str) + |> check_expiry_date() + end + def post(user, %{"status" => status} = data) do limit = Pleroma.Config.get([:instance, :limit]) @@ -237,7 +244,7 @@ def post(user, %{"status" => status} = data) do context <- make_context(in_reply_to, in_reply_to_conversation), cw <- data["spoiler_text"] || "", sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), - {:ok, expires_at} <- check_expiry_date(data["expires_at"]), + {:ok, expires_at} <- check_expiry_date(data["expires_in"]), full_payload <- String.trim(status <> cw), :ok <- validate_character_limit(full_payload, attachments, limit), object <- diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 5fda91438..f28a66090 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -213,10 +213,8 @@ test "it can handle activities that expire" do |> NaiveDateTime.truncate(:second) |> NaiveDateTime.add(1_000_000, :second) - expires_at_iso8601 = expires_at |> NaiveDateTime.to_iso8601() - assert {:ok, activity} = - CommonAPI.post(user, %{"status" => "chai", "expires_at" => expires_at_iso8601}) + CommonAPI.post(user, %{"status" => "chai", "expires_in" => 1_000_000}) assert expiration = Pleroma.ActivityExpiration.get_by_activity_id(activity.id) assert expiration.scheduled_at == expires_at diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index c05c39db6..6fcdc19aa 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -153,7 +153,8 @@ test "posting a status", %{conn: conn} do refute id == third_id # An activity that will expire: - expires_in = 120 + # 2 hours + expires_in = 120 * 60 conn_four = conn @@ -168,12 +169,14 @@ test "posting a status", %{conn: conn} do estimated_expires_at = NaiveDateTime.utc_now() - |> NaiveDateTime.add(:timer.minutes(expires_in), :millisecond) + |> NaiveDateTime.add(expires_in) |> NaiveDateTime.truncate(:second) # This assert will fail if the test takes longer than a minute. I sure hope it never does: assert abs(NaiveDateTime.diff(expiration.scheduled_at, estimated_expires_at, :second)) < 60 - assert fourth_response["pleroma"]["expires_at"] == NaiveDateTime.to_iso8601(expiration.scheduled_at) + + assert fourth_response["pleroma"]["expires_at"] == + NaiveDateTime.to_iso8601(expiration.scheduled_at) end test "replying to a status", %{conn: conn} do From 24994f3e0c643abe4d74bec3edec53fa89f4ed72 Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Aug 2019 17:28:19 +0200 Subject: [PATCH 035/400] Activity expiration: Fix docs. --- docs/api/differences_in_mastoapi_responses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 197c465d8..f34e3dd72 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -25,7 +25,7 @@ Has these additional fields under the `pleroma` object: - `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any) - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` -- `expires_on`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire +- `expires_at`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire ## Attachments @@ -87,7 +87,7 @@ Additional parameters can be added to the JSON body/Form data: - `content_type`: string, contain the MIME type of the status, it is transformed into HTML by the backend. You can get the list of the supported MIME types with the nodeinfo endpoint. - `to`: A list of nicknames (like `lain@soykaf.club` or `lain` on the local server) that will be used to determine who is going to be addressed by this post. Using this will disable the implicit addressing by mentioned names in the `status` body, only the people in the `to` list will be addressed. The normal rules for for post visibility are not affected by this and will still apply. - `visibility`: string, besides standard MastoAPI values (`direct`, `private`, `unlisted` or `public`) it can be used to address a List by setting it to `list:LIST_ID`. -- `expires_on`: datetime (iso8601), sets when the posted activity should expire. When a posted activity expires it will be deleted from the server, and a delete request for it will be federated. +- `expires_in`: The number of seconds the posted activity should expire in. When a posted activity expires it will be deleted from the server, and a delete request for it will be federated. This needs to be longer than an hour. - `in_reply_to_conversation_id`: Will reply to a given conversation, addressing only the people who are part of the recipient set of that conversation. Sets the visibility to `direct`. ## PATCH `/api/v1/update_credentials` From 1d7033d96289edf0adf2ca61a725f93b345305ec Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Aug 2019 15:33:17 +0000 Subject: [PATCH 036/400] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 949577842..b1ec21818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,9 +50,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ActivityPub: Deactivated user deletion ### Added -- Expiring/ephemeral activites. All activities can have expires_on value set, which controls when they should be deleted automatically. -- Mastodon API: in post_status, the expires_in parameter lets you set the number of minutes until an activity expires. It must be at least one hour. -- Mastodon API: all status JSON responses contain a `pleroma.expires_on` item which states when an activity will expire. The value is only shown to the user who created the activity. To everyone else it's empty. +- Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically. +- Mastodon API: in post_status, the expires_in parameter lets you set the number of seconds until an activity expires. It must be at least one hour. +- Mastodon API: all status JSON responses contain a `pleroma.expires_at` item which states when an activity will expire. The value is only shown to the user who created the activity. To everyone else it's empty. - Configuration: `ActivityExpiration.enabled` controls whether expired activites will get deleted at the appropriate time. Enabled by default. - Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data. - **Breaking:** MRF describe API, which adds support for exposing configuration information about MRF policies to NodeInfo. From 3549cd9754f95b17a2be2eb76d9bb6c38bdbf288 Mon Sep 17 00:00:00 2001 From: kPherox Date: Sun, 25 Aug 2019 01:28:38 +0900 Subject: [PATCH 037/400] Change to use attachment only when fields do not exist --- lib/pleroma/user/info.ex | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 45a39924b..779bfbc18 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -49,7 +49,7 @@ defmodule Pleroma.User.Info do field(:mascot, :map, default: nil) field(:emoji, {:array, :map}, default: []) field(:pleroma_settings_store, :map, default: %{}) - field(:fields, {:array, :map}, default: []) + field(:fields, {:array, :map}, default: nil) field(:raw_fields, {:array, :map}, default: []) field(:notification_settings, :map, @@ -422,7 +422,7 @@ def remove_reblog_mute(info, ap_id) do # ``fields`` is an array of mastodon profile field, containing ``{"name": "…", "value": "…"}``. # For example: [{"name": "Pronoun", "value": "she/her"}, …] - def fields(%{fields: [], source_data: %{"attachment" => attachment}}) do + def fields(%{fields: nil, source_data: %{"attachment" => attachment}}) do limit = Pleroma.Config.get([:instance, :max_remote_account_fields], 0) attachment @@ -431,6 +431,8 @@ def fields(%{fields: [], source_data: %{"attachment" => attachment}}) do |> Enum.take(limit) end + def fields(%{fields: nil}), do: [] + def fields(%{fields: fields}), do: fields def follow_information_update(info, params) do From 18668447d268524e39d9cc8812805053ef9c186e Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Aug 2019 07:10:22 +0200 Subject: [PATCH 038/400] HttpRequestMock: Log mock errors as warnings --- test/support/http_request_mock.ex | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 3adb5ba3b..00f4660c1 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -17,9 +17,14 @@ def request( with {:ok, res} <- apply(__MODULE__, method, [url, query, body, headers]) do res else - {_, _r} = error -> - # Logger.warn(r) - error + error -> + error = error + + with {:error, message} <- error do + Logger.warn(message) + end + + {_, _r} = error end end From e22737ffb5f7e7c567802e2bcef5520e2759e734 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Aug 2019 07:33:46 +0200 Subject: [PATCH 039/400] HttpRequestMock: Improve non-implemented error message --- test/support/http_request_mock.ex | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 00f4660c1..320244c75 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -975,7 +975,7 @@ def get("https://mstdn.jp/.well-known/webfinger?resource=acct:kpherox@mstdn.jp", def get(url, query, body, headers) do {:error, - "Not implemented the mock response for get #{inspect(url)}, #{query}, #{inspect(body)}, #{ + "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{ inspect(headers) }"} end @@ -1037,7 +1037,10 @@ def post("http://404.site" <> _, _, _, _) do }} end - def post(url, _query, _body, _headers) do - {:error, "Not implemented the mock response for post #{inspect(url)}"} + def post(url, query, body, headers) do + {:error, + "Mock response not implemented for POST #{inspect(url)}, #{query}, #{inspect(body)}, #{ + inspect(headers) + }"} end end From 211e1637705266bebd33735d4bb1809c0326f707 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Aug 2019 08:03:25 +0200 Subject: [PATCH 040/400] Implement missing mocks for rel=me --- test/support/http_request_mock.ex | 16 ++++++++++++++++ test/web/rel_me_test.exs | 29 ++--------------------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 320244c75..c308e5a36 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -973,6 +973,22 @@ def get("https://mstdn.jp/.well-known/webfinger?resource=acct:kpherox@mstdn.jp", }} end + def get("http://example.com/rel_me/anchor", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor.html")}} + end + + def get("http://example.com/rel_me/anchor_nofollow", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor_nofollow.html")}} + end + + def get("http://example.com/rel_me/link", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_link.html")}} + end + + def get("http://example.com/rel_me/null", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_null.html")}} + end + def get(url, query, body, headers) do {:error, "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{ diff --git a/test/web/rel_me_test.exs b/test/web/rel_me_test.exs index 85515c432..2251fed16 100644 --- a/test/web/rel_me_test.exs +++ b/test/web/rel_me_test.exs @@ -5,33 +5,8 @@ defmodule Pleroma.Web.RelMeTest do use ExUnit.Case, async: true - setup do - Tesla.Mock.mock(fn - %{ - method: :get, - url: "http://example.com/rel_me/anchor" - } -> - %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor.html")} - - %{ - method: :get, - url: "http://example.com/rel_me/anchor_nofollow" - } -> - %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor_nofollow.html")} - - %{ - method: :get, - url: "http://example.com/rel_me/link" - } -> - %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_link.html")} - - %{ - method: :get, - url: "http://example.com/rel_me/null" - } -> - %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_null.html")} - end) - + setup_all do + Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) :ok end From f3b12662731fa8d1aa458ea16fb4bcb176b77744 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Aug 2019 08:48:38 +0200 Subject: [PATCH 041/400] user_test.exs: fix rel=me tests --- test/user_test.exs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/user_test.exs b/test/user_test.exs index 661ffc0b3..2cbc1f525 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1253,18 +1253,18 @@ test "preserves hosts in user links text" do end test "Adds rel=me on linkbacked urls" do - user = insert(:user, ap_id: "http://social.example.org/users/lain") + user = insert(:user, ap_id: "https://social.example.org/users/lain") - bio = "http://example.org/rel_me/null" + bio = "http://example.com/rel_me/null" expected_text = "#{bio}" assert expected_text == User.parse_bio(bio, user) - bio = "http://example.org/rel_me/link" - expected_text = "#{bio}" + bio = "http://example.com/rel_me/link" + expected_text = "#{bio}" assert expected_text == User.parse_bio(bio, user) - bio = "http://example.org/rel_me/anchor" - expected_text = "#{bio}" + bio = "http://example.com/rel_me/anchor" + expected_text = "#{bio}" assert expected_text == User.parse_bio(bio, user) end end From 20c3f613d8574d67b1e5a47bf41f324101183398 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 25 Aug 2019 08:55:29 +0200 Subject: [PATCH 042/400] HttpRequestMock: Remove useless `error = error` --- test/support/http_request_mock.ex | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 320244c75..314b20a45 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -18,8 +18,6 @@ def request( res else error -> - error = error - with {:error, message} <- error do Logger.warn(message) end From d74efde94e3526b45dc9b31d9d48ffce14203ffa Mon Sep 17 00:00:00 2001 From: kPherox Date: Mon, 26 Aug 2019 02:00:41 +0900 Subject: [PATCH 043/400] Update test for custom profile fields --- test/web/activity_pub/transmogrifier_test.exs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 629c76c97..0661d5d7c 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -563,6 +563,14 @@ test "it works with custom profile fields" do %{"name" => "foo", "value" => "updated"}, %{"name" => "foo1", "value" => "updated"} ] + + update_data = put_in(update_data, ["object", "attachment"], []) + + {:ok, _} = Transmogrifier.handle_incoming(update_data) + + user = User.get_cached_by_ap_id(user.ap_id) + + assert User.Info.fields(user.info) == [] end test "it works for incoming update activities which lock the account" do From 37dd3867bb0439e4a2717eb780a1837196fcef00 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sun, 25 Aug 2019 19:39:37 +0000 Subject: [PATCH 044/400] Log admin/moderator actions --- CHANGELOG.md | 1 + docs/api/admin_api.md | 24 + lib/pleroma/moderation_log.ex | 433 ++++++++++++++++++ .../web/admin_api/admin_api_controller.ex | 183 +++++++- .../admin_api/views/moderation_log_view.ex | 26 ++ lib/pleroma/web/common_api/utils.ex | 3 +- lib/pleroma/web/ostatus/ostatus_controller.ex | 3 +- lib/pleroma/web/router.ex | 2 + .../20190818124341_create_moderation_log.exs | 11 + test/moderation_log_test.exs | 301 ++++++++++++ .../admin_api/admin_api_controller_test.exs | 241 +++++++++- 11 files changed, 1187 insertions(+), 41 deletions(-) create mode 100644 lib/pleroma/moderation_log.ex create mode 100644 lib/pleroma/web/admin_api/views/moderation_log_view.ex create mode 100644 priv/repo/migrations/20190818124341_create_moderation_log.exs create mode 100644 test/moderation_log_test.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c3051c94..2fdcb014a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,6 +94,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Relays: Added a task to list relay subscriptions. - Mix Tasks: `mix pleroma.database fix_likes_collections` - Federation: Remove `likes` from objects. +- Admin API: Added moderation log ### Changed - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 7ccb90836..d79c342be 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -694,3 +694,27 @@ Compile time settings (need instance reboot): ] } ``` + +## `/api/pleroma/admin/moderation_log` +### Get moderation log +- Method `GET` +- Params: + - *optional* `page`: **integer** page number + - *optional* `page_size`: **integer** number of users per page (default is `50`) +- Response: + +```json +[ + { + "data": { + "actor": { + "id": 1, + "nickname": "lain" + }, + "action": "relay_follow" + }, + "time": 1502812026, // timestamp + "message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message + } +] +``` diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex new file mode 100644 index 000000000..1ef6fe67a --- /dev/null +++ b/lib/pleroma/moderation_log.ex @@ -0,0 +1,433 @@ +defmodule Pleroma.ModerationLog do + use Ecto.Schema + + alias Pleroma.Activity + alias Pleroma.ModerationLog + alias Pleroma.Repo + alias Pleroma.User + + import Ecto.Query + + schema "moderation_log" do + field(:data, :map) + + timestamps() + end + + def get_all(page, page_size) do + from(q in __MODULE__, + order_by: [desc: q.inserted_at], + limit: ^page_size, + offset: ^((page - 1) * page_size) + ) + |> Repo.all() + end + + def insert_log(%{ + actor: %User{} = actor, + subject: %User{} = subject, + action: action, + permission: permission + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + subject: user_to_map(subject), + action: action, + permission: permission + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + action: "report_update", + subject: %Activity{data: %{"type" => "Flag"}} = subject + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "report_update", + subject: report_to_map(subject) + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + action: "report_response", + subject: %Activity{} = subject, + text: text + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "report_response", + subject: report_to_map(subject), + text: text + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + action: "status_update", + subject: %Activity{} = subject, + sensitive: sensitive, + visibility: visibility + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "status_update", + subject: status_to_map(subject), + sensitive: sensitive, + visibility: visibility + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + action: "status_delete", + subject_id: subject_id + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "status_delete", + subject_id: subject_id + } + }) + end + + @spec insert_log(%{actor: User, subject: User, action: String.t()}) :: + {:ok, ModerationLog} | {:error, any} + def insert_log(%{actor: %User{} = actor, subject: subject, action: action}) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: action, + subject: user_to_map(subject) + } + }) + end + + @spec insert_log(%{actor: User, subjects: [User], action: String.t()}) :: + {:ok, ModerationLog} | {:error, any} + def insert_log(%{actor: %User{} = actor, subjects: subjects, action: action}) do + subjects = Enum.map(subjects, &user_to_map/1) + + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: action, + subjects: subjects + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + followed: %User{} = followed, + follower: %User{} = follower, + action: "follow" + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "follow", + followed: user_to_map(followed), + follower: user_to_map(follower) + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + followed: %User{} = followed, + follower: %User{} = follower, + action: "unfollow" + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: "unfollow", + followed: user_to_map(followed), + follower: user_to_map(follower) + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + nicknames: nicknames, + tags: tags, + action: action + }) do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + nicknames: nicknames, + tags: tags, + action: action + } + }) + end + + def insert_log(%{ + actor: %User{} = actor, + action: action, + target: target + }) + when action in ["relay_follow", "relay_unfollow"] do + Repo.insert(%ModerationLog{ + data: %{ + actor: user_to_map(actor), + action: action, + target: target + } + }) + end + + defp user_to_map(%User{} = user) do + user + |> Map.from_struct() + |> Map.take([:id, :nickname]) + |> Map.put(:type, "user") + end + + defp report_to_map(%Activity{} = report) do + %{ + type: "report", + id: report.id, + state: report.data["state"] + } + end + + defp status_to_map(%Activity{} = status) do + %{ + type: "status", + id: status.id + } + end + + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => action, + "followed" => %{"nickname" => followed_nickname}, + "follower" => %{"nickname" => follower_nickname} + } + }) do + "@#{actor_nickname} made @#{follower_nickname} #{action} @#{followed_nickname}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "delete", + "subject" => %{"nickname" => subject_nickname, "type" => "user"} + } + }) do + "@#{actor_nickname} deleted user @#{subject_nickname}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "create", + "subjects" => subjects + } + }) do + nicknames = + subjects + |> Enum.map(&"@#{&1["nickname"]}") + |> Enum.join(", ") + + "@#{actor_nickname} created users: #{nicknames}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "activate", + "subject" => %{"nickname" => subject_nickname, "type" => "user"} + } + }) do + "@#{actor_nickname} activated user @#{subject_nickname}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "deactivate", + "subject" => %{"nickname" => subject_nickname, "type" => "user"} + } + }) do + "@#{actor_nickname} deactivated user @#{subject_nickname}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "nicknames" => nicknames, + "tags" => tags, + "action" => "tag" + } + }) do + nicknames_string = + nicknames + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags_string = tags |> Enum.join(", ") + + "@#{actor_nickname} added tags: #{tags_string} to users: #{nicknames_string}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "nicknames" => nicknames, + "tags" => tags, + "action" => "untag" + } + }) do + nicknames_string = + nicknames + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags_string = tags |> Enum.join(", ") + + "@#{actor_nickname} removed tags: #{tags_string} from users: #{nicknames_string}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "grant", + "subject" => %{"nickname" => subject_nickname}, + "permission" => permission + } + }) do + "@#{actor_nickname} made @#{subject_nickname} #{permission}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "revoke", + "subject" => %{"nickname" => subject_nickname}, + "permission" => permission + } + }) do + "@#{actor_nickname} revoked #{permission} role from @#{subject_nickname}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "relay_follow", + "target" => target + } + }) do + "@#{actor_nickname} followed relay: #{target}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "relay_unfollow", + "target" => target + } + }) do + "@#{actor_nickname} unfollowed relay: #{target}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "report_update", + "subject" => %{"id" => subject_id, "state" => state, "type" => "report"} + } + }) do + "@#{actor_nickname} updated report ##{subject_id} with '#{state}' state" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "report_response", + "subject" => %{"id" => subject_id, "type" => "report"}, + "text" => text + } + }) do + "@#{actor_nickname} responded with '#{text}' to report ##{subject_id}" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "status_update", + "subject" => %{"id" => subject_id, "type" => "status"}, + "sensitive" => nil, + "visibility" => visibility + } + }) do + "@#{actor_nickname} updated status ##{subject_id}, set visibility: '#{visibility}'" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "status_update", + "subject" => %{"id" => subject_id, "type" => "status"}, + "sensitive" => sensitive, + "visibility" => nil + } + }) do + "@#{actor_nickname} updated status ##{subject_id}, set sensitive: '#{sensitive}'" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "status_update", + "subject" => %{"id" => subject_id, "type" => "status"}, + "sensitive" => sensitive, + "visibility" => visibility + } + }) do + "@#{actor_nickname} updated status ##{subject_id}, set sensitive: '#{sensitive}', visibility: '#{ + visibility + }'" + end + + @spec get_log_entry_message(ModerationLog) :: String.t() + def get_log_entry_message(%ModerationLog{ + data: %{ + "actor" => %{"nickname" => actor_nickname}, + "action" => "status_delete", + "subject_id" => subject_id + } + }) do + "@#{actor_nickname} deleted status ##{subject_id}" + end +end diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 048ac8019..544b9d7d8 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -5,6 +5,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do use Pleroma.Web, :controller alias Pleroma.Activity + alias Pleroma.ModerationLog alias Pleroma.User alias Pleroma.UserInviteToken alias Pleroma.Web.ActivityPub.ActivityPub @@ -12,6 +13,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do alias Pleroma.Web.AdminAPI.AccountView alias Pleroma.Web.AdminAPI.Config alias Pleroma.Web.AdminAPI.ConfigView + alias Pleroma.Web.AdminAPI.ModerationLogView alias Pleroma.Web.AdminAPI.ReportView alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.CommonAPI @@ -25,35 +27,61 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do action_fallback(:errors) - def user_delete(conn, %{"nickname" => nickname}) do - User.get_cached_by_nickname(nickname) - |> User.delete() + def user_delete(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do + user = User.get_cached_by_nickname(nickname) + User.delete(user) + + ModerationLog.insert_log(%{ + actor: admin, + subject: user, + action: "delete" + }) conn |> json(nickname) end - def user_follow(conn, %{"follower" => follower_nick, "followed" => followed_nick}) do + def user_follow(%{assigns: %{user: admin}} = conn, %{ + "follower" => follower_nick, + "followed" => followed_nick + }) do with %User{} = follower <- User.get_cached_by_nickname(follower_nick), %User{} = followed <- User.get_cached_by_nickname(followed_nick) do User.follow(follower, followed) + + ModerationLog.insert_log(%{ + actor: admin, + followed: followed, + follower: follower, + action: "follow" + }) end conn |> json("ok") end - def user_unfollow(conn, %{"follower" => follower_nick, "followed" => followed_nick}) do + def user_unfollow(%{assigns: %{user: admin}} = conn, %{ + "follower" => follower_nick, + "followed" => followed_nick + }) do with %User{} = follower <- User.get_cached_by_nickname(follower_nick), %User{} = followed <- User.get_cached_by_nickname(followed_nick) do User.unfollow(follower, followed) + + ModerationLog.insert_log(%{ + actor: admin, + followed: followed, + follower: follower, + action: "unfollow" + }) end conn |> json("ok") end - def users_create(conn, %{"users" => users}) do + def users_create(%{assigns: %{user: admin}} = conn, %{"users" => users}) do changesets = Enum.map(users, fn %{"nickname" => nickname, "email" => email, "password" => password} -> user_data = %{ @@ -78,10 +106,17 @@ def users_create(conn, %{"users" => users}) do |> Map.values() |> Enum.map(fn user -> {:ok, user} = User.post_register_action(user) + user end) |> Enum.map(&AccountView.render("created.json", %{user: &1})) + ModerationLog.insert_log(%{ + actor: admin, + subjects: Map.values(users), + action: "create" + }) + conn |> json(res) @@ -129,23 +164,47 @@ def list_user_statuses(conn, %{"nickname" => nickname} = params) do end end - def user_toggle_activation(conn, %{"nickname" => nickname}) do + def user_toggle_activation(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do user = User.get_cached_by_nickname(nickname) {:ok, updated_user} = User.deactivate(user, !user.info.deactivated) + action = if user.info.deactivated, do: "activate", else: "deactivate" + + ModerationLog.insert_log(%{ + actor: admin, + subject: user, + action: action + }) + conn |> json(AccountView.render("show.json", %{user: updated_user})) end - def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do - with {:ok, _} <- User.tag(nicknames, tags), - do: json_response(conn, :no_content, "") + def tag_users(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames, "tags" => tags}) do + with {:ok, _} <- User.tag(nicknames, tags) do + ModerationLog.insert_log(%{ + actor: admin, + nicknames: nicknames, + tags: tags, + action: "tag" + }) + + json_response(conn, :no_content, "") + end end - def untag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do - with {:ok, _} <- User.untag(nicknames, tags), - do: json_response(conn, :no_content, "") + def untag_users(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames, "tags" => tags}) do + with {:ok, _} <- User.untag(nicknames, tags) do + ModerationLog.insert_log(%{ + actor: admin, + nicknames: nicknames, + tags: tags, + action: "untag" + }) + + json_response(conn, :no_content, "") + end end def list_users(conn, params) do @@ -186,7 +245,10 @@ defp maybe_parse_filters(filters) do |> Enum.into(%{}, &{&1, true}) end - def right_add(conn, %{"permission_group" => permission_group, "nickname" => nickname}) + def right_add(%{assigns: %{user: admin}} = conn, %{ + "permission_group" => permission_group, + "nickname" => nickname + }) when permission_group in ["moderator", "admin"] do user = User.get_cached_by_nickname(nickname) @@ -201,6 +263,13 @@ def right_add(conn, %{"permission_group" => permission_group, "nickname" => nick |> Ecto.Changeset.change() |> Ecto.Changeset.put_embed(:info, info_cng) + ModerationLog.insert_log(%{ + action: "grant", + actor: admin, + subject: user, + permission: permission_group + }) + {:ok, _user} = User.update_and_set_cache(cng) json(conn, info) @@ -221,7 +290,7 @@ def right_get(conn, %{"nickname" => nickname}) do end def right_delete( - %{assigns: %{user: %User{:nickname => admin_nickname}}} = conn, + %{assigns: %{user: %User{:nickname => admin_nickname} = admin}} = conn, %{ "permission_group" => permission_group, "nickname" => nickname @@ -245,6 +314,13 @@ def right_delete( {:ok, _user} = User.update_and_set_cache(cng) + ModerationLog.insert_log(%{ + action: "revoke", + actor: admin, + subject: user, + permission: permission_group + }) + json(conn, info) end end @@ -253,15 +329,33 @@ def right_delete(conn, _) do render_error(conn, :not_found, "No such permission_group") end - def set_activation_status(conn, %{"nickname" => nickname, "status" => status}) do + def set_activation_status(%{assigns: %{user: admin}} = conn, %{ + "nickname" => nickname, + "status" => status + }) do with {:ok, status} <- Ecto.Type.cast(:boolean, status), %User{} = user <- User.get_cached_by_nickname(nickname), - {:ok, _} <- User.deactivate(user, !status), - do: json_response(conn, :no_content, "") + {:ok, _} <- User.deactivate(user, !status) do + action = if(user.info.deactivated, do: "activate", else: "deactivate") + + ModerationLog.insert_log(%{ + actor: admin, + subject: user, + action: action + }) + + json_response(conn, :no_content, "") + end end - def relay_follow(conn, %{"relay_url" => target}) do + def relay_follow(%{assigns: %{user: admin}} = conn, %{"relay_url" => target}) do with {:ok, _message} <- Relay.follow(target) do + ModerationLog.insert_log(%{ + action: "relay_follow", + actor: admin, + target: target + }) + json(conn, target) else _ -> @@ -271,8 +365,14 @@ def relay_follow(conn, %{"relay_url" => target}) do end end - def relay_unfollow(conn, %{"relay_url" => target}) do + def relay_unfollow(%{assigns: %{user: admin}} = conn, %{"relay_url" => target}) do with {:ok, _message} <- Relay.unfollow(target) do + ModerationLog.insert_log(%{ + action: "relay_unfollow", + actor: admin, + target: target + }) + json(conn, target) else _ -> @@ -363,8 +463,14 @@ def report_show(conn, %{"id" => id}) do end end - def report_update_state(conn, %{"id" => id, "state" => state}) do + def report_update_state(%{assigns: %{user: admin}} = conn, %{"id" => id, "state" => state}) do with {:ok, report} <- CommonAPI.update_report_state(id, state) do + ModerationLog.insert_log(%{ + action: "report_update", + actor: admin, + subject: report + }) + conn |> put_view(ReportView) |> render("show.json", %{report: report}) @@ -381,6 +487,13 @@ def report_respond(%{assigns: %{user: user}} = conn, %{"id" => id} = params) do {:ok, activity} = CommonAPI.post(user, params) + ModerationLog.insert_log(%{ + action: "report_response", + actor: user, + subject: activity, + text: params["status"] + }) + conn |> put_view(StatusView) |> render("status.json", %{activity: activity}) @@ -393,8 +506,18 @@ def report_respond(%{assigns: %{user: user}} = conn, %{"id" => id} = params) do end end - def status_update(conn, %{"id" => id} = params) do + def status_update(%{assigns: %{user: admin}} = conn, %{"id" => id} = params) do with {:ok, activity} <- CommonAPI.update_activity_scope(id, params) do + {:ok, sensitive} = Ecto.Type.cast(:boolean, params["sensitive"]) + + ModerationLog.insert_log(%{ + action: "status_update", + actor: admin, + subject: activity, + sensitive: sensitive, + visibility: params["visibility"] + }) + conn |> put_view(StatusView) |> render("status.json", %{activity: activity}) @@ -403,10 +526,26 @@ def status_update(conn, %{"id" => id} = params) do def status_delete(%{assigns: %{user: user}} = conn, %{"id" => id}) do with {:ok, %Activity{}} <- CommonAPI.delete(id, user) do + ModerationLog.insert_log(%{ + action: "status_delete", + actor: user, + subject_id: id + }) + json(conn, %{}) end end + def list_log(conn, params) do + {page, page_size} = page_params(params) + + log = ModerationLog.get_all(page, page_size) + + conn + |> put_view(ModerationLogView) + |> render("index.json", %{log: log}) + end + def migrate_to_db(conn, _params) do Mix.Tasks.Pleroma.Config.run(["migrate_to_db"]) json(conn, %{}) diff --git a/lib/pleroma/web/admin_api/views/moderation_log_view.ex b/lib/pleroma/web/admin_api/views/moderation_log_view.ex new file mode 100644 index 000000000..b3fc7cfe5 --- /dev/null +++ b/lib/pleroma/web/admin_api/views/moderation_log_view.ex @@ -0,0 +1,26 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.AdminAPI.ModerationLogView do + use Pleroma.Web, :view + + alias Pleroma.ModerationLog + + def render("index.json", %{log: log}) do + render_many(log, __MODULE__, "show.json", as: :log_entry) + end + + def render("show.json", %{log_entry: log_entry}) do + time = + log_entry.inserted_at + |> DateTime.from_naive!("Etc/UTC") + |> DateTime.to_unix() + + %{ + data: log_entry.data, + time: time, + message: ModerationLog.get_log_entry_message(log_entry) + } + end +end diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 61b96aba9..6958c7511 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -93,8 +93,7 @@ def attachments_from_ids_descs(ids, descs_str) do Activity.t() | nil, String.t(), Participation.t() | nil - ) :: - {list(String.t()), list(String.t())} + ) :: {list(String.t()), list(String.t())} def get_to_and_cc(_, _, _, _, %Participation{} = participation) do participation = Repo.preload(participation, :recipients) diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index fdba0f77f..07e2a4c2d 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -37,8 +37,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do action_fallback(:errors) def feed_redirect(%{assigns: %{format: "html"}} = conn, %{"nickname" => nickname}) do - with {_, %User{} = user} <- - {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do + with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do RedirectController.redirector_with_meta(conn, %{user: user}) end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 97c5016d5..f800d16fd 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -198,6 +198,8 @@ defmodule Pleroma.Web.Router do post("/config", AdminAPIController, :config_update) get("/config/migrate_to_db", AdminAPIController, :migrate_to_db) get("/config/migrate_from_db", AdminAPIController, :migrate_from_db) + + get("/moderation_log", AdminAPIController, :list_log) end scope "/", Pleroma.Web.TwitterAPI do diff --git a/priv/repo/migrations/20190818124341_create_moderation_log.exs b/priv/repo/migrations/20190818124341_create_moderation_log.exs new file mode 100644 index 000000000..cef6636f3 --- /dev/null +++ b/priv/repo/migrations/20190818124341_create_moderation_log.exs @@ -0,0 +1,11 @@ +defmodule Pleroma.Repo.Migrations.CreateModerationLog do + use Ecto.Migration + + def change do + create table(:moderation_log) do + add(:data, :map) + + timestamps() + end + end +end diff --git a/test/moderation_log_test.exs b/test/moderation_log_test.exs new file mode 100644 index 000000000..c78708471 --- /dev/null +++ b/test/moderation_log_test.exs @@ -0,0 +1,301 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.ModerationLogTest do + alias Pleroma.Activity + alias Pleroma.ModerationLog + + use Pleroma.DataCase + + import Pleroma.Factory + + describe "user moderation" do + setup do + admin = insert(:user, info: %{is_admin: true}) + moderator = insert(:user, info: %{is_moderator: true}) + subject1 = insert(:user) + subject2 = insert(:user) + + [admin: admin, moderator: moderator, subject1: subject1, subject2: subject2] + end + + test "logging user deletion by moderator", %{moderator: moderator, subject1: subject1} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + subject: subject1, + action: "delete" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} deleted user @#{subject1.nickname}" + end + + test "logging user creation by moderator", %{ + moderator: moderator, + subject1: subject1, + subject2: subject2 + } do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + subjects: [subject1, subject2], + action: "create" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} created users: @#{subject1.nickname}, @#{subject2.nickname}" + end + + test "logging user follow by admin", %{admin: admin, subject1: subject1, subject2: subject2} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: admin, + followed: subject1, + follower: subject2, + action: "follow" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{admin.nickname} made @#{subject2.nickname} follow @#{subject1.nickname}" + end + + test "logging user unfollow by admin", %{admin: admin, subject1: subject1, subject2: subject2} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: admin, + followed: subject1, + follower: subject2, + action: "unfollow" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{admin.nickname} made @#{subject2.nickname} unfollow @#{subject1.nickname}" + end + + test "logging user tagged by admin", %{admin: admin, subject1: subject1, subject2: subject2} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: admin, + nicknames: [subject1.nickname, subject2.nickname], + tags: ["foo", "bar"], + action: "tag" + }) + + log = Repo.one(ModerationLog) + + users = + [subject1.nickname, subject2.nickname] + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags = ["foo", "bar"] |> Enum.join(", ") + + assert ModerationLog.get_log_entry_message(log) == + "@#{admin.nickname} added tags: #{tags} to users: #{users}" + end + + test "logging user untagged by admin", %{admin: admin, subject1: subject1, subject2: subject2} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: admin, + nicknames: [subject1.nickname, subject2.nickname], + tags: ["foo", "bar"], + action: "untag" + }) + + log = Repo.one(ModerationLog) + + users = + [subject1.nickname, subject2.nickname] + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags = ["foo", "bar"] |> Enum.join(", ") + + assert ModerationLog.get_log_entry_message(log) == + "@#{admin.nickname} removed tags: #{tags} from users: #{users}" + end + + test "logging user grant by moderator", %{moderator: moderator, subject1: subject1} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + subject: subject1, + action: "grant", + permission: "moderator" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} made @#{subject1.nickname} moderator" + end + + test "logging user revoke by moderator", %{moderator: moderator, subject1: subject1} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + subject: subject1, + action: "revoke", + permission: "moderator" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} revoked moderator role from @#{subject1.nickname}" + end + + test "logging relay follow", %{moderator: moderator} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "relay_follow", + target: "https://example.org/relay" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} followed relay: https://example.org/relay" + end + + test "logging relay unfollow", %{moderator: moderator} do + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "relay_unfollow", + target: "https://example.org/relay" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} unfollowed relay: https://example.org/relay" + end + + test "logging report update", %{moderator: moderator} do + report = %Activity{ + id: "9m9I1F4p8ftrTP6QTI", + data: %{ + "type" => "Flag", + "state" => "resolved" + } + } + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "report_update", + subject: report + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} updated report ##{report.id} with 'resolved' state" + end + + test "logging report response", %{moderator: moderator} do + report = %Activity{ + id: "9m9I1F4p8ftrTP6QTI", + data: %{ + "type" => "Note" + } + } + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "report_response", + subject: report, + text: "look at this" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} responded with 'look at this' to report ##{report.id}" + end + + test "logging status sensitivity update", %{moderator: moderator} do + note = insert(:note_activity) + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "status_update", + subject: note, + sensitive: "true", + visibility: nil + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} updated status ##{note.id}, set sensitive: 'true'" + end + + test "logging status visibility update", %{moderator: moderator} do + note = insert(:note_activity) + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "status_update", + subject: note, + sensitive: nil, + visibility: "private" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} updated status ##{note.id}, set visibility: 'private'" + end + + test "logging status sensitivity & visibility update", %{moderator: moderator} do + note = insert(:note_activity) + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "status_update", + subject: note, + sensitive: "true", + visibility: "private" + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} updated status ##{note.id}, set sensitive: 'true', visibility: 'private'" + end + + test "logging status deletion", %{moderator: moderator} do + note = insert(:note_activity) + + {:ok, _} = + ModerationLog.insert_log(%{ + actor: moderator, + action: "status_delete", + subject_id: note.id + }) + + log = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log) == + "@#{moderator.nickname} deleted status ##{note.id}" + end + end +end diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index ab829d6bd..1afdb6a50 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -7,6 +7,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do alias Pleroma.Activity alias Pleroma.HTML + alias Pleroma.ModerationLog + alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken alias Pleroma.Web.CommonAPI @@ -24,6 +26,14 @@ test "Delete" do |> put_req_header("accept", "application/json") |> delete("/api/pleroma/admin/users?nickname=#{user.nickname}") + log_entry = Repo.one(ModerationLog) + + assert log_entry.data["subject"]["nickname"] == user.nickname + assert log_entry.data["action"] == "delete" + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} deleted user @#{user.nickname}" + assert json_response(conn, 200) == user.nickname end @@ -51,6 +61,11 @@ test "Create" do response = json_response(conn, 200) |> Enum.map(&Map.get(&1, "type")) assert response == ["success", "success"] + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} created users: @lain2, @lain" end test "Cannot create user with exisiting email" do @@ -218,6 +233,11 @@ test "allows to force-follow another user" do follower = User.get_cached_by_id(follower.id) assert User.following?(follower, user) + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} made @#{follower.nickname} follow @#{user.nickname}" end end @@ -241,6 +261,11 @@ test "allows to force-unfollow another user" do follower = User.get_cached_by_id(follower.id) refute User.following?(follower, user) + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} made @#{follower.nickname} unfollow @#{user.nickname}" end end @@ -261,17 +286,30 @@ test "allows to force-unfollow another user" do }&tags[]=foo&tags[]=bar" ) - %{conn: conn, user1: user1, user2: user2, user3: user3} + %{conn: conn, admin: admin, user1: user1, user2: user2, user3: user3} end test "it appends specified tags to users with specified nicknames", %{ conn: conn, + admin: admin, user1: user1, user2: user2 } do assert json_response(conn, :no_content) assert User.get_cached_by_id(user1.id).tags == ["x", "foo", "bar"] assert User.get_cached_by_id(user2.id).tags == ["y", "foo", "bar"] + + log_entry = Repo.one(ModerationLog) + + users = + [user1.nickname, user2.nickname] + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags = ["foo", "bar"] |> Enum.join(", ") + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} added tags: #{tags} to users: #{users}" end test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do @@ -297,17 +335,30 @@ test "it does not modify tags of not specified users", %{conn: conn, user3: user }&tags[]=x&tags[]=z" ) - %{conn: conn, user1: user1, user2: user2, user3: user3} + %{conn: conn, admin: admin, user1: user1, user2: user2, user3: user3} end test "it removes specified tags from users with specified nicknames", %{ conn: conn, + admin: admin, user1: user1, user2: user2 } do assert json_response(conn, :no_content) assert User.get_cached_by_id(user1.id).tags == [] assert User.get_cached_by_id(user2.id).tags == ["y"] + + log_entry = Repo.one(ModerationLog) + + users = + [user1.nickname, user2.nickname] + |> Enum.map(&"@#{&1}") + |> Enum.join(", ") + + tags = ["x", "z"] |> Enum.join(", ") + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} removed tags: #{tags} from users: #{users}" end test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do @@ -345,6 +396,11 @@ test "/:right POST, can add to a permission group" do assert json_response(conn, 200) == %{ "is_admin" => true } + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} made @#{user.nickname} admin" end test "/:right DELETE, can remove from a permission group" do @@ -360,6 +416,11 @@ test "/:right DELETE, can remove from a permission group" do assert json_response(conn, 200) == %{ "is_admin" => false } + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} revoked admin role from @#{user.nickname}" end end @@ -372,10 +433,10 @@ test "/:right DELETE, can remove from a permission group" do |> assign(:user, admin) |> put_req_header("accept", "application/json") - %{conn: conn} + %{conn: conn, admin: admin} end - test "deactivates the user", %{conn: conn} do + test "deactivates the user", %{conn: conn, admin: admin} do user = insert(:user) conn = @@ -385,9 +446,14 @@ test "deactivates the user", %{conn: conn} do user = User.get_cached_by_id(user.id) assert user.info.deactivated == true assert json_response(conn, :no_content) + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} deactivated user @#{user.nickname}" end - test "activates the user", %{conn: conn} do + test "activates the user", %{conn: conn, admin: admin} do user = insert(:user, info: %{deactivated: true}) conn = @@ -397,6 +463,11 @@ test "activates the user", %{conn: conn} do user = User.get_cached_by_id(user.id) assert user.info.deactivated == false assert json_response(conn, :no_content) + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} activated user @#{user.nickname}" end test "returns 403 when requested by a non-admin", %{conn: conn} do @@ -987,6 +1058,11 @@ test "PATCH /api/pleroma/admin/users/:nickname/toggle_activation" do "avatar" => User.avatar_url(user) |> MediaProxy.url(), "display_name" => HTML.strip_tags(user.name || user.nickname) } + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} deactivated user @#{user.nickname}" end describe "GET /api/pleroma/admin/users/invite_token" do @@ -1172,25 +1248,35 @@ test "returns 404 when report id is invalid", %{conn: conn} do "status_ids" => [activity.id] }) - %{conn: assign(conn, :user, admin), id: report_id} + %{conn: assign(conn, :user, admin), id: report_id, admin: admin} end - test "mark report as resolved", %{conn: conn, id: id} do + test "mark report as resolved", %{conn: conn, id: id, admin: admin} do response = conn |> put("/api/pleroma/admin/reports/#{id}", %{"state" => "resolved"}) |> json_response(:ok) assert response["state"] == "resolved" + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} updated report ##{id} with 'resolved' state" end - test "closes report", %{conn: conn, id: id} do + test "closes report", %{conn: conn, id: id, admin: admin} do response = conn |> put("/api/pleroma/admin/reports/#{id}", %{"state" => "closed"}) |> json_response(:ok) assert response["state"] == "closed" + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} updated report ##{id} with 'closed' state" end test "returns 400 when state is unknown", %{conn: conn, id: id} do @@ -1321,14 +1407,15 @@ test "returns 403 when requested by anonymous" do end end + # describe "POST /api/pleroma/admin/reports/:id/respond" do setup %{conn: conn} do admin = insert(:user, info: %{is_admin: true}) - %{conn: assign(conn, :user, admin)} + %{conn: assign(conn, :user, admin), admin: admin} end - test "returns created dm", %{conn: conn} do + test "returns created dm", %{conn: conn, admin: admin} do [reporter, target_user] = insert_pair(:user) activity = insert(:note_activity, user: target_user) @@ -1351,6 +1438,13 @@ test "returns created dm", %{conn: conn} do assert reporter.nickname in recipients assert response["content"] == "I will check it out" assert response["visibility"] == "direct" + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} responded with 'I will check it out' to report ##{ + response["id"] + }" end test "returns 400 when status is missing", %{conn: conn} do @@ -1374,10 +1468,10 @@ test "returns 404 when report id is invalid", %{conn: conn} do admin = insert(:user, info: %{is_admin: true}) activity = insert(:note_activity) - %{conn: assign(conn, :user, admin), id: activity.id} + %{conn: assign(conn, :user, admin), id: activity.id, admin: admin} end - test "toggle sensitive flag", %{conn: conn, id: id} do + test "toggle sensitive flag", %{conn: conn, id: id, admin: admin} do response = conn |> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "true"}) @@ -1385,6 +1479,11 @@ test "toggle sensitive flag", %{conn: conn, id: id} do assert response["sensitive"] + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} updated status ##{id}, set sensitive: 'true'" + response = conn |> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "false"}) @@ -1393,7 +1492,7 @@ test "toggle sensitive flag", %{conn: conn, id: id} do refute response["sensitive"] end - test "change visibility flag", %{conn: conn, id: id} do + test "change visibility flag", %{conn: conn, id: id, admin: admin} do response = conn |> put("/api/pleroma/admin/statuses/#{id}", %{"visibility" => "public"}) @@ -1401,6 +1500,11 @@ test "change visibility flag", %{conn: conn, id: id} do assert response["visibility"] == "public" + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} updated status ##{id}, set visibility: 'public'" + response = conn |> put("/api/pleroma/admin/statuses/#{id}", %{"visibility" => "private"}) @@ -1430,15 +1534,20 @@ test "returns 400 when visibility is unknown", %{conn: conn, id: id} do admin = insert(:user, info: %{is_admin: true}) activity = insert(:note_activity) - %{conn: assign(conn, :user, admin), id: activity.id} + %{conn: assign(conn, :user, admin), id: activity.id, admin: admin} end - test "deletes status", %{conn: conn, id: id} do + test "deletes status", %{conn: conn, id: id, admin: admin} do conn |> delete("/api/pleroma/admin/statuses/#{id}") |> json_response(:ok) refute Activity.get_by_id(id) + + log_entry = Repo.one(ModerationLog) + + assert ModerationLog.get_log_entry_message(log_entry) == + "@#{admin.nickname} deleted status ##{id}" end test "returns error when status is not exist", %{conn: conn} do @@ -2139,6 +2248,108 @@ test "returns private statuses with godmode on", %{conn: conn, user: user} do assert json_response(conn, 200) |> length() == 5 end end + + describe "GET /api/pleroma/admin/moderation_log" do + setup %{conn: conn} do + admin = insert(:user, info: %{is_admin: true}) + + %{conn: assign(conn, :user, admin), admin: admin} + end + + test "returns the log", %{conn: conn, admin: admin} do + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_follow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.truncate(~N[2017-08-15 15:47:06.597036], :second) + }) + + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_unfollow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.truncate(~N[2017-08-16 15:47:06.597036], :second) + }) + + conn = get(conn, "/api/pleroma/admin/moderation_log") + + response = json_response(conn, 200) + [first_entry, second_entry] = response + + assert response |> length() == 2 + assert first_entry["data"]["action"] == "relay_unfollow" + + assert first_entry["message"] == + "@#{admin.nickname} unfollowed relay: https://example.org/relay" + + assert second_entry["data"]["action"] == "relay_follow" + + assert second_entry["message"] == + "@#{admin.nickname} followed relay: https://example.org/relay" + end + + test "returns the log with pagination", %{conn: conn, admin: admin} do + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_follow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.truncate(~N[2017-08-15 15:47:06.597036], :second) + }) + + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_unfollow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.truncate(~N[2017-08-16 15:47:06.597036], :second) + }) + + conn1 = get(conn, "/api/pleroma/admin/moderation_log?page_size=1&page=1") + + response1 = json_response(conn1, 200) + [first_entry] = response1 + + assert response1 |> length() == 1 + assert first_entry["data"]["action"] == "relay_unfollow" + + assert first_entry["message"] == + "@#{admin.nickname} unfollowed relay: https://example.org/relay" + + conn2 = get(conn, "/api/pleroma/admin/moderation_log?page_size=1&page=2") + + response2 = json_response(conn2, 200) + [second_entry] = response2 + + assert response2 |> length() == 1 + assert second_entry["data"]["action"] == "relay_follow" + + assert second_entry["message"] == + "@#{admin.nickname} followed relay: https://example.org/relay" + end + end end # Needed for testing From 3b1b631c2aedc8e359c296b11237fa4f6edd31e5 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 18:59:57 +0700 Subject: [PATCH 045/400] Add validation in Pleroma.List.create/2 --- lib/pleroma/list.ex | 18 +++++++++++------- test/list_test.exs | 7 +++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex index 1d320206e..c572380c2 100644 --- a/lib/pleroma/list.ex +++ b/lib/pleroma/list.ex @@ -109,15 +109,19 @@ def rename(%Pleroma.List{} = list, title) do end def create(title, %User{} = creator) do - list = %Pleroma.List{user_id: creator.id, title: title} + changeset = title_changeset(%Pleroma.List{user_id: creator.id}, %{title: title}) - Repo.transaction(fn -> - list = Repo.insert!(list) + if changeset.valid? do + Repo.transaction(fn -> + list = Repo.insert!(changeset) - list - |> change(ap_id: "#{creator.ap_id}/lists/#{list.id}") - |> Repo.update!() - end) + list + |> change(ap_id: "#{creator.ap_id}/lists/#{list.id}") + |> Repo.update!() + end) + else + {:error, changeset} + end end def follow(%Pleroma.List{following: following} = list, %User{} = followed) do diff --git a/test/list_test.exs b/test/list_test.exs index f39033d02..8efba75ea 100644 --- a/test/list_test.exs +++ b/test/list_test.exs @@ -15,6 +15,13 @@ test "creating a list" do assert title == "title" end + test "validates title" do + user = insert(:user) + + assert {:error, changeset} = Pleroma.List.create("", user) + assert changeset.errors == [title: {"can't be blank", [validation: :required]}] + end + test "getting a list not belonging to the user" do user = insert(:user) other_user = insert(:user) From 4d82bc8b0b5a0b8b584b43330f902f8dc9637d3d Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 19:16:40 +0700 Subject: [PATCH 046/400] Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController --- .../controllers/fallback_controller.ex | 34 +++++++++++++++++++ .../mastodon_api/mastodon_api_controller.ex | 31 +---------------- .../mastodon_api/subscription_controller.ex | 4 +-- 3 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex diff --git a/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex new file mode 100644 index 000000000..41243d5e7 --- /dev/null +++ b/lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex @@ -0,0 +1,34 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.MastodonAPI.FallbackController do + use Pleroma.Web, :controller + + def call(conn, {:error, %Ecto.Changeset{} = changeset}) do + error_message = + changeset + |> Ecto.Changeset.traverse_errors(fn {message, _opt} -> message end) + |> Enum.map_join(", ", fn {_k, v} -> v end) + + conn + |> put_status(:unprocessable_entity) + |> json(%{error: error_message}) + end + + def call(conn, {:error, :not_found}) do + render_error(conn, :not_found, "Record not found") + end + + def call(conn, {:error, error_message}) do + conn + |> put_status(:bad_request) + |> json(%{error: error_message}) + end + + def call(conn, _) do + conn + |> put_status(:internal_server_error) + |> json(dgettext("errors", "Something went wrong")) + end +end diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 53cf95fbb..e51b2d89c 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -83,7 +83,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do @local_mastodon_name "Mastodon-Local" - action_fallback(:errors) + action_fallback(Pleroma.Web.MastodonAPI.FallbackController) def create_app(conn, params) do scopes = Scopes.fetch_scopes(params, ["read"]) @@ -1587,35 +1587,6 @@ def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do json(conn, %{}) end - # fallback action - # - def errors(conn, {:error, %Changeset{} = changeset}) do - error_message = - changeset - |> Changeset.traverse_errors(fn {message, _opt} -> message end) - |> Enum.map_join(", ", fn {_k, v} -> v end) - - conn - |> put_status(:unprocessable_entity) - |> json(%{error: error_message}) - end - - def errors(conn, {:error, :not_found}) do - render_error(conn, :not_found, "Record not found") - end - - def errors(conn, {:error, error_message}) do - conn - |> put_status(:bad_request) - |> json(%{error: error_message}) - end - - def errors(conn, _) do - conn - |> put_status(:internal_server_error) - |> json(dgettext("errors", "Something went wrong")) - end - def suggestions(%{assigns: %{user: user}} = conn, _) do suggestions = Config.get(:suggestions) diff --git a/lib/pleroma/web/mastodon_api/subscription_controller.ex b/lib/pleroma/web/mastodon_api/subscription_controller.ex index 255ee2f18..e2b17aab1 100644 --- a/lib/pleroma/web/mastodon_api/subscription_controller.ex +++ b/lib/pleroma/web/mastodon_api/subscription_controller.ex @@ -64,8 +64,6 @@ def errors(conn, {:error, :not_found}) do end def errors(conn, _) do - conn - |> put_status(:internal_server_error) - |> json(dgettext("errors", "Something went wrong")) + Pleroma.Web.MastodonAPI.FallbackController.call(conn, nil) end end From 30510ade0e2f813413c5599245adc4dae8c7ffd8 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 19:37:54 +0700 Subject: [PATCH 047/400] Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests --- .../controllers/list_controller.ex | 84 +++++++++ .../mastodon_api/mastodon_api_controller.ex | 76 -------- .../web/mastodon_api/views/list_view.ex | 6 +- lib/pleroma/web/router.ex | 16 +- .../controllers/list_controller_test.exs | 166 ++++++++++++++++++ .../mastodon_api_controller_test.exs | 101 +---------- .../{ => views}/list_view_test.exs | 14 +- 7 files changed, 274 insertions(+), 189 deletions(-) create mode 100644 lib/pleroma/web/mastodon_api/controllers/list_controller.ex create mode 100644 test/web/mastodon_api/controllers/list_controller_test.exs rename test/web/mastodon_api/{ => views}/list_view_test.exs (56%) diff --git a/lib/pleroma/web/mastodon_api/controllers/list_controller.ex b/lib/pleroma/web/mastodon_api/controllers/list_controller.ex new file mode 100644 index 000000000..2873deda8 --- /dev/null +++ b/lib/pleroma/web/mastodon_api/controllers/list_controller.ex @@ -0,0 +1,84 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.MastodonAPI.ListController do + use Pleroma.Web, :controller + + alias Pleroma.User + alias Pleroma.Web.MastodonAPI.AccountView + + plug(:list_by_id_and_user when action not in [:index, :create]) + + action_fallback(Pleroma.Web.MastodonAPI.FallbackController) + + # GET /api/v1/lists + def index(%{assigns: %{user: user}} = conn, opts) do + lists = Pleroma.List.for_user(user, opts) + render(conn, "index.json", lists: lists) + end + + # POST /api/v1/lists + def create(%{assigns: %{user: user}} = conn, %{"title" => title}) do + with {:ok, %Pleroma.List{} = list} <- Pleroma.List.create(title, user) do + render(conn, "show.json", list: list) + end + end + + # GET /api/v1/lists/:id + def show(%{assigns: %{list: list}} = conn, _) do + render(conn, "show.json", list: list) + end + + # PUT /api/v1/lists/:id + def update(%{assigns: %{list: list}} = conn, %{"title" => title}) do + with {:ok, list} <- Pleroma.List.rename(list, title) do + render(conn, "show.json", list: list) + end + end + + # DELETE /api/v1/lists/:id + def delete(%{assigns: %{list: list}} = conn, _) do + with {:ok, _list} <- Pleroma.List.delete(list) do + json(conn, %{}) + end + end + + # GET /api/v1/lists/:id/accounts + def list_accounts(%{assigns: %{user: user, list: list}} = conn, _) do + with {:ok, users} <- Pleroma.List.get_following(list) do + conn + |> put_view(AccountView) + |> render("accounts.json", for: user, users: users, as: :user) + end + end + + # POST /api/v1/lists/:id/accounts + def add_to_list(%{assigns: %{list: list}} = conn, %{"account_ids" => account_ids}) do + Enum.each(account_ids, fn account_id -> + with %User{} = followed <- User.get_cached_by_id(account_id) do + Pleroma.List.follow(list, followed) + end + end) + + json(conn, %{}) + end + + # DELETE /api/v1/lists/:id/accounts + def remove_from_list(%{assigns: %{list: list}} = conn, %{"account_ids" => account_ids}) do + Enum.each(account_ids, fn account_id -> + with %User{} = followed <- User.get_cached_by_id(account_id) do + Pleroma.List.unfollow(list, followed) + end + end) + + json(conn, %{}) + end + + defp list_by_id_and_user(%{assigns: %{user: user}, params: %{"id" => id}} = conn, _) do + case Pleroma.List.get(id, user) do + %Pleroma.List{} = list -> assign(conn, :list, list) + nil -> conn |> render_error(:not_found, "List not found") |> halt() + end + end +end diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e51b2d89c..31b0aaca0 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1205,88 +1205,12 @@ def bookmarks(%{assigns: %{user: user}} = conn, params) do |> render("index.json", %{activities: activities, for: user, as: :activity}) end - def get_lists(%{assigns: %{user: user}} = conn, opts) do - lists = Pleroma.List.for_user(user, opts) - res = ListView.render("lists.json", lists: lists) - json(conn, res) - end - - def get_list(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with %Pleroma.List{} = list <- Pleroma.List.get(id, user) do - res = ListView.render("list.json", list: list) - json(conn, res) - else - _e -> render_error(conn, :not_found, "Record not found") - end - end - def account_lists(%{assigns: %{user: user}} = conn, %{"id" => account_id}) do lists = Pleroma.List.get_lists_account_belongs(user, account_id) res = ListView.render("lists.json", lists: lists) json(conn, res) end - def delete_list(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with %Pleroma.List{} = list <- Pleroma.List.get(id, user), - {:ok, _list} <- Pleroma.List.delete(list) do - json(conn, %{}) - else - _e -> - json(conn, dgettext("errors", "error")) - end - end - - def create_list(%{assigns: %{user: user}} = conn, %{"title" => title}) do - with {:ok, %Pleroma.List{} = list} <- Pleroma.List.create(title, user) do - res = ListView.render("list.json", list: list) - json(conn, res) - end - end - - def add_to_list(%{assigns: %{user: user}} = conn, %{"id" => id, "account_ids" => accounts}) do - accounts - |> Enum.each(fn account_id -> - with %Pleroma.List{} = list <- Pleroma.List.get(id, user), - %User{} = followed <- User.get_cached_by_id(account_id) do - Pleroma.List.follow(list, followed) - end - end) - - json(conn, %{}) - end - - def remove_from_list(%{assigns: %{user: user}} = conn, %{"id" => id, "account_ids" => accounts}) do - accounts - |> Enum.each(fn account_id -> - with %Pleroma.List{} = list <- Pleroma.List.get(id, user), - %User{} = followed <- User.get_cached_by_id(account_id) do - Pleroma.List.unfollow(list, followed) - end - end) - - json(conn, %{}) - end - - def list_accounts(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with %Pleroma.List{} = list <- Pleroma.List.get(id, user), - {:ok, users} = Pleroma.List.get_following(list) do - conn - |> put_view(AccountView) - |> render("accounts.json", %{for: user, users: users, as: :user}) - end - end - - def rename_list(%{assigns: %{user: user}} = conn, %{"id" => id, "title" => title}) do - with %Pleroma.List{} = list <- Pleroma.List.get(id, user), - {:ok, list} <- Pleroma.List.rename(list, title) do - res = ListView.render("list.json", list: list) - json(conn, res) - else - _e -> - json(conn, dgettext("errors", "error")) - end - end - def list_timeline(%{assigns: %{user: user}} = conn, %{"list_id" => id} = params) do with %Pleroma.List{title: _title, following: following} <- Pleroma.List.get(id, user) do params = diff --git a/lib/pleroma/web/mastodon_api/views/list_view.ex b/lib/pleroma/web/mastodon_api/views/list_view.ex index 0f86e2512..bfda6f5b3 100644 --- a/lib/pleroma/web/mastodon_api/views/list_view.ex +++ b/lib/pleroma/web/mastodon_api/views/list_view.ex @@ -6,11 +6,11 @@ defmodule Pleroma.Web.MastodonAPI.ListView do use Pleroma.Web, :view alias Pleroma.Web.MastodonAPI.ListView - def render("lists.json", %{lists: lists} = opts) do - render_many(lists, ListView, "list.json", opts) + def render("index.json", %{lists: lists} = opts) do + render_many(lists, ListView, "show.json", opts) end - def render("list.json", %{list: list}) do + def render("show.json", %{list: list}) do %{ id: to_string(list.id), title: list.title diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 1ad33630c..969dc66fd 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -312,9 +312,9 @@ defmodule Pleroma.Web.Router do get("/scheduled_statuses", MastodonAPIController, :scheduled_statuses) get("/scheduled_statuses/:id", MastodonAPIController, :show_scheduled_status) - get("/lists", MastodonAPIController, :get_lists) - get("/lists/:id", MastodonAPIController, :get_list) - get("/lists/:id/accounts", MastodonAPIController, :list_accounts) + get("/lists", ListController, :index) + get("/lists/:id", ListController, :show) + get("/lists/:id/accounts", ListController, :list_accounts) get("/domain_blocks", MastodonAPIController, :domain_blocks) @@ -355,12 +355,12 @@ defmodule Pleroma.Web.Router do post("/media", MastodonAPIController, :upload) put("/media/:id", MastodonAPIController, :update_media) - delete("/lists/:id", MastodonAPIController, :delete_list) - post("/lists", MastodonAPIController, :create_list) - put("/lists/:id", MastodonAPIController, :rename_list) + delete("/lists/:id", ListController, :delete) + post("/lists", ListController, :create) + put("/lists/:id", ListController, :update) - post("/lists/:id/accounts", MastodonAPIController, :add_to_list) - delete("/lists/:id/accounts", MastodonAPIController, :remove_from_list) + post("/lists/:id/accounts", ListController, :add_to_list) + delete("/lists/:id/accounts", ListController, :remove_from_list) post("/filters", MastodonAPIController, :create_filter) get("/filters/:id", MastodonAPIController, :get_filter) diff --git a/test/web/mastodon_api/controllers/list_controller_test.exs b/test/web/mastodon_api/controllers/list_controller_test.exs new file mode 100644 index 000000000..093506309 --- /dev/null +++ b/test/web/mastodon_api/controllers/list_controller_test.exs @@ -0,0 +1,166 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.MastodonAPI.ListControllerTest do + use Pleroma.Web.ConnCase + + alias Pleroma.Repo + + import Pleroma.Factory + + test "creating a list", %{conn: conn} do + user = insert(:user) + + conn = + conn + |> assign(:user, user) + |> post("/api/v1/lists", %{"title" => "cuties"}) + + assert %{"title" => title} = json_response(conn, 200) + assert title == "cuties" + end + + test "renders error for invalid params", %{conn: conn} do + user = insert(:user) + + conn = + conn + |> assign(:user, user) + |> post("/api/v1/lists", %{"title" => nil}) + + assert %{"error" => "can't be blank"} == json_response(conn, :unprocessable_entity) + end + + test "listing a user's lists", %{conn: conn} do + user = insert(:user) + + conn + |> assign(:user, user) + |> post("/api/v1/lists", %{"title" => "cuties"}) + + conn + |> assign(:user, user) + |> post("/api/v1/lists", %{"title" => "cofe"}) + + conn = + conn + |> assign(:user, user) + |> get("/api/v1/lists") + + assert [ + %{"id" => _, "title" => "cofe"}, + %{"id" => _, "title" => "cuties"} + ] = json_response(conn, :ok) + end + + test "adding users to a list", %{conn: conn} do + user = insert(:user) + other_user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + + conn = + conn + |> assign(:user, user) + |> post("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) + + assert %{} == json_response(conn, 200) + %Pleroma.List{following: following} = Pleroma.List.get(list.id, user) + assert following == [other_user.follower_address] + end + + test "removing users from a list", %{conn: conn} do + user = insert(:user) + other_user = insert(:user) + third_user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + {:ok, list} = Pleroma.List.follow(list, other_user) + {:ok, list} = Pleroma.List.follow(list, third_user) + + conn = + conn + |> assign(:user, user) + |> delete("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) + + assert %{} == json_response(conn, 200) + %Pleroma.List{following: following} = Pleroma.List.get(list.id, user) + assert following == [third_user.follower_address] + end + + test "listing users in a list", %{conn: conn} do + user = insert(:user) + other_user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + {:ok, list} = Pleroma.List.follow(list, other_user) + + conn = + conn + |> assign(:user, user) + |> get("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) + + assert [%{"id" => id}] = json_response(conn, 200) + assert id == to_string(other_user.id) + end + + test "retrieving a list", %{conn: conn} do + user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + + conn = + conn + |> assign(:user, user) + |> get("/api/v1/lists/#{list.id}") + + assert %{"id" => id} = json_response(conn, 200) + assert id == to_string(list.id) + end + + test "renders 404 if list is not found", %{conn: conn} do + user = insert(:user) + + conn = + conn + |> assign(:user, user) + |> get("/api/v1/lists/666") + + assert %{"error" => "List not found"} = json_response(conn, :not_found) + end + + test "renaming a list", %{conn: conn} do + user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + + conn = + conn + |> assign(:user, user) + |> put("/api/v1/lists/#{list.id}", %{"title" => "newname"}) + + assert %{"title" => name} = json_response(conn, 200) + assert name == "newname" + end + + test "validates title when renaming a list", %{conn: conn} do + user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + + conn = + conn + |> assign(:user, user) + |> put("/api/v1/lists/#{list.id}", %{"title" => " "}) + + assert %{"error" => "can't be blank"} == json_response(conn, :unprocessable_entity) + end + + test "deleting a list", %{conn: conn} do + user = insert(:user) + {:ok, list} = Pleroma.List.create("name", user) + + conn = + conn + |> assign(:user, user) + |> delete("/api/v1/lists/#{list.id}") + + assert %{} = json_response(conn, 200) + assert is_nil(Repo.get(Pleroma.List, list.id)) + end +end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 6fcdc19aa..4fd0a5aeb 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -927,106 +927,7 @@ test "delete a filter", %{conn: conn} do end end - describe "lists" do - test "creating a list", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> assign(:user, user) - |> post("/api/v1/lists", %{"title" => "cuties"}) - - assert %{"title" => title} = json_response(conn, 200) - assert title == "cuties" - end - - test "adding users to a list", %{conn: conn} do - user = insert(:user) - other_user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - - conn = - conn - |> assign(:user, user) - |> post("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) - - assert %{} == json_response(conn, 200) - %Pleroma.List{following: following} = Pleroma.List.get(list.id, user) - assert following == [other_user.follower_address] - end - - test "removing users from a list", %{conn: conn} do - user = insert(:user) - other_user = insert(:user) - third_user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - {:ok, list} = Pleroma.List.follow(list, other_user) - {:ok, list} = Pleroma.List.follow(list, third_user) - - conn = - conn - |> assign(:user, user) - |> delete("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) - - assert %{} == json_response(conn, 200) - %Pleroma.List{following: following} = Pleroma.List.get(list.id, user) - assert following == [third_user.follower_address] - end - - test "listing users in a list", %{conn: conn} do - user = insert(:user) - other_user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - {:ok, list} = Pleroma.List.follow(list, other_user) - - conn = - conn - |> assign(:user, user) - |> get("/api/v1/lists/#{list.id}/accounts", %{"account_ids" => [other_user.id]}) - - assert [%{"id" => id}] = json_response(conn, 200) - assert id == to_string(other_user.id) - end - - test "retrieving a list", %{conn: conn} do - user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - - conn = - conn - |> assign(:user, user) - |> get("/api/v1/lists/#{list.id}") - - assert %{"id" => id} = json_response(conn, 200) - assert id == to_string(list.id) - end - - test "renaming a list", %{conn: conn} do - user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - - conn = - conn - |> assign(:user, user) - |> put("/api/v1/lists/#{list.id}", %{"title" => "newname"}) - - assert %{"title" => name} = json_response(conn, 200) - assert name == "newname" - end - - test "deleting a list", %{conn: conn} do - user = insert(:user) - {:ok, list} = Pleroma.List.create("name", user) - - conn = - conn - |> assign(:user, user) - |> delete("/api/v1/lists/#{list.id}") - - assert %{} = json_response(conn, 200) - assert is_nil(Repo.get(Pleroma.List, list.id)) - end - + describe "list timelines" do test "list timeline", %{conn: conn} do user = insert(:user) other_user = insert(:user) diff --git a/test/web/mastodon_api/list_view_test.exs b/test/web/mastodon_api/views/list_view_test.exs similarity index 56% rename from test/web/mastodon_api/list_view_test.exs rename to test/web/mastodon_api/views/list_view_test.exs index 73143467f..fb00310b9 100644 --- a/test/web/mastodon_api/list_view_test.exs +++ b/test/web/mastodon_api/views/list_view_test.exs @@ -7,7 +7,7 @@ defmodule Pleroma.Web.MastodonAPI.ListViewTest do import Pleroma.Factory alias Pleroma.Web.MastodonAPI.ListView - test "Represent a list" do + test "show" do user = insert(:user) title = "mortal enemies" {:ok, list} = Pleroma.List.create(title, user) @@ -17,6 +17,16 @@ test "Represent a list" do title: title } - assert expected == ListView.render("list.json", %{list: list}) + assert expected == ListView.render("show.json", %{list: list}) + end + + test "index" do + user = insert(:user) + + {:ok, list} = Pleroma.List.create("my list", user) + {:ok, list2} = Pleroma.List.create("cofe", user) + + assert [%{id: _, title: "my list"}, %{id: _, title: "cofe"}] = + ListView.render("index.json", lists: [list, list2]) end end From 4194abbc8fbc8003d9923edaa491e798bea92107 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 19:32:47 +0700 Subject: [PATCH 048/400] Move mastodon_api/*_controller.ex to mastodon_api/controllers/ --- .../mastodon_api_controller.ex | 20 +++++++++---------- .../{ => controllers}/search_controller.ex | 0 .../subscription_controller.ex | 0 3 files changed, 10 insertions(+), 10 deletions(-) rename lib/pleroma/web/mastodon_api/{ => controllers}/mastodon_api_controller.ex (98%) rename lib/pleroma/web/mastodon_api/{ => controllers}/search_controller.ex (100%) rename lib/pleroma/web/mastodon_api/{ => controllers}/subscription_controller.ex (100%) diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex similarity index 98% rename from lib/pleroma/web/mastodon_api/mastodon_api_controller.ex rename to lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 31b0aaca0..83e877c0e 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -189,7 +189,7 @@ def update_credentials(%{assigns: %{user: user}} = conn, params) do info_cng = User.Info.profile_update(user.info, info_params) with changeset <- User.update_changeset(user, user_params), - changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng), + changeset <- Changeset.put_embed(changeset, :info, info_cng), {:ok, user} <- User.update_and_set_cache(changeset) do if original_user != user do CommonAPI.update(user) @@ -225,7 +225,7 @@ def update_avatar(%{assigns: %{user: user}} = conn, params) do def update_banner(%{assigns: %{user: user}} = conn, %{"banner" => ""}) do with new_info <- %{"banner" => %{}}, info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), + changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_cng), {:ok, user} <- User.update_and_set_cache(changeset) do CommonAPI.update(user) @@ -237,7 +237,7 @@ def update_banner(%{assigns: %{user: user}} = conn, params) do with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}, type: :banner), new_info <- %{"banner" => object.data}, info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), + changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_cng), {:ok, user} <- User.update_and_set_cache(changeset) do CommonAPI.update(user) %{"url" => [%{"href" => href} | _]} = object.data @@ -249,7 +249,7 @@ def update_banner(%{assigns: %{user: user}} = conn, params) do def update_background(%{assigns: %{user: user}} = conn, %{"img" => ""}) do with new_info <- %{"background" => %{}}, info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), + changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_cng), {:ok, _user} <- User.update_and_set_cache(changeset) do json(conn, %{url: nil}) end @@ -259,7 +259,7 @@ def update_background(%{assigns: %{user: user}} = conn, params) do with {:ok, object} <- ActivityPub.upload(params, type: :background), new_info <- %{"background" => object.data}, info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), + changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_cng), {:ok, _user} <- User.update_and_set_cache(changeset) do %{"url" => [%{"href" => href} | _]} = object.data @@ -806,8 +806,8 @@ def set_mascot(%{assigns: %{user: user}} = conn, %{"file" => file}) do user_changeset = user - |> Ecto.Changeset.change() - |> Ecto.Changeset.put_embed(:info, info_changeset) + |> Changeset.change() + |> Changeset.put_embed(:info, info_changeset) {:ok, _user} = User.update_and_set_cache(user_changeset) @@ -1344,8 +1344,8 @@ def index(%{assigns: %{user: user}} = conn, _params) do def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do info_cng = User.Info.mastodon_settings_update(user.info, settings) - with changeset <- Ecto.Changeset.change(user), - changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng), + with changeset <- Changeset.change(user), + changeset <- Changeset.put_embed(changeset, :info, info_cng), {:ok, _user} <- User.update_and_set_cache(changeset) do json(conn, %{}) else @@ -1409,7 +1409,7 @@ defp get_or_make_app do {:ok, app} else app - |> Ecto.Changeset.change(%{scopes: scopes}) + |> Changeset.change(%{scopes: scopes}) |> Repo.update() end diff --git a/lib/pleroma/web/mastodon_api/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex similarity index 100% rename from lib/pleroma/web/mastodon_api/search_controller.ex rename to lib/pleroma/web/mastodon_api/controllers/search_controller.ex diff --git a/lib/pleroma/web/mastodon_api/subscription_controller.ex b/lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex similarity index 100% rename from lib/pleroma/web/mastodon_api/subscription_controller.ex rename to lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex From 019ced055836b3d01ea95865549478dc5cdb3c0e Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 19:34:43 +0700 Subject: [PATCH 049/400] Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views --- .../mastodon_api_controller/update_credentials_test.exs | 0 .../web/mastodon_api/{ => controllers}/search_controller_test.exs | 0 .../{ => controllers}/subscription_controller_test.exs | 0 test/web/mastodon_api/{ => views}/account_view_test.exs | 0 test/web/mastodon_api/{ => views}/conversation_view_test.exs | 0 test/web/mastodon_api/{ => views}/notification_view_test.exs | 0 test/web/mastodon_api/{ => views}/push_subscription_view_test.exs | 0 .../web/mastodon_api/{ => views}/scheduled_activity_view_test.exs | 0 test/web/mastodon_api/{ => views}/status_view_test.exs | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename test/web/mastodon_api/{ => controllers}/mastodon_api_controller/update_credentials_test.exs (100%) rename test/web/mastodon_api/{ => controllers}/search_controller_test.exs (100%) rename test/web/mastodon_api/{ => controllers}/subscription_controller_test.exs (100%) rename test/web/mastodon_api/{ => views}/account_view_test.exs (100%) rename test/web/mastodon_api/{ => views}/conversation_view_test.exs (100%) rename test/web/mastodon_api/{ => views}/notification_view_test.exs (100%) rename test/web/mastodon_api/{ => views}/push_subscription_view_test.exs (100%) rename test/web/mastodon_api/{ => views}/scheduled_activity_view_test.exs (100%) rename test/web/mastodon_api/{ => views}/status_view_test.exs (100%) diff --git a/test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs b/test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs similarity index 100% rename from test/web/mastodon_api/mastodon_api_controller/update_credentials_test.exs rename to test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs diff --git a/test/web/mastodon_api/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs similarity index 100% rename from test/web/mastodon_api/search_controller_test.exs rename to test/web/mastodon_api/controllers/search_controller_test.exs diff --git a/test/web/mastodon_api/subscription_controller_test.exs b/test/web/mastodon_api/controllers/subscription_controller_test.exs similarity index 100% rename from test/web/mastodon_api/subscription_controller_test.exs rename to test/web/mastodon_api/controllers/subscription_controller_test.exs diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs similarity index 100% rename from test/web/mastodon_api/account_view_test.exs rename to test/web/mastodon_api/views/account_view_test.exs diff --git a/test/web/mastodon_api/conversation_view_test.exs b/test/web/mastodon_api/views/conversation_view_test.exs similarity index 100% rename from test/web/mastodon_api/conversation_view_test.exs rename to test/web/mastodon_api/views/conversation_view_test.exs diff --git a/test/web/mastodon_api/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs similarity index 100% rename from test/web/mastodon_api/notification_view_test.exs rename to test/web/mastodon_api/views/notification_view_test.exs diff --git a/test/web/mastodon_api/push_subscription_view_test.exs b/test/web/mastodon_api/views/push_subscription_view_test.exs similarity index 100% rename from test/web/mastodon_api/push_subscription_view_test.exs rename to test/web/mastodon_api/views/push_subscription_view_test.exs diff --git a/test/web/mastodon_api/scheduled_activity_view_test.exs b/test/web/mastodon_api/views/scheduled_activity_view_test.exs similarity index 100% rename from test/web/mastodon_api/scheduled_activity_view_test.exs rename to test/web/mastodon_api/views/scheduled_activity_view_test.exs diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs similarity index 100% rename from test/web/mastodon_api/status_view_test.exs rename to test/web/mastodon_api/views/status_view_test.exs From 66c1966688e9bb24ce1703217b89d8ec390b6095 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Mon, 26 Aug 2019 20:36:44 +0700 Subject: [PATCH 050/400] Disable rate limiter by default --- config/config.exs | 11 +---------- docs/config.md | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/config/config.exs b/config/config.exs index e58454d68..f630771a3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -556,16 +556,7 @@ config :http_signatures, adapter: Pleroma.Signature -config :pleroma, :rate_limit, - search: [{1000, 10}, {1000, 30}], - app_account_creation: {1_800_000, 25}, - relations_actions: {10_000, 10}, - relation_id_action: {60_000, 2}, - statuses_actions: {10_000, 15}, - status_id_action: {60_000, 3}, - password_reset: {1_800_000, 5}, - account_confirmation_resend: {8_640_000, 5}, - ap_routes: {60_000, 15} +config :pleroma, :rate_limit, nil config :pleroma, Pleroma.ActivityExpiration, enabled: true diff --git a/docs/config.md b/docs/config.md index 414b54660..61aa7db9b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -671,6 +671,8 @@ This will probably take a long time. ## :rate_limit +This is an advanced feature and disabled by default. + A keyword list of rate limiters where a key is a limiter name and value is the limiter configuration. The basic configuration is a tuple where: * The first element: `scale` (Integer). The time scale in milliseconds. From c338224c93c3e8111cecdd3ef652016a574b55f4 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 26 Aug 2019 17:24:22 +0300 Subject: [PATCH 051/400] Fix sporadic test --- test/web/admin_api/admin_api_controller_test.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 1afdb6a50..4e2c27431 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -64,8 +64,7 @@ test "Create" do log_entry = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log_entry) == - "@#{admin.nickname} created users: @lain2, @lain" + assert ["lain", "lain2"] -- Enum.map(log_entry.data["subjects"], & &1["nickname"]) == [] end test "Cannot create user with exisiting email" do From fd076def0a2d42ca4b406cdde3fc54b665512362 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Tue, 27 Aug 2019 02:24:14 +0700 Subject: [PATCH 052/400] Fix typo --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index 61aa7db9b..7a8819c91 100644 --- a/docs/config.md +++ b/docs/config.md @@ -8,7 +8,7 @@ If you run Pleroma with ``MIX_ENV=prod`` the file is ``prod.secret.exs``, otherw * `filters`: List of `Pleroma.Upload.Filter` to use. * `link_name`: When enabled Pleroma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe` * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host. -* `proxy_remote`: If you\'re using a remote uploader, Pleroma will proxy media requests instead of redirecting to it. +* `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it. * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation. Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`. From 3da65292b389c1f1edeff03fd5097579721fb681 Mon Sep 17 00:00:00 2001 From: lain Date: Mon, 26 Aug 2019 14:34:52 -0500 Subject: [PATCH 053/400] Transmogrifier: Fix follow handling when the actor is an object. --- CHANGELOG.md | 1 + lib/pleroma/object.ex | 4 ++ .../web/activity_pub/transmogrifier.ex | 4 +- test/fixtures/osada-follow-activity.json | 56 +++++++++++++++++++ .../fixtures/tesla_mock/osada-user-indio.json | 1 + test/support/http_request_mock.ex | 5 ++ .../transmogrifier/follow_handling_test.exs | 19 +++++++ 7 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/osada-follow-activity.json create mode 100644 test/fixtures/tesla_mock/osada-user-indio.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdcb014a..20af9badc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Improve digest email template ### Fixed +- Following from Osada - Not being able to pin unlisted posts - Objects being re-embedded to activities after being updated (e.g faved/reposted). Running 'mix pleroma.database prune_objects' again is advised. - Favorites timeline doing database-intensive queries diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index c8d339c19..468549c87 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -230,4 +230,8 @@ def increase_vote_count(ap_id, name) do _ -> :noop end end + + def get_ap_id(%{"id" => id}), do: id + def get_ap_id(id) when is_binary(id), do: id + def get_ap_id(_), do: {:error, "Object is not a string and has no id."} end diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 36340a3a1..6c4259c02 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -464,8 +464,8 @@ def handle_incoming( %{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = data, _options ) do - with %User{local: true} = followed <- User.get_cached_by_ap_id(followed), - {:ok, %User{} = follower} <- User.get_or_fetch_by_ap_id(follower), + with %User{local: true} = followed <- User.get_cached_by_ap_id(Object.get_ap_id(followed)), + {:ok, %User{} = follower} <- User.get_or_fetch_by_ap_id(Object.get_ap_id(follower)), {:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do with deny_follow_blocked <- Pleroma.Config.get([:user, :deny_follow_blocked]), {_, false} <- {:user_blocked, User.blocks?(followed, follower) && deny_follow_blocked}, diff --git a/test/fixtures/osada-follow-activity.json b/test/fixtures/osada-follow-activity.json new file mode 100644 index 000000000..b991eea36 --- /dev/null +++ b/test/fixtures/osada-follow-activity.json @@ -0,0 +1,56 @@ +{ + "@context":[ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + "https://apfed.club/apschema/v1.4" + ], + "id":"https://apfed.club/follow/9", + "type":"Follow", + "actor":{ + "type":"Person", + "id":"https://apfed.club/channel/indio", + "preferredUsername":"indio", + "name":"Indio", + "updated":"2019-08-20T23:52:34Z", + "icon":{ + "type":"Image", + "mediaType":"image/jpeg", + "updated":"2019-08-20T23:53:37Z", + "url":"https://apfed.club/photo/profile/l/2", + "height":300, + "width":300 + }, + "url":"https://apfed.club/channel/indio", + "inbox":"https://apfed.club/inbox/indio", + "outbox":"https://apfed.club/outbox/indio", + "followers":"https://apfed.club/followers/indio", + "following":"https://apfed.club/following/indio", + "endpoints":{ + "sharedInbox":"https://apfed.club/inbox" + }, + "publicKey":{ + "id":"https://apfed.club/channel/indio", + "owner":"https://apfed.club/channel/indio", + "publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA77TIR1VuSYFnmDRFGHHb\n4vaGdx9ranzRX4bfOKAqa++Ch5L4EqJpPy08RuM+NrYCYiYl4QQFDSSDXAEgb5g9\nC1TgWTfI7q/E0UBX2Vr0mU6X4i1ztv0tuQvegRjcSJ7l1AvoBs8Ip4MEJ3OPEQhB\ngJqAACB3Gnps4zi2I0yavkxUfGVKr6zKT3BxWh5hTpKC7Do+ChIrVZC2EwxND9K6 +\nsAnQHThcb5EQuvuzUQZKeS7IEOsd0JpZDmJjbfMGrAWE81pLIfEeeA2joCJiBBTO\nglDsW+juvZ+lWqJpMr2hMWpvfrFjJeUawNJCIzsLdVIZR+aKj5yy6yqoS8hkN9Ha\n1MljZpsXl+EmwcwAIqim1YeLwERCEAQ/JWbSt8pQTQbzZ6ibwQ4mchCxacrRbIVR +\nnL59fWMBassJcbY0VwrTugm2SBsYbDjESd55UZV03Rwr8qseGTyi+hH8O7w2SIaY\nzjN6AdZiPmsh00YflzlCk8MSLOHMol1vqIUzXxU8CdXn9+KsuQdZGrTz0YKN/db4\naVwUGJatz2Tsvf7R1tJBjJfeQWOWbbn3pycLVH86LjZ83qngp9ZVnAveUnUqz0yS +\nhe+buZ6UMsfGzbIYon2bKNlz6gYTH0YPcr+cLe+29drtt0GZiXha1agbpo4RB8zE +\naNL2fucF5YT0yNpbd/5WoV0CAwEAAQ==\n-----END PUBLIC KEY-----\n" + } + }, + "object":"https://pleroma.site/users/kaniini", + "to":[ + "https://pleroma.site/users/kaniini" + ], + "signature":{ + "@context":[ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1" + ], + "type":"RsaSignature2017", + "nonce":"52c035e0a9e81dce8b486159204e97c22637e91f75cdfad5378de91de68e9117", + "creator":"https://apfed.club/channel/indio/public_key_pem", + "created":"2019-08-22T03:38:02Z", + "signatureValue":"oVliRCIqNIh6yUp851dYrF0y21aHp3Rz6VkIpW1pFMWfXuzExyWSfcELpyLseeRmsw5bUu9zJkH44B4G2LiJQKA9UoEQDjrDMZBmbeUpiQqq3DVUzkrBOI8bHZ7xyJ/CjSZcNHHh0MHhSKxswyxWMGi4zIqzkAZG3vRRgoPVHdjPm00sR3B8jBLw1cjoffv+KKeM/zEUpe13gqX9qHAWHHqZepxgSWmq+EKOkRvHUPBXiEJZfXzc5uW+vZ09F3WBYmaRoy8Y0e1P29fnRLqSy7EEINdrHaGclRqoUZyiawpkgy3lWWlynesV/HiLBR7EXT79eKstxf4wfTDaPKBCfTCsOWuMWHr7Genu37ew2/t7eiBGqCwwW12ylhml/OLHgNK3LOhmRABhtfpaFZSxfDVnlXfaLpY1xekVOj2oC0FpBtnoxVKLpIcyLw6dkfSil5ANd+hl59W/bpPA8KT90ii1fSNCo3+FcwQVx0YsPznJNA60XfFuVsme7zNcOst6393e1WriZxBanFpfB63zVQc9u1fjyfktx/yiUNxIlre+sz9OCc0AACn94iRhBYh4bbzdleUOTnM7lnD4Dj2FP+xeDIP8CA8wXUeq5+9kopSp2kAmlUEyFUdg4no7naIeu1SZnopfUg56PsVCp9JHiUK1SYAyWbdC+FbUECu5CvI=" + } +} diff --git a/test/fixtures/tesla_mock/osada-user-indio.json b/test/fixtures/tesla_mock/osada-user-indio.json new file mode 100644 index 000000000..c1d52c92a --- /dev/null +++ b/test/fixtures/tesla_mock/osada-user-indio.json @@ -0,0 +1 @@ +{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],"type":"Person","id":"https://apfed.club/channel/indio","preferredUsername":"indio","name":"Indio","updated":"2019-08-20T23:52:34Z","icon":{"type":"Image","mediaType":"image/jpeg","updated":"2019-08-20T23:53:37Z","url":"https://apfed.club/photo/profile/l/2","height":300,"width":300},"url":"https://apfed.club/channel/indio","inbox":"https://apfed.club/inbox/indio","outbox":"https://apfed.club/outbox/indio","followers":"https://apfed.club/followers/indio","following":"https://apfed.club/following/indio","endpoints":{"sharedInbox":"https://apfed.club/inbox"},"publicKey":{"id":"https://apfed.club/channel/indio","owner":"https://apfed.club/channel/indio","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA77TIR1VuSYFnmDRFGHHb\n4vaGdx9ranzRX4bfOKAqa++Ch5L4EqJpPy08RuM+NrYCYiYl4QQFDSSDXAEgb5g9\nC1TgWTfI7q/E0UBX2Vr0mU6X4i1ztv0tuQvegRjcSJ7l1AvoBs8Ip4MEJ3OPEQhB\ngJqAACB3Gnps4zi2I0yavkxUfGVKr6zKT3BxWh5hTpKC7Do+ChIrVZC2EwxND9K6\nsAnQHThcb5EQuvuzUQZKeS7IEOsd0JpZDmJjbfMGrAWE81pLIfEeeA2joCJiBBTO\nglDsW+juvZ+lWqJpMr2hMWpvfrFjJeUawNJCIzsLdVIZR+aKj5yy6yqoS8hkN9Ha\n1MljZpsXl+EmwcwAIqim1YeLwERCEAQ/JWbSt8pQTQbzZ6ibwQ4mchCxacrRbIVR\nnL59fWMBassJcbY0VwrTugm2SBsYbDjESd55UZV03Rwr8qseGTyi+hH8O7w2SIaY\nzjN6AdZiPmsh00YflzlCk8MSLOHMol1vqIUzXxU8CdXn9+KsuQdZGrTz0YKN/db4\naVwUGJatz2Tsvf7R1tJBjJfeQWOWbbn3pycLVH86LjZ83qngp9ZVnAveUnUqz0yS\nhe+buZ6UMsfGzbIYon2bKNlz6gYTH0YPcr+cLe+29drtt0GZiXha1agbpo4RB8zE\naNL2fucF5YT0yNpbd/5WoV0CAwEAAQ==\n-----END PUBLIC KEY-----\n"},"signature":{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],"type":"RsaSignature2017","nonce":"c672a408d2e88b322b36a61bf0c25f586be9245d30293c55b8d653dcc867aaf7","creator":"https://apfed.club/channel/indio/public_key_pem","created":"2019-08-26T07:24:03Z","signatureValue":"MyAv5gnedu6L/DYFaE1TUYvp4LjI9ZUU0axwGYOhgD7qsjivMgwbOrjX/iH32xlcfF8nWOMh/ogu3+Qwr5sqLHkS2AimWmw1+Ubf2KccE58b8vI8zWfyu8QJnMuE92jtBPv8UTQUHw8ZebbExk3L99oXaeyVihKiMBmd63NpVTpGXZTg6m+H+KfWchVajPoyNKZtKMd3nH99x5j54Cqkz0BN5CSTwCSG0wP95G0VtZHtmhX+tsAPM3oAj0d+gtCZSCd8Nu8fvFAwCyTg1oKSfRqKb27EKHlskqK9X57x0jURH77CTAIQSejgGcKJ5GGLtvofubJkafadjagqrtqz6Mz6BZ642ssJ2KGkRAn79Q4F08goI6cfU5lLk2Tooe5A55XERnmE3SkYGyTvLpacZplxJdU0sa+deX9D7+alSGFJZSziaxpCxzrO6lEApe4b9kHXAzn9VaZt9trijkHq/kkq0i3NRcP7n8JG9q+Vv8jY9ddY6HcH89RNCBIA6MKLtAqc+vSc5G24qeZlw2MzlQWBp0KGuVG8DQR00AL6cXLBzF1WY8JZeEg6zqm+DMznbuNzgiS34BP+AehBSHlQ4MZebwDnK3ZPPqGSwioIWMxIFfZDaVDX9Pp1pXAARQMw0c/y4sDcf9FMzsr8jteEa7ZQcoqq5kXQTSCP56TEHnI="}} \ No newline at end of file diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 55b141dd8..05eebbe9b 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -775,6 +775,11 @@ def get("https://mastodon.social/users/lambadalambda", _, _, _) do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.json")}} end + def get("https://apfed.club/channel/indio", _, _, _) do + {:ok, + %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/osada-user-indio.json")}} + end + def get("https://social.heldscal.la/user/23211", _, _, Accept: "application/activity+json") do {:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)} end diff --git a/test/web/activity_pub/transmogrifier/follow_handling_test.exs b/test/web/activity_pub/transmogrifier/follow_handling_test.exs index 857d65564..fe89f7cb0 100644 --- a/test/web/activity_pub/transmogrifier/follow_handling_test.exs +++ b/test/web/activity_pub/transmogrifier/follow_handling_test.exs @@ -19,6 +19,25 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do end describe "handle_incoming" do + test "it works for osada follow request" do + user = insert(:user) + + data = + File.read!("test/fixtures/osada-follow-activity.json") + |> Poison.decode!() + |> Map.put("object", user.ap_id) + + {:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data) + + assert data["actor"] == "https://apfed.club/channel/indio" + assert data["type"] == "Follow" + assert data["id"] == "https://apfed.club/follow/9" + + activity = Repo.get(Activity, activity.id) + assert activity.data["state"] == "accept" + assert User.following?(User.get_cached_by_ap_id(data["actor"]), user) + end + test "it works for incoming follow requests" do user = insert(:user) From eb1739c59699754297149c92ea3d03ec688ae16a Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 27 Aug 2019 12:29:19 +0300 Subject: [PATCH 054/400] Remove most of TwitterAPIController --- lib/pleroma/web/router.ex | 106 - .../web/twitter_api/twitter_api_controller.ex | 763 +----- .../twitter_api_controller_test.exs | 2150 ----------------- 3 files changed, 6 insertions(+), 3013 deletions(-) delete mode 100644 test/web/twitter_api/twitter_api_controller_test.exs diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 1ad33630c..53728e298 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -482,53 +482,12 @@ defmodule Pleroma.Web.Router do scope "/api", Pleroma.Web do pipe_through(:api) - post("/account/register", TwitterAPI.Controller, :register) - post("/account/password_reset", TwitterAPI.Controller, :password_reset) - - post("/account/resend_confirmation_email", TwitterAPI.Controller, :resend_confirmation_email) - get( "/account/confirm_email/:user_id/:token", TwitterAPI.Controller, :confirm_email, as: :confirm_email ) - - scope [] do - pipe_through(:oauth_read_or_public) - - get("/statuses/user_timeline", TwitterAPI.Controller, :user_timeline) - get("/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline) - get("/users/show", TwitterAPI.Controller, :show_user) - - get("/statuses/followers", TwitterAPI.Controller, :followers) - get("/statuses/friends", TwitterAPI.Controller, :friends) - get("/statuses/blocks", TwitterAPI.Controller, :blocks) - get("/statuses/show/:id", TwitterAPI.Controller, :fetch_status) - get("/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation) - - get("/search", TwitterAPI.Controller, :search) - get("/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline) - end - end - - scope "/api", Pleroma.Web do - pipe_through([:api, :oauth_read_or_public]) - - get("/statuses/public_timeline", TwitterAPI.Controller, :public_timeline) - - get( - "/statuses/public_and_external_timeline", - TwitterAPI.Controller, - :public_and_external_timeline - ) - - get("/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline) - end - - scope "/api", Pleroma.Web, as: :twitter_api_search do - pipe_through([:api, :oauth_read_or_public]) - get("/pleroma/search_user", TwitterAPI.Controller, :search_user) end scope "/api", Pleroma.Web, as: :authenticated_twitter_api do @@ -536,71 +495,6 @@ defmodule Pleroma.Web.Router do get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens) delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token) - - scope [] do - pipe_through(:oauth_read) - - get("/account/verify_credentials", TwitterAPI.Controller, :verify_credentials) - post("/account/verify_credentials", TwitterAPI.Controller, :verify_credentials) - - 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) - get("/statuses/dm_timeline", TwitterAPI.Controller, :dm_timeline) - get("/qvitter/statuses/notifications", TwitterAPI.Controller, :notifications) - - get("/pleroma/friend_requests", TwitterAPI.Controller, :friend_requests) - - get("/friends/ids", TwitterAPI.Controller, :friends_ids) - get("/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array) - - get("/mutes/users/ids", TwitterAPI.Controller, :empty_array) - get("/qvitter/mutes", TwitterAPI.Controller, :raw_empty_array) - - get("/externalprofile/show", TwitterAPI.Controller, :external_profile) - - post("/qvitter/statuses/notifications/read", TwitterAPI.Controller, :notifications_read) - end - - scope [] do - pipe_through(:oauth_write) - - post("/account/update_profile", TwitterAPI.Controller, :update_profile) - post("/account/update_profile_banner", TwitterAPI.Controller, :update_banner) - post("/qvitter/update_background_image", TwitterAPI.Controller, :update_background) - - post("/statuses/update", TwitterAPI.Controller, :status_update) - post("/statuses/retweet/:id", TwitterAPI.Controller, :retweet) - post("/statuses/unretweet/:id", TwitterAPI.Controller, :unretweet) - post("/statuses/destroy/:id", TwitterAPI.Controller, :delete_post) - - post("/statuses/pin/:id", TwitterAPI.Controller, :pin) - post("/statuses/unpin/:id", TwitterAPI.Controller, :unpin) - - post("/statusnet/media/upload", TwitterAPI.Controller, :upload) - post("/media/upload", TwitterAPI.Controller, :upload_json) - post("/media/metadata/create", TwitterAPI.Controller, :update_media) - - post("/favorites/create/:id", TwitterAPI.Controller, :favorite) - post("/favorites/create", TwitterAPI.Controller, :favorite) - post("/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite) - - post("/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar) - end - - scope [] do - pipe_through(:oauth_follow) - - post("/pleroma/friendships/approve", TwitterAPI.Controller, :approve_friend_request) - post("/pleroma/friendships/deny", TwitterAPI.Controller, :deny_friend_request) - - post("/friendships/create", TwitterAPI.Controller, :follow) - post("/friendships/destroy", TwitterAPI.Controller, :unfollow) - - post("/blocks/create", TwitterAPI.Controller, :block) - post("/blocks/destroy", TwitterAPI.Controller, :unblock) - end end pipeline :ap_service_actor do diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 5dfab6a6c..1c3b11a57 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -5,448 +5,15 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller - import Pleroma.Web.ControllerHelper, only: [json_response: 3] - alias Ecto.Changeset - alias Pleroma.Activity - alias Pleroma.Formatter - alias Pleroma.Notification - alias Pleroma.Object - alias Pleroma.Repo alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.ActivityPub.Visibility - alias Pleroma.Web.CommonAPI - alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.OAuth.Token - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.NotificationView alias Pleroma.Web.TwitterAPI.TokenView - alias Pleroma.Web.TwitterAPI.TwitterAPI - alias Pleroma.Web.TwitterAPI.UserView require Logger - plug(Pleroma.Plugs.RateLimiter, :password_reset when action == :password_reset) - plug(:only_if_public_instance when action in [:public_timeline, :public_and_external_timeline]) action_fallback(:errors) - def verify_credentials(%{assigns: %{user: user}} = conn, _params) do - token = Phoenix.Token.sign(conn, "user socket", user.id) - - conn - |> put_view(UserView) - |> render("show.json", %{user: user, token: token, for: user}) - end - - def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do - with media_ids <- extract_media_ids(status_data), - {:ok, activity} <- - TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids)) do - conn - |> json(ActivityView.render("activity.json", activity: activity, for: user)) - else - _ -> empty_status_reply(conn) - end - end - - def status_update(conn, _status_data) do - empty_status_reply(conn) - end - - defp empty_status_reply(conn) do - bad_request_reply(conn, "Client must provide a 'status' parameter with a value.") - end - - defp extract_media_ids(status_data) do - with media_ids when not is_nil(media_ids) <- status_data["media_ids"], - split_ids <- String.split(media_ids, ","), - clean_ids <- Enum.reject(split_ids, fn id -> String.length(id) == 0 end) do - clean_ids - else - _e -> [] - end - end - - def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", ["Create", "Announce"]) - |> Map.put("blocking_user", user) - - activities = ActivityPub.fetch_public_activities(params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def public_timeline(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", ["Create", "Announce"]) - |> Map.put("local_only", true) - |> Map.put("blocking_user", user) - - activities = ActivityPub.fetch_public_activities(params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def friends_timeline(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", ["Create", "Announce", "Follow", "Like"]) - |> Map.put("blocking_user", user) - |> Map.put("user", user) - - activities = ActivityPub.fetch_activities([user.ap_id | user.following], params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def show_user(conn, params) do - for_user = conn.assigns.user - - with {:ok, shown} <- TwitterAPI.get_user(params), - true <- - User.auth_active?(shown) || - (for_user && (for_user.id == shown.id || User.superuser?(for_user))) do - params = - if for_user do - %{user: shown, for: for_user} - else - %{user: shown} - end - - conn - |> put_view(UserView) - |> render("show.json", params) - else - {:error, msg} -> - bad_request_reply(conn, msg) - - false -> - conn - |> put_status(404) - |> json(%{error: "Unconfirmed user"}) - end - end - - def user_timeline(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.get_user(user, params) do - {:ok, target_user} -> - # Twitter and ActivityPub use a different name and sense for this parameter. - {include_rts, params} = Map.pop(params, "include_rts") - - params = - case include_rts do - x when x == "false" or x == "0" -> Map.put(params, "exclude_reblogs", "true") - _ -> params - end - - activities = ActivityPub.fetch_user_activities(target_user, user, params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - - {:error, msg} -> - bad_request_reply(conn, msg) - end - end - - def mentions_timeline(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", ["Create", "Announce", "Follow", "Like"]) - |> Map.put("blocking_user", user) - |> Map.put(:visibility, ~w[unlisted public private]) - - activities = ActivityPub.fetch_activities([user.ap_id], params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def dm_timeline(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", "Create") - |> Map.put("blocking_user", user) - |> Map.put("user", user) - |> Map.put(:visibility, "direct") - |> Map.put(:order, :desc) - - activities = - ActivityPub.fetch_activities_query([user.ap_id], params) - |> Repo.all() - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def notifications(%{assigns: %{user: user}} = conn, params) do - params = - if Map.has_key?(params, "with_muted") do - Map.put(params, :with_muted, params["with_muted"] in [true, "True", "true", "1"]) - else - params - end - - notifications = Notification.for_user(user, params) - - conn - |> put_view(NotificationView) - |> render("notification.json", %{notifications: notifications, for: user}) - end - - def notifications_read(%{assigns: %{user: user}} = conn, %{"latest_id" => latest_id} = params) do - Notification.set_read_up_to(user, latest_id) - - notifications = Notification.for_user(user, params) - - conn - |> put_view(NotificationView) - |> render("notification.json", %{notifications: notifications, for: user}) - end - - def notifications_read(%{assigns: %{user: _user}} = conn, _) do - bad_request_reply(conn, "You need to specify latest_id") - end - - def follow(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.follow(user, params) do - {:ok, user, followed, _activity} -> - conn - |> put_view(UserView) - |> render("show.json", %{user: followed, for: user}) - - {:error, msg} -> - forbidden_json_reply(conn, msg) - end - end - - def block(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.block(user, params) do - {:ok, user, blocked} -> - conn - |> put_view(UserView) - |> render("show.json", %{user: blocked, for: user}) - - {:error, msg} -> - forbidden_json_reply(conn, msg) - end - end - - def unblock(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.unblock(user, params) do - {:ok, user, blocked} -> - conn - |> put_view(UserView) - |> render("show.json", %{user: blocked, for: user}) - - {:error, msg} -> - forbidden_json_reply(conn, msg) - end - end - - def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.delete(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - end - end - - def unfollow(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.unfollow(user, params) do - {:ok, user, unfollowed} -> - conn - |> put_view(UserView) - |> render("show.json", %{user: unfollowed, for: user}) - - {:error, msg} -> - forbidden_json_reply(conn, msg) - end - end - - def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with %Activity{} = activity <- Activity.get_by_id(id), - true <- Visibility.visible_for_user?(activity, user) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - end - end - - def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with context when is_binary(context) <- Utils.conversation_id_to_context(id), - activities <- - ActivityPub.fetch_activities_for_context(context, %{ - "blocking_user" => user, - "user" => user - }) do - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - end - - @doc """ - Updates metadata of uploaded media object. - Derived from [Twitter API endpoint](https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-metadata-create). - """ - def update_media(%{assigns: %{user: user}} = conn, %{"media_id" => id} = data) do - object = Repo.get(Object, id) - description = get_in(data, ["alt_text", "text"]) || data["name"] || data["description"] - - {conn, status, response_body} = - cond do - !object -> - {halt(conn), :not_found, ""} - - !Object.authorize_mutation(object, user) -> - {halt(conn), :forbidden, "You can only update your own uploads."} - - !is_binary(description) -> - {conn, :not_modified, ""} - - true -> - new_data = Map.put(object.data, "name", description) - - {:ok, _} = - object - |> Object.change(%{data: new_data}) - |> Repo.update() - - {conn, :no_content, ""} - end - - conn - |> put_status(status) - |> json(response_body) - end - - def upload(%{assigns: %{user: user}} = conn, %{"media" => media}) do - response = TwitterAPI.upload(media, user) - - conn - |> put_resp_content_type("application/atom+xml") - |> send_resp(200, response) - end - - def upload_json(%{assigns: %{user: user}} = conn, %{"media" => media}) do - response = TwitterAPI.upload(media, user, "json") - - conn - |> json_reply(200, response) - end - - def get_by_id_or_ap_id(id) do - activity = Activity.get_by_id(id) || Activity.get_create_by_object_ap_id(id) - - if activity.data["type"] == "Create" do - activity - else - Activity.get_create_by_object_ap_id(activity.data["object"]) - end - end - - def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.fav(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - _ -> json_reply(conn, 400, Jason.encode!(%{})) - end - end - - def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.unfav(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - _ -> json_reply(conn, 400, Jason.encode!(%{})) - end - end - - def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.repeat(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - _ -> json_reply(conn, 400, Jason.encode!(%{})) - end - end - - def unretweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.unrepeat(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - _ -> json_reply(conn, 400, Jason.encode!(%{})) - end - end - - def pin(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.pin(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - {:error, message} -> bad_request_reply(conn, message) - err -> err - end - end - - def unpin(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, activity} <- TwitterAPI.unpin(user, id) do - conn - |> put_view(ActivityView) - |> render("activity.json", %{activity: activity, for: user}) - else - {:error, message} -> bad_request_reply(conn, message) - err -> err - end - end - - def register(conn, params) do - with {:ok, user} <- TwitterAPI.register_user(params) do - conn - |> put_view(UserView) - |> render("show.json", %{user: user}) - else - {:error, errors} -> - conn - |> json_reply(400, Jason.encode!(errors)) - end - end - - def password_reset(conn, params) do - nickname_or_email = params["email"] || params["nickname"] - - with {:ok, _} <- TwitterAPI.password_reset(nickname_or_email) do - json_response(conn, :no_content, "") - else - {:error, "unknown user"} -> - send_resp(conn, :not_found, "") - - {:error, _} -> - send_resp(conn, :bad_request, "") - end - end - def confirm_email(conn, %{"user_id" => uid, "token" => token}) do with %User{} = user <- User.get_cached_by_id(uid), true <- user.local, @@ -460,147 +27,6 @@ def confirm_email(conn, %{"user_id" => uid, "token" => token}) do end end - def resend_confirmation_email(conn, params) do - nickname_or_email = params["email"] || params["nickname"] - - with %User{} = user <- User.get_by_nickname_or_email(nickname_or_email), - {:ok, _} <- User.try_send_confirmation_email(user) do - conn - |> json_response(:no_content, "") - end - end - - def update_avatar(%{assigns: %{user: user}} = conn, %{"img" => ""}) do - change = Changeset.change(user, %{avatar: nil}) - {:ok, user} = User.update_and_set_cache(change) - CommonAPI.update(user) - - conn - |> put_view(UserView) - |> render("show.json", %{user: user, for: user}) - end - - def update_avatar(%{assigns: %{user: user}} = conn, params) do - {:ok, object} = ActivityPub.upload(params, type: :avatar) - change = Changeset.change(user, %{avatar: object.data}) - {:ok, user} = User.update_and_set_cache(change) - CommonAPI.update(user) - - conn - |> put_view(UserView) - |> render("show.json", %{user: user, for: user}) - end - - def update_banner(%{assigns: %{user: user}} = conn, %{"banner" => ""}) do - with new_info <- %{"banner" => %{}}, - info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), - {:ok, user} <- User.update_and_set_cache(changeset) do - CommonAPI.update(user) - response = %{url: nil} |> Jason.encode!() - - conn - |> json_reply(200, response) - end - end - - def update_banner(%{assigns: %{user: user}} = conn, params) do - with {:ok, object} <- ActivityPub.upload(%{"img" => params["banner"]}, type: :banner), - new_info <- %{"banner" => object.data}, - info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), - {:ok, user} <- User.update_and_set_cache(changeset) do - CommonAPI.update(user) - %{"url" => [%{"href" => href} | _]} = object.data - response = %{url: href} |> Jason.encode!() - - conn - |> json_reply(200, response) - end - end - - def update_background(%{assigns: %{user: user}} = conn, %{"img" => ""}) do - with new_info <- %{"background" => %{}}, - info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), - {:ok, _user} <- User.update_and_set_cache(changeset) do - response = %{url: nil} |> Jason.encode!() - - conn - |> json_reply(200, response) - end - end - - def update_background(%{assigns: %{user: user}} = conn, params) do - with {:ok, object} <- ActivityPub.upload(params, type: :background), - new_info <- %{"background" => object.data}, - info_cng <- User.Info.profile_update(user.info, new_info), - changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_cng), - {:ok, _user} <- User.update_and_set_cache(changeset) do - %{"url" => [%{"href" => href} | _]} = object.data - response = %{url: href} |> Jason.encode!() - - conn - |> json_reply(200, response) - end - end - - def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" => uri}) do - with {:ok, user_map} <- TwitterAPI.get_external_profile(current_user, uri), - response <- Jason.encode!(user_map) do - conn - |> json_reply(200, response) - else - _e -> - conn - |> put_status(404) - |> json(%{error: "Can't find user"}) - end - end - - def followers(%{assigns: %{user: for_user}} = conn, params) do - {:ok, page} = Ecto.Type.cast(:integer, params["page"] || 1) - - with {:ok, user} <- TwitterAPI.get_user(for_user, params), - {:ok, followers} <- User.get_followers(user, page) do - followers = - cond do - for_user && user.id == for_user.id -> followers - user.info.hide_followers -> [] - true -> followers - end - - conn - |> put_view(UserView) - |> render("index.json", %{users: followers, for: conn.assigns[:user]}) - else - _e -> bad_request_reply(conn, "Can't get followers") - end - end - - def friends(%{assigns: %{user: for_user}} = conn, params) do - {:ok, page} = Ecto.Type.cast(:integer, params["page"] || 1) - {:ok, export} = Ecto.Type.cast(:boolean, params["all"] || false) - - page = if export, do: nil, else: page - - with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params), - {:ok, friends} <- User.get_friends(user, page) do - friends = - cond do - for_user && user.id == for_user.id -> friends - user.info.hide_follows -> [] - true -> friends - end - - conn - |> put_view(UserView) - |> render("index.json", %{users: friends, for: conn.assigns[:user]}) - else - _e -> bad_request_reply(conn, "Can't get friends") - end - end - def oauth_tokens(%{assigns: %{user: user}} = conn, _params) do with oauth_tokens <- Token.get_user_tokens(user) do conn @@ -615,189 +41,6 @@ def revoke_token(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do json_reply(conn, 201, "") end - def blocks(%{assigns: %{user: user}} = conn, _params) do - with blocked_users <- User.blocked_users(user) do - conn - |> put_view(UserView) - |> render("index.json", %{users: blocked_users, for: user}) - end - end - - def friend_requests(conn, params) do - with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params), - {:ok, friend_requests} <- User.get_follow_requests(user) do - conn - |> put_view(UserView) - |> render("index.json", %{users: friend_requests, for: conn.assigns[:user]}) - else - _e -> bad_request_reply(conn, "Can't get friend requests") - end - end - - def approve_friend_request(conn, %{"user_id" => uid} = _params) do - with followed <- conn.assigns[:user], - %User{} = follower <- User.get_cached_by_id(uid), - {:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do - conn - |> put_view(UserView) - |> render("show.json", %{user: follower, for: followed}) - else - e -> bad_request_reply(conn, "Can't approve user: #{inspect(e)}") - end - end - - def deny_friend_request(conn, %{"user_id" => uid} = _params) do - with followed <- conn.assigns[:user], - %User{} = follower <- User.get_cached_by_id(uid), - {:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do - conn - |> put_view(UserView) - |> render("show.json", %{user: follower, for: followed}) - else - e -> bad_request_reply(conn, "Can't deny user: #{inspect(e)}") - end - end - - def friends_ids(%{assigns: %{user: user}} = conn, _params) do - with {:ok, friends} <- User.get_friends(user) do - ids = - friends - |> Enum.map(fn x -> x.id end) - |> Jason.encode!() - - json(conn, ids) - else - _e -> bad_request_reply(conn, "Can't get friends") - end - end - - def empty_array(conn, _params) do - json(conn, Jason.encode!([])) - end - - def raw_empty_array(conn, _params) do - json(conn, []) - end - - defp build_info_cng(user, params) do - info_params = - [ - "no_rich_text", - "locked", - "hide_followers", - "hide_follows", - "hide_favorites", - "show_role", - "skip_thread_containment" - ] - |> Enum.reduce(%{}, fn key, res -> - if value = params[key] do - Map.put(res, key, value == "true") - else - res - end - end) - - info_params = - if value = params["default_scope"] do - Map.put(info_params, "default_scope", value) - else - info_params - end - - User.Info.profile_update(user.info, info_params) - end - - defp parse_profile_bio(user, params) do - if bio = params["description"] do - emojis_text = (params["description"] || "") <> " " <> (params["name"] || "") - - emojis = - ((user.info.emoji || []) ++ Formatter.get_emoji_map(emojis_text)) - |> Enum.dedup() - - user_info = - user.info - |> Map.put( - "emoji", - emojis - ) - - params - |> Map.put("bio", User.parse_bio(bio, user)) - |> Map.put("info", user_info) - else - params - end - end - - def update_profile(%{assigns: %{user: user}} = conn, params) do - params = parse_profile_bio(user, params) - info_cng = build_info_cng(user, params) - - with changeset <- User.update_changeset(user, params), - changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng), - {:ok, user} <- User.update_and_set_cache(changeset) do - CommonAPI.update(user) - - conn - |> put_view(UserView) - |> render("user.json", %{user: user, for: user}) - else - error -> - Logger.debug("Can't update user: #{inspect(error)}") - bad_request_reply(conn, "Can't update user") - end - end - - def search(%{assigns: %{user: user}} = conn, %{"q" => _query} = params) do - activities = TwitterAPI.search(user, params) - - conn - |> put_view(ActivityView) - |> render("index.json", %{activities: activities, for: user}) - end - - def search_user(%{assigns: %{user: user}} = conn, %{"query" => query}) do - users = User.search(query, resolve: true, for_user: user) - - conn - |> put_view(UserView) - |> render("index.json", %{users: users, for: user}) - end - - defp bad_request_reply(conn, error_message) do - json = error_json(conn, 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_json(conn, error_message) - json_reply(conn, 403, json) - end - - def only_if_public_instance(%{assigns: %{user: %User{}}} = conn, _), do: conn - - def only_if_public_instance(conn, _) do - if Pleroma.Config.get([:instance, :public]) do - conn - else - conn - |> forbidden_json_reply("Invalid credentials.") - |> halt() - end - end - - defp error_json(conn, error_message) do - %{"error" => error_message, "request" => conn.request_path} |> Jason.encode!() - end - def errors(conn, {:param_cast, _}) do conn |> put_status(400) @@ -809,4 +52,10 @@ def errors(conn, _) do |> put_status(500) |> json("Something went wrong") end + + defp json_reply(conn, status, json) do + conn + |> put_resp_content_type("application/json") + |> send_resp(status, json) + end end diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs deleted file mode 100644 index 8ef14b4c5..000000000 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ /dev/null @@ -1,2150 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.ControllerTest do - use Pleroma.Web.ConnCase - alias Comeonin.Pbkdf2 - alias Ecto.Changeset - alias Pleroma.Activity - alias Pleroma.Builders.ActivityBuilder - alias Pleroma.Builders.UserBuilder - alias Pleroma.Notification - alias Pleroma.Object - alias Pleroma.Repo - alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.CommonAPI - alias Pleroma.Web.OAuth.Token - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.Controller - alias Pleroma.Web.TwitterAPI.NotificationView - alias Pleroma.Web.TwitterAPI.TwitterAPI - alias Pleroma.Web.TwitterAPI.UserView - - import Mock - import Pleroma.Factory - import Swoosh.TestAssertions - - @banner "data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" - - describe "POST /api/account/update_profile_banner" do - test "it updates the banner", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post(authenticated_twitter_api__path(conn, :update_banner), %{"banner" => @banner}) - |> json_response(200) - - user = refresh_record(user) - assert user.info.banner["type"] == "Image" - end - - test "profile banner can be reset", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post(authenticated_twitter_api__path(conn, :update_banner), %{"banner" => ""}) - |> json_response(200) - - user = refresh_record(user) - assert user.info.banner == %{} - end - end - - describe "POST /api/qvitter/update_background_image" do - test "it updates the background", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post(authenticated_twitter_api__path(conn, :update_background), %{"img" => @banner}) - |> json_response(200) - - user = refresh_record(user) - assert user.info.background["type"] == "Image" - end - - test "background can be reset", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post(authenticated_twitter_api__path(conn, :update_background), %{"img" => ""}) - |> json_response(200) - - user = refresh_record(user) - assert user.info.background == %{} - end - end - - describe "POST /api/account/verify_credentials" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/account/verify_credentials.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: user} do - response = - conn - |> with_credentials(user.nickname, "test") - |> post("/api/account/verify_credentials.json") - |> json_response(200) - - assert response == - UserView.render("show.json", %{user: user, token: response["token"], for: user}) - end - end - - describe "POST /statuses/update.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/statuses/update.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: user} do - conn_with_creds = conn |> with_credentials(user.nickname, "test") - request_path = "/api/statuses/update.json" - - error_response = %{ - "request" => request_path, - "error" => "Client must provide a 'status' parameter with a value." - } - - conn = - conn_with_creds - |> post(request_path) - - assert json_response(conn, 400) == error_response - - conn = - conn_with_creds - |> post(request_path, %{status: ""}) - - assert json_response(conn, 400) == error_response - - conn = - conn_with_creds - |> post(request_path, %{status: " "}) - - assert json_response(conn, 400) == error_response - - # we post with visibility private in order to avoid triggering relay - conn = - conn_with_creds - |> post(request_path, %{status: "Nice meme.", visibility: "private"}) - - assert json_response(conn, 200) == - ActivityView.render("activity.json", %{ - activity: Repo.one(Activity), - user: user, - for: user - }) - end - end - - describe "GET /statuses/public_timeline.json" do - setup [:valid_user] - clear_config([:instance, :public]) - - test "returns statuses", %{conn: conn} do - user = insert(:user) - activities = ActivityBuilder.insert_list(30, %{}, %{user: user}) - ActivityBuilder.insert_list(10, %{}, %{user: user}) - since_id = List.last(activities).id - - conn = - conn - |> get("/api/statuses/public_timeline.json", %{since_id: since_id}) - - response = json_response(conn, 200) - - assert length(response) == 10 - end - - test "returns 403 to unauthenticated request when the instance is not public", %{conn: conn} do - Pleroma.Config.put([:instance, :public], false) - - conn - |> get("/api/statuses/public_timeline.json") - |> json_response(403) - end - - test "returns 200 to authenticated request when the instance is not public", - %{conn: conn, user: user} do - Pleroma.Config.put([:instance, :public], false) - - conn - |> with_credentials(user.nickname, "test") - |> get("/api/statuses/public_timeline.json") - |> json_response(200) - end - - test "returns 200 to unauthenticated request when the instance is public", %{conn: conn} do - conn - |> get("/api/statuses/public_timeline.json") - |> json_response(200) - end - - test "returns 200 to authenticated request when the instance is public", - %{conn: conn, user: user} do - conn - |> with_credentials(user.nickname, "test") - |> get("/api/statuses/public_timeline.json") - |> json_response(200) - end - - test_with_mock "treats user as unauthenticated if `assigns[:token]` is present but lacks `read` permission", - Controller, - [:passthrough], - [] do - token = insert(:oauth_token, scopes: ["write"]) - - build_conn() - |> put_req_header("authorization", "Bearer #{token.token}") - |> get("/api/statuses/public_timeline.json") - |> json_response(200) - - assert called(Controller.public_timeline(%{assigns: %{user: nil}}, :_)) - end - end - - describe "GET /statuses/public_and_external_timeline.json" do - setup [:valid_user] - clear_config([:instance, :public]) - - test "returns 403 to unauthenticated request when the instance is not public", %{conn: conn} do - Pleroma.Config.put([:instance, :public], false) - - conn - |> get("/api/statuses/public_and_external_timeline.json") - |> json_response(403) - end - - test "returns 200 to authenticated request when the instance is not public", - %{conn: conn, user: user} do - Pleroma.Config.put([:instance, :public], false) - - conn - |> with_credentials(user.nickname, "test") - |> get("/api/statuses/public_and_external_timeline.json") - |> json_response(200) - end - - test "returns 200 to unauthenticated request when the instance is public", %{conn: conn} do - conn - |> get("/api/statuses/public_and_external_timeline.json") - |> json_response(200) - end - - test "returns 200 to authenticated request when the instance is public", - %{conn: conn, user: user} do - conn - |> with_credentials(user.nickname, "test") - |> get("/api/statuses/public_and_external_timeline.json") - |> json_response(200) - end - end - - describe "GET /statuses/show/:id.json" do - test "returns one status", %{conn: conn} do - user = insert(:user) - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey!"}) - actor = User.get_cached_by_ap_id(activity.data["actor"]) - - conn = - conn - |> get("/api/statuses/show/#{activity.id}.json") - - response = json_response(conn, 200) - - assert response == ActivityView.render("activity.json", %{activity: activity, user: actor}) - end - end - - describe "GET /users/show.json" do - test "gets user with screen_name", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> get("/api/users/show.json", %{"screen_name" => user.nickname}) - - response = json_response(conn, 200) - - assert response["id"] == user.id - end - - test "gets user with user_id", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> get("/api/users/show.json", %{"user_id" => user.id}) - - response = json_response(conn, 200) - - assert response["id"] == user.id - end - - test "gets a user for a logged in user", %{conn: conn} do - user = insert(:user) - logged_in = insert(:user) - - {:ok, logged_in, user, _activity} = TwitterAPI.follow(logged_in, %{"user_id" => user.id}) - - conn = - conn - |> with_credentials(logged_in.nickname, "test") - |> get("/api/users/show.json", %{"user_id" => user.id}) - - response = json_response(conn, 200) - - assert response["following"] == true - end - end - - describe "GET /statusnet/conversation/:id.json" do - test "returns the statuses in the conversation", %{conn: conn} do - {:ok, _user} = UserBuilder.insert() - {:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"}) - {:ok, _activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"}) - {:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"}) - - conn = - conn - |> get("/api/statusnet/conversation/#{activity.data["context_id"]}.json") - - response = json_response(conn, 200) - - assert length(response) == 2 - end - end - - describe "GET /statuses/friends_timeline.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = get(conn, "/api/statuses/friends_timeline.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - user = insert(:user) - - activities = - ActivityBuilder.insert_list(30, %{"to" => [User.ap_followers(user)]}, %{user: user}) - - returned_activities = - ActivityBuilder.insert_list(10, %{"to" => [User.ap_followers(user)]}, %{user: user}) - - other_user = insert(:user) - ActivityBuilder.insert_list(10, %{}, %{user: other_user}) - since_id = List.last(activities).id - - current_user = - Changeset.change(current_user, following: [User.ap_followers(user)]) - |> Repo.update!() - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/friends_timeline.json", %{since_id: since_id}) - - response = json_response(conn, 200) - - assert length(response) == 10 - - assert response == - Enum.map(returned_activities, fn activity -> - ActivityView.render("activity.json", %{ - activity: activity, - user: User.get_cached_by_ap_id(activity.data["actor"]), - for: current_user - }) - end) - end - end - - describe "GET /statuses/dm_timeline.json" do - test "it show direct messages", %{conn: conn} do - user_one = insert(:user) - user_two = insert(:user) - - {:ok, user_two} = User.follow(user_two, user_one) - - {:ok, direct} = - CommonAPI.post(user_one, %{ - "status" => "Hi @#{user_two.nickname}!", - "visibility" => "direct" - }) - - {:ok, direct_two} = - CommonAPI.post(user_two, %{ - "status" => "Hi @#{user_one.nickname}!", - "visibility" => "direct" - }) - - {:ok, _follower_only} = - CommonAPI.post(user_one, %{ - "status" => "Hi @#{user_two.nickname}!", - "visibility" => "private" - }) - - # Only direct should be visible here - res_conn = - conn - |> assign(:user, user_two) - |> get("/api/statuses/dm_timeline.json") - - [status, status_two] = json_response(res_conn, 200) - assert status["id"] == direct_two.id - assert status_two["id"] == direct.id - end - - test "doesn't include DMs from blocked users", %{conn: conn} do - blocker = insert(:user) - blocked = insert(:user) - user = insert(:user) - {:ok, blocker} = User.block(blocker, blocked) - - {:ok, _blocked_direct} = - CommonAPI.post(blocked, %{ - "status" => "Hi @#{blocker.nickname}!", - "visibility" => "direct" - }) - - {:ok, direct} = - CommonAPI.post(user, %{ - "status" => "Hi @#{blocker.nickname}!", - "visibility" => "direct" - }) - - res_conn = - conn - |> assign(:user, blocker) - |> get("/api/statuses/dm_timeline.json") - - [status] = json_response(res_conn, 200) - assert status["id"] == direct.id - 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} = - CommonAPI.post(current_user, %{ - "status" => "why is tenshi eating a corndog so cute?", - "visibility" => "public" - }) - - 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) == - ActivityView.render("activity.json", %{ - user: current_user, - for: current_user, - activity: activity - }) - end - - test "does not show DMs in mentions timeline", %{conn: conn, user: current_user} do - {:ok, _activity} = - CommonAPI.post(current_user, %{ - "status" => "Have you guys ever seen how cute tenshi eating a corndog is?", - "visibility" => "direct" - }) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/mentions.json") - - response = json_response(conn, 200) - - assert Enum.empty?(response) - end - end - - describe "GET /api/qvitter/statuses/notifications.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = get(conn, "/api/qvitter/statuses/notifications.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - other_user = insert(:user) - - {:ok, _activity} = - ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/qvitter/statuses/notifications.json") - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert response == - NotificationView.render("notification.json", %{ - notifications: Notification.for_user(current_user), - for: current_user - }) - end - - test "muted user", %{conn: conn, user: current_user} do - other_user = insert(:user) - - {:ok, current_user} = User.mute(current_user, other_user) - - {:ok, _activity} = - ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/qvitter/statuses/notifications.json") - - assert json_response(conn, 200) == [] - end - - test "muted user with with_muted parameter", %{conn: conn, user: current_user} do - other_user = insert(:user) - - {:ok, current_user} = User.mute(current_user, other_user) - - {:ok, _activity} = - ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/qvitter/statuses/notifications.json", %{"with_muted" => "true"}) - - assert length(json_response(conn, 200)) == 1 - end - end - - describe "POST /api/qvitter/statuses/notifications/read" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/qvitter/statuses/notifications/read", %{"latest_id" => 1_234_567}) - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials, without any params", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/qvitter/statuses/notifications/read") - - assert json_response(conn, 400) == %{ - "error" => "You need to specify latest_id", - "request" => "/api/qvitter/statuses/notifications/read" - } - end - - test "with credentials, with params", %{conn: conn, user: current_user} do - other_user = insert(:user) - - {:ok, _activity} = - ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user}) - - response_conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/qvitter/statuses/notifications.json") - - [notification] = response = json_response(response_conn, 200) - - assert length(response) == 1 - - assert notification["is_seen"] == 0 - - response_conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/qvitter/statuses/notifications/read", %{"latest_id" => notification["id"]}) - - [notification] = response = json_response(response_conn, 200) - - assert length(response) == 1 - - assert notification["is_seen"] == 1 - end - end - - describe "GET /statuses/user_timeline.json" do - setup [:valid_user] - - test "without any params", %{conn: conn} do - conn = get(conn, "/api/statuses/user_timeline.json") - - assert json_response(conn, 400) == %{ - "error" => "You need to specify screen_name or user_id", - "request" => "/api/statuses/user_timeline.json" - } - end - - test "with user_id", %{conn: conn} do - user = insert(:user) - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user}) - - conn = get(conn, "/api/statuses/user_timeline.json", %{"user_id" => user.id}) - response = json_response(conn, 200) - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - end - - test "with screen_name", %{conn: conn} do - user = insert(:user) - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user}) - - conn = get(conn, "/api/statuses/user_timeline.json", %{"screen_name" => user.nickname}) - response = json_response(conn, 200) - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - end - - test "with credentials", %{conn: conn, user: current_user} do - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: current_user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/user_timeline.json") - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{ - user: current_user, - for: current_user, - activity: activity - }) - end - - test "with credentials with user_id", %{conn: conn, user: current_user} do - user = insert(:user) - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/user_timeline.json", %{"user_id" => user.id}) - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - end - - test "with credentials screen_name", %{conn: conn, user: current_user} do - user = insert(:user) - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1}, %{user: user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/user_timeline.json", %{"screen_name" => user.nickname}) - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - end - - test "with credentials with user_id, excluding RTs", %{conn: conn, user: current_user} do - user = insert(:user) - {:ok, activity} = ActivityBuilder.insert(%{"id" => 1, "type" => "Create"}, %{user: user}) - {:ok, _} = ActivityBuilder.insert(%{"id" => 2, "type" => "Announce"}, %{user: user}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/statuses/user_timeline.json", %{ - "user_id" => user.id, - "include_rts" => "false" - }) - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - - conn = - conn - |> get("/api/statuses/user_timeline.json", %{"user_id" => user.id, "include_rts" => "0"}) - - response = json_response(conn, 200) - - assert length(response) == 1 - - assert Enum.at(response, 0) == - ActivityView.render("activity.json", %{user: user, activity: activity}) - end - end - - describe "POST /friendships/create.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/friendships/create.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - followed = insert(:user) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/friendships/create.json", %{user_id: followed.id}) - - current_user = User.get_cached_by_id(current_user.id) - assert User.ap_followers(followed) in current_user.following - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: followed, for: current_user}) - end - - test "for restricted account", %{conn: conn, user: current_user} do - followed = insert(:user, info: %User.Info{locked: true}) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/friendships/create.json", %{user_id: followed.id}) - - current_user = User.get_cached_by_id(current_user.id) - followed = User.get_cached_by_id(followed.id) - - refute User.ap_followers(followed) in current_user.following - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: followed, for: current_user}) - end - end - - describe "POST /friendships/destroy.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/friendships/destroy.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - followed = insert(:user) - - {:ok, current_user} = User.follow(current_user, followed) - assert User.ap_followers(followed) in current_user.following - ActivityPub.follow(current_user, followed) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/friendships/destroy.json", %{user_id: followed.id}) - - current_user = User.get_cached_by_id(current_user.id) - assert current_user.following == [current_user.ap_id] - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: followed, for: current_user}) - end - end - - describe "POST /blocks/create.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/blocks/create.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - blocked = insert(:user) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/blocks/create.json", %{user_id: blocked.id}) - - current_user = User.get_cached_by_id(current_user.id) - assert User.blocks?(current_user, blocked) - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: blocked, for: current_user}) - end - end - - describe "POST /blocks/destroy.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/blocks/destroy.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - blocked = insert(:user) - - {:ok, current_user, blocked} = TwitterAPI.block(current_user, %{"user_id" => blocked.id}) - assert User.blocks?(current_user, blocked) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/blocks/destroy.json", %{user_id: blocked.id}) - - current_user = User.get_cached_by_id(current_user.id) - assert current_user.info.blocks == [] - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: blocked, for: current_user}) - end - end - - describe "GET /help/test.json" do - test "returns \"ok\"", %{conn: conn} do - conn = get(conn, "/api/help/test.json") - assert json_response(conn, 200) == "ok" - end - end - - describe "POST /api/qvitter/update_avatar.json" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - conn = post(conn, "/api/qvitter/update_avatar.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - avatar_image = File.read!("test/fixtures/avatar_data_uri") - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/qvitter/update_avatar.json", %{img: avatar_image}) - - current_user = User.get_cached_by_id(current_user.id) - assert is_map(current_user.avatar) - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: current_user, for: current_user}) - end - - test "user avatar can be reset", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/qvitter/update_avatar.json", %{img: ""}) - - current_user = User.get_cached_by_id(current_user.id) - assert current_user.avatar == nil - - assert json_response(conn, 200) == - UserView.render("show.json", %{user: current_user, for: current_user}) - end - end - - describe "GET /api/qvitter/mutes.json" do - setup [:valid_user] - - test "unimplemented mutes without valid credentials", %{conn: conn} do - conn = get(conn, "/api/qvitter/mutes.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "unimplemented mutes with credentials", %{conn: conn, user: current_user} do - response = - conn - |> with_credentials(current_user.nickname, "test") - |> get("/api/qvitter/mutes.json") - |> json_response(200) - - assert [] = response - end - end - - describe "POST /api/favorites/create/:id" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/favorites/create/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - note_activity = insert(:note_activity) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/favorites/create/#{note_activity.id}.json") - - assert json_response(conn, 200) - end - - test "with credentials, invalid param", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/favorites/create/wrong.json") - - assert json_response(conn, 400) - end - - test "with credentials, invalid activity", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/favorites/create/1.json") - - assert json_response(conn, 400) - end - end - - describe "POST /api/favorites/destroy/:id" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/favorites/destroy/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - note_activity = insert(:note_activity) - object = Object.normalize(note_activity) - ActivityPub.like(current_user, object) - - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/favorites/destroy/#{note_activity.id}.json") - - assert json_response(conn, 200) - end - end - - describe "POST /api/statuses/retweet/:id" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/statuses/retweet/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - note_activity = insert(:note_activity) - - request_path = "/api/statuses/retweet/#{note_activity.id}.json" - - response = - conn - |> with_credentials(current_user.nickname, "test") - |> post(request_path) - - activity = Activity.get_by_id(note_activity.id) - activity_user = User.get_cached_by_ap_id(note_activity.data["actor"]) - - assert json_response(response, 200) == - ActivityView.render("activity.json", %{ - user: activity_user, - for: current_user, - activity: activity - }) - end - end - - describe "POST /api/statuses/unretweet/:id" do - setup [:valid_user] - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/statuses/unretweet/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: current_user} do - note_activity = insert(:note_activity) - - request_path = "/api/statuses/retweet/#{note_activity.id}.json" - - _response = - conn - |> with_credentials(current_user.nickname, "test") - |> post(request_path) - - request_path = String.replace(request_path, "retweet", "unretweet") - - response = - conn - |> with_credentials(current_user.nickname, "test") - |> post(request_path) - - activity = Activity.get_by_id(note_activity.id) - activity_user = User.get_cached_by_ap_id(note_activity.data["actor"]) - - assert json_response(response, 200) == - ActivityView.render("activity.json", %{ - user: activity_user, - for: current_user, - activity: activity - }) - end - end - - describe "POST /api/account/register" do - test "it creates a new user", %{conn: conn} do - data = %{ - "nickname" => "lain", - "email" => "lain@wired.jp", - "fullname" => "lain iwakura", - "bio" => "close the world.", - "password" => "bear", - "confirm" => "bear" - } - - conn = - conn - |> post("/api/account/register", data) - - user = json_response(conn, 200) - - fetched_user = User.get_cached_by_nickname("lain") - assert user == UserView.render("show.json", %{user: fetched_user}) - end - - test "it returns errors on a problem", %{conn: conn} do - data = %{ - "email" => "lain@wired.jp", - "fullname" => "lain iwakura", - "bio" => "close the world.", - "password" => "bear", - "confirm" => "bear" - } - - conn = - conn - |> post("/api/account/register", data) - - errors = json_response(conn, 400) - - assert is_binary(errors["error"]) - end - end - - describe "POST /api/account/password_reset, with valid parameters" do - setup %{conn: conn} do - user = insert(:user) - conn = post(conn, "/api/account/password_reset?email=#{user.email}") - %{conn: conn, user: user} - end - - test "it returns 204", %{conn: conn} do - assert json_response(conn, :no_content) - end - - test "it creates a PasswordResetToken record for user", %{user: user} do - token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id) - assert token_record - end - - test "it sends an email to user", %{user: user} do - token_record = Repo.get_by(Pleroma.PasswordResetToken, user_id: user.id) - - email = Pleroma.Emails.UserEmail.password_reset_email(user, token_record.token) - notify_email = Pleroma.Config.get([:instance, :notify_email]) - instance_name = Pleroma.Config.get([:instance, :name]) - - assert_email_sent( - from: {instance_name, notify_email}, - to: {user.name, user.email}, - html_body: email.html_body - ) - end - end - - describe "POST /api/account/password_reset, with invalid parameters" do - setup [:valid_user] - - test "it returns 404 when user is not found", %{conn: conn, user: user} do - conn = post(conn, "/api/account/password_reset?email=nonexisting_#{user.email}") - assert conn.status == 404 - assert conn.resp_body == "" - end - - test "it returns 400 when user is not local", %{conn: conn, user: user} do - {:ok, user} = Repo.update(Changeset.change(user, local: false)) - conn = post(conn, "/api/account/password_reset?email=#{user.email}") - assert conn.status == 400 - assert conn.resp_body == "" - end - end - - describe "GET /api/account/confirm_email/:id/:token" do - setup do - user = insert(:user) - info_change = User.Info.confirmation_changeset(user.info, need_confirmation: true) - - {:ok, user} = - user - |> Changeset.change() - |> Changeset.put_embed(:info, info_change) - |> Repo.update() - - assert user.info.confirmation_pending - - [user: user] - end - - test "it redirects to root url", %{conn: conn, user: user} do - conn = get(conn, "/api/account/confirm_email/#{user.id}/#{user.info.confirmation_token}") - - assert 302 == conn.status - end - - test "it confirms the user account", %{conn: conn, user: user} do - get(conn, "/api/account/confirm_email/#{user.id}/#{user.info.confirmation_token}") - - user = User.get_cached_by_id(user.id) - - refute user.info.confirmation_pending - refute user.info.confirmation_token - end - - test "it returns 500 if user cannot be found by id", %{conn: conn, user: user} do - conn = get(conn, "/api/account/confirm_email/0/#{user.info.confirmation_token}") - - assert 500 == conn.status - end - - test "it returns 500 if token is invalid", %{conn: conn, user: user} do - conn = get(conn, "/api/account/confirm_email/#{user.id}/wrong_token") - - assert 500 == conn.status - end - end - - describe "POST /api/account/resend_confirmation_email" do - setup do - user = insert(:user) - info_change = User.Info.confirmation_changeset(user.info, need_confirmation: true) - - {:ok, user} = - user - |> Changeset.change() - |> Changeset.put_embed(:info, info_change) - |> Repo.update() - - assert user.info.confirmation_pending - - [user: user] - end - - clear_config([:instance, :account_activation_required]) do - Pleroma.Config.put([:instance, :account_activation_required], true) - end - - test "it returns 204 No Content", %{conn: conn, user: user} do - conn - |> assign(:user, user) - |> post("/api/account/resend_confirmation_email?email=#{user.email}") - |> json_response(:no_content) - end - - test "it sends confirmation email", %{conn: conn, user: user} do - conn - |> assign(:user, user) - |> post("/api/account/resend_confirmation_email?email=#{user.email}") - - email = Pleroma.Emails.UserEmail.account_confirmation_email(user) - notify_email = Pleroma.Config.get([:instance, :notify_email]) - instance_name = Pleroma.Config.get([:instance, :name]) - - assert_email_sent( - from: {instance_name, notify_email}, - to: {user.name, user.email}, - html_body: email.html_body - ) - end - end - - describe "GET /api/externalprofile/show" do - test "it returns the user", %{conn: conn} do - user = insert(:user) - other_user = insert(:user) - - conn = - conn - |> assign(:user, user) - |> get("/api/externalprofile/show", %{profileurl: other_user.ap_id}) - - assert json_response(conn, 200) == UserView.render("show.json", %{user: other_user}) - end - end - - describe "GET /api/statuses/followers" do - test "it returns a user's followers", %{conn: conn} do - user = insert(:user) - follower_one = insert(:user) - follower_two = insert(:user) - _not_follower = insert(:user) - - {:ok, follower_one} = User.follow(follower_one, user) - {:ok, follower_two} = User.follow(follower_two, user) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/followers") - - expected = UserView.render("index.json", %{users: [follower_one, follower_two], for: user}) - result = json_response(conn, 200) - assert Enum.sort(expected) == Enum.sort(result) - end - - test "it returns 20 followers per page", %{conn: conn} do - user = insert(:user) - followers = insert_list(21, :user) - - Enum.each(followers, fn follower -> - User.follow(follower, user) - end) - - res_conn = - conn - |> assign(:user, user) - |> get("/api/statuses/followers") - - result = json_response(res_conn, 200) - assert length(result) == 20 - - res_conn = - conn - |> assign(:user, user) - |> get("/api/statuses/followers?page=2") - - result = json_response(res_conn, 200) - assert length(result) == 1 - end - - test "it returns a given user's followers with user_id", %{conn: conn} do - user = insert(:user) - follower_one = insert(:user) - follower_two = insert(:user) - not_follower = insert(:user) - - {:ok, follower_one} = User.follow(follower_one, user) - {:ok, follower_two} = User.follow(follower_two, user) - - conn = - conn - |> assign(:user, not_follower) - |> get("/api/statuses/followers", %{"user_id" => user.id}) - - assert MapSet.equal?( - MapSet.new(json_response(conn, 200)), - MapSet.new( - UserView.render("index.json", %{ - users: [follower_one, follower_two], - for: not_follower - }) - ) - ) - end - - test "it returns empty when hide_followers is set to true", %{conn: conn} do - user = insert(:user, %{info: %{hide_followers: true}}) - follower_one = insert(:user) - follower_two = insert(:user) - not_follower = insert(:user) - - {:ok, _follower_one} = User.follow(follower_one, user) - {:ok, _follower_two} = User.follow(follower_two, user) - - response = - conn - |> assign(:user, not_follower) - |> get("/api/statuses/followers", %{"user_id" => user.id}) - |> json_response(200) - - assert [] == response - end - - test "it returns the followers when hide_followers is set to true if requested by the user themselves", - %{ - conn: conn - } do - user = insert(:user, %{info: %{hide_followers: true}}) - follower_one = insert(:user) - follower_two = insert(:user) - _not_follower = insert(:user) - - {:ok, _follower_one} = User.follow(follower_one, user) - {:ok, _follower_two} = User.follow(follower_two, user) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/followers", %{"user_id" => user.id}) - - refute [] == json_response(conn, 200) - end - end - - describe "GET /api/statuses/blocks" do - test "it returns the list of users blocked by requester", %{conn: conn} do - user = insert(:user) - other_user = insert(:user) - - {:ok, user} = User.block(user, other_user) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/blocks") - - expected = UserView.render("index.json", %{users: [other_user], for: user}) - result = json_response(conn, 200) - assert Enum.sort(expected) == Enum.sort(result) - end - end - - describe "GET /api/statuses/friends" do - test "it returns the logged in user's friends", %{conn: conn} do - user = insert(:user) - followed_one = insert(:user) - followed_two = insert(:user) - _not_followed = insert(:user) - - {:ok, user} = User.follow(user, followed_one) - {:ok, user} = User.follow(user, followed_two) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends") - - expected = UserView.render("index.json", %{users: [followed_one, followed_two], for: user}) - result = json_response(conn, 200) - assert Enum.sort(expected) == Enum.sort(result) - end - - test "it returns 20 friends per page, except if 'export' is set to true", %{conn: conn} do - user = insert(:user) - followeds = insert_list(21, :user) - - {:ok, user} = - Enum.reduce(followeds, {:ok, user}, fn followed, {:ok, user} -> - User.follow(user, followed) - end) - - res_conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends") - - result = json_response(res_conn, 200) - assert length(result) == 20 - - res_conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends", %{page: 2}) - - result = json_response(res_conn, 200) - assert length(result) == 1 - - res_conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends", %{all: true}) - - result = json_response(res_conn, 200) - assert length(result) == 21 - end - - test "it returns a given user's friends with user_id", %{conn: conn} do - user = insert(:user) - followed_one = insert(:user) - followed_two = insert(:user) - _not_followed = insert(:user) - - {:ok, user} = User.follow(user, followed_one) - {:ok, user} = User.follow(user, followed_two) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends", %{"user_id" => user.id}) - - assert MapSet.equal?( - MapSet.new(json_response(conn, 200)), - MapSet.new( - UserView.render("index.json", %{users: [followed_one, followed_two], for: user}) - ) - ) - end - - test "it returns empty when hide_follows is set to true", %{conn: conn} do - user = insert(:user, %{info: %{hide_follows: true}}) - followed_one = insert(:user) - followed_two = insert(:user) - not_followed = insert(:user) - - {:ok, user} = User.follow(user, followed_one) - {:ok, user} = User.follow(user, followed_two) - - conn = - conn - |> assign(:user, not_followed) - |> get("/api/statuses/friends", %{"user_id" => user.id}) - - assert [] == json_response(conn, 200) - end - - test "it returns friends when hide_follows is set to true if the user themselves request it", - %{ - conn: conn - } do - user = insert(:user, %{info: %{hide_follows: true}}) - followed_one = insert(:user) - followed_two = insert(:user) - _not_followed = insert(:user) - - {:ok, _user} = User.follow(user, followed_one) - {:ok, _user} = User.follow(user, followed_two) - - response = - conn - |> assign(:user, user) - |> get("/api/statuses/friends", %{"user_id" => user.id}) - |> json_response(200) - - refute [] == response - end - - test "it returns a given user's friends with screen_name", %{conn: conn} do - user = insert(:user) - followed_one = insert(:user) - followed_two = insert(:user) - _not_followed = insert(:user) - - {:ok, user} = User.follow(user, followed_one) - {:ok, user} = User.follow(user, followed_two) - - conn = - conn - |> assign(:user, user) - |> get("/api/statuses/friends", %{"screen_name" => user.nickname}) - - assert MapSet.equal?( - MapSet.new(json_response(conn, 200)), - MapSet.new( - UserView.render("index.json", %{users: [followed_one, followed_two], for: user}) - ) - ) - end - end - - describe "GET /friends/ids" do - test "it returns a user's friends", %{conn: conn} do - user = insert(:user) - followed_one = insert(:user) - followed_two = insert(:user) - _not_followed = insert(:user) - - {:ok, user} = User.follow(user, followed_one) - {:ok, user} = User.follow(user, followed_two) - - conn = - conn - |> assign(:user, user) - |> get("/api/friends/ids") - - expected = [followed_one.id, followed_two.id] - - assert MapSet.equal?( - MapSet.new(Poison.decode!(json_response(conn, 200))), - MapSet.new(expected) - ) - end - end - - describe "POST /api/account/update_profile.json" do - test "it updates a user's profile", %{conn: conn} do - user = insert(:user) - user2 = insert(:user) - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "name" => "new name", - "description" => "hi @#{user2.nickname}" - }) - - user = Repo.get!(User, user.id) - assert user.name == "new name" - - assert user.bio == - "hi @#{user2.nickname}" - - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - test "it sets and un-sets hide_follows", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "hide_follows" => "true" - }) - - user = Repo.get!(User, user.id) - assert user.info.hide_follows == true - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "hide_follows" => "false" - }) - - user = refresh_record(user) - assert user.info.hide_follows == false - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - test "it sets and un-sets hide_followers", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "hide_followers" => "true" - }) - - user = Repo.get!(User, user.id) - assert user.info.hide_followers == true - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "hide_followers" => "false" - }) - - user = Repo.get!(User, user.id) - assert user.info.hide_followers == false - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - test "it sets and un-sets show_role", %{conn: conn} do - user = insert(:user) - - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "show_role" => "true" - }) - - user = Repo.get!(User, user.id) - assert user.info.show_role == true - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "show_role" => "false" - }) - - user = Repo.get!(User, user.id) - assert user.info.show_role == false - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - test "it sets and un-sets skip_thread_containment", %{conn: conn} do - user = insert(:user) - - response = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{"skip_thread_containment" => "true"}) - |> json_response(200) - - assert response["pleroma"]["skip_thread_containment"] == true - user = refresh_record(user) - assert user.info.skip_thread_containment - - response = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{"skip_thread_containment" => "false"}) - |> json_response(200) - - assert response["pleroma"]["skip_thread_containment"] == false - refute refresh_record(user).info.skip_thread_containment - end - - test "it locks an account", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "locked" => "true" - }) - - user = Repo.get!(User, user.id) - assert user.info.locked == true - - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - test "it unlocks an account", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "locked" => "false" - }) - - user = Repo.get!(User, user.id) - assert user.info.locked == false - - assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) - end - - # Broken before the change to class="emoji" and non- in the DB - @tag :skip - test "it formats emojos", %{conn: conn} do - user = insert(:user) - - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "bio" => "I love our :moominmamma:​" - }) - - assert response = json_response(conn, 200) - - assert %{ - "description" => "I love our :moominmamma:", - "description_html" => - ~s{I love our moominmamma Base.encode64("#{username}:#{password}") - put_req_header(conn, "authorization", header_content) - end - - describe "GET /api/search.json" do - test "it returns search results", %{conn: conn} do - user = insert(:user) - user_two = insert(:user, %{nickname: "shp@shitposter.club"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu"}) - {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"}) - - conn = - conn - |> get("/api/search.json", %{"q" => "2hu", "page" => "1", "rpp" => "1"}) - - assert [status] = json_response(conn, 200) - assert status["id"] == activity.id - end - end - - describe "GET /api/statusnet/tags/timeline/:tag.json" do - test "it returns the tags timeline", %{conn: conn} do - user = insert(:user) - user_two = insert(:user, %{nickname: "shp@shitposter.club"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about #2hu"}) - {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"}) - - conn = - conn - |> get("/api/statusnet/tags/timeline/2hu.json") - - assert [status] = json_response(conn, 200) - assert status["id"] == activity.id - end - end - - test "Convert newlines to
in bio", %{conn: conn} do - user = insert(:user) - - _conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "description" => "Hello,\r\nWorld! I\n am a test." - }) - - user = Repo.get!(User, user.id) - assert user.bio == "Hello,
World! I
am a test." - end - - describe "POST /api/pleroma/change_password" do - setup [:valid_user] - - test "without credentials", %{conn: conn} do - conn = post(conn, "/api/pleroma/change_password") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials and invalid password", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/change_password", %{ - "password" => "hi", - "new_password" => "newpass", - "new_password_confirmation" => "newpass" - }) - - assert json_response(conn, 200) == %{"error" => "Invalid password."} - end - - test "with credentials, valid password and new password and confirmation not matching", %{ - conn: conn, - user: current_user - } do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/change_password", %{ - "password" => "test", - "new_password" => "newpass", - "new_password_confirmation" => "notnewpass" - }) - - assert json_response(conn, 200) == %{ - "error" => "New password does not match confirmation." - } - end - - test "with credentials, valid password and invalid new password", %{ - conn: conn, - user: current_user - } do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/change_password", %{ - "password" => "test", - "new_password" => "", - "new_password_confirmation" => "" - }) - - assert json_response(conn, 200) == %{ - "error" => "New password can't be blank." - } - end - - test "with credentials, valid password and matching new password and confirmation", %{ - conn: conn, - user: current_user - } do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/change_password", %{ - "password" => "test", - "new_password" => "newpass", - "new_password_confirmation" => "newpass" - }) - - assert json_response(conn, 200) == %{"status" => "success"} - fetched_user = User.get_cached_by_id(current_user.id) - assert Pbkdf2.checkpw("newpass", fetched_user.password_hash) == true - end - end - - describe "POST /api/pleroma/delete_account" do - setup [:valid_user] - - test "without credentials", %{conn: conn} do - conn = post(conn, "/api/pleroma/delete_account") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials and invalid password", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/delete_account", %{"password" => "hi"}) - - assert json_response(conn, 200) == %{"error" => "Invalid password."} - end - - test "with credentials and valid password", %{conn: conn, user: current_user} do - conn = - conn - |> with_credentials(current_user.nickname, "test") - |> post("/api/pleroma/delete_account", %{"password" => "test"}) - - assert json_response(conn, 200) == %{"status" => "success"} - # Wait a second for the started task to end - :timer.sleep(1000) - end - end - - describe "GET /api/pleroma/friend_requests" do - test "it lists friend requests" do - user = insert(:user) - other_user = insert(:user) - - {:ok, _activity} = ActivityPub.follow(other_user, user) - - user = User.get_cached_by_id(user.id) - other_user = User.get_cached_by_id(other_user.id) - - assert User.following?(other_user, user) == false - - conn = - build_conn() - |> assign(:user, user) - |> get("/api/pleroma/friend_requests") - - assert [relationship] = json_response(conn, 200) - assert other_user.id == relationship["id"] - end - - test "requires 'read' permission", %{conn: conn} do - token1 = insert(:oauth_token, scopes: ["write"]) - token2 = insert(:oauth_token, scopes: ["read"]) - - for token <- [token1, token2] do - conn = - conn - |> put_req_header("authorization", "Bearer #{token.token}") - |> get("/api/pleroma/friend_requests") - - if token == token1 do - assert %{"error" => "Insufficient permissions: read."} == json_response(conn, 403) - else - assert json_response(conn, 200) - end - end - end - end - - describe "POST /api/pleroma/friendships/approve" do - test "it approves a friend request" do - user = insert(:user) - other_user = insert(:user) - - {:ok, _activity} = ActivityPub.follow(other_user, user) - - user = User.get_cached_by_id(user.id) - other_user = User.get_cached_by_id(other_user.id) - - assert User.following?(other_user, user) == false - - conn = - build_conn() - |> assign(:user, user) - |> post("/api/pleroma/friendships/approve", %{"user_id" => other_user.id}) - - assert relationship = json_response(conn, 200) - assert other_user.id == relationship["id"] - assert relationship["follows_you"] == true - end - end - - describe "POST /api/pleroma/friendships/deny" do - test "it denies a friend request" do - user = insert(:user) - other_user = insert(:user) - - {:ok, _activity} = ActivityPub.follow(other_user, user) - - user = User.get_cached_by_id(user.id) - other_user = User.get_cached_by_id(other_user.id) - - assert User.following?(other_user, user) == false - - conn = - build_conn() - |> assign(:user, user) - |> post("/api/pleroma/friendships/deny", %{"user_id" => other_user.id}) - - assert relationship = json_response(conn, 200) - assert other_user.id == relationship["id"] - assert relationship["follows_you"] == false - end - end - - describe "GET /api/pleroma/search_user" do - test "it returns users, ordered by similarity", %{conn: conn} do - user = insert(:user, %{name: "eal"}) - user_two = insert(:user, %{name: "eal me"}) - _user_three = insert(:user, %{name: "zzz"}) - - resp = - conn - |> get(twitter_api_search__path(conn, :search_user), query: "eal me") - |> json_response(200) - - assert length(resp) == 2 - assert [user_two.id, user.id] == Enum.map(resp, fn %{"id" => id} -> id end) - end - end - - describe "POST /api/media/upload" do - setup context do - Pleroma.DataCase.ensure_local_uploader(context) - end - - test "it performs the upload and sets `data[actor]` with AP id of uploader user", %{ - conn: conn - } do - user = insert(:user) - - upload_filename = "test/fixtures/image_tmp.jpg" - File.cp!("test/fixtures/image.jpg", upload_filename) - - file = %Plug.Upload{ - content_type: "image/jpg", - path: Path.absname(upload_filename), - filename: "image.jpg" - } - - response = - conn - |> assign(:user, user) - |> put_req_header("content-type", "application/octet-stream") - |> post("/api/media/upload", %{ - "media" => file - }) - |> json_response(:ok) - - assert response["media_id"] - object = Repo.get(Object, response["media_id"]) - assert object - assert object.data["actor"] == User.ap_id(user) - end - end - - describe "POST /api/media/metadata/create" do - setup do - object = insert(:note) - user = User.get_cached_by_ap_id(object.data["actor"]) - %{object: object, user: user} - end - - test "it returns :forbidden status on attempt to modify someone else's upload", %{ - conn: conn, - object: object - } do - initial_description = object.data["name"] - another_user = insert(:user) - - conn - |> assign(:user, another_user) - |> post("/api/media/metadata/create", %{"media_id" => object.id}) - |> json_response(:forbidden) - - object = Repo.get(Object, object.id) - assert object.data["name"] == initial_description - end - - test "it updates `data[name]` of referenced Object with provided value", %{ - conn: conn, - object: object, - user: user - } do - description = "Informative description of the image. Initial value: #{object.data["name"]}}" - - conn - |> assign(:user, user) - |> post("/api/media/metadata/create", %{ - "media_id" => object.id, - "alt_text" => %{"text" => description} - }) - |> json_response(:no_content) - - object = Repo.get(Object, object.id) - assert object.data["name"] == description - end - end - - describe "POST /api/statuses/user_timeline.json?user_id=:user_id&pinned=true" do - test "it returns a list of pinned statuses", %{conn: conn} do - Pleroma.Config.put([:instance, :max_pinned_statuses], 1) - - user = insert(:user, %{name: "egor"}) - {:ok, %{id: activity_id}} = CommonAPI.post(user, %{"status" => "HI!!!"}) - {:ok, _} = CommonAPI.pin(activity_id, user) - - resp = - conn - |> get("/api/statuses/user_timeline.json", %{user_id: user.id, pinned: true}) - |> json_response(200) - - assert length(resp) == 1 - assert [%{"id" => ^activity_id, "pinned" => true}] = resp - end - end - - describe "POST /api/statuses/pin/:id" do - setup do - Pleroma.Config.put([:instance, :max_pinned_statuses], 1) - [user: insert(:user)] - end - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/statuses/pin/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: user} do - {:ok, activity} = CommonAPI.post(user, %{"status" => "test!"}) - - request_path = "/api/statuses/pin/#{activity.id}.json" - - response = - conn - |> with_credentials(user.nickname, "test") - |> post(request_path) - - user = refresh_record(user) - - assert json_response(response, 200) == - ActivityView.render("activity.json", %{user: user, for: user, activity: activity}) - end - end - - describe "POST /api/statuses/unpin/:id" do - setup do - Pleroma.Config.put([:instance, :max_pinned_statuses], 1) - [user: insert(:user)] - end - - test "without valid credentials", %{conn: conn} do - note_activity = insert(:note_activity) - conn = post(conn, "/api/statuses/unpin/#{note_activity.id}.json") - assert json_response(conn, 403) == %{"error" => "Invalid credentials."} - end - - test "with credentials", %{conn: conn, user: user} do - {:ok, activity} = CommonAPI.post(user, %{"status" => "test!"}) - {:ok, activity} = CommonAPI.pin(activity.id, user) - - request_path = "/api/statuses/unpin/#{activity.id}.json" - - response = - conn - |> with_credentials(user.nickname, "test") - |> post(request_path) - - user = refresh_record(user) - - assert json_response(response, 200) == - ActivityView.render("activity.json", %{user: user, for: user, activity: activity}) - end - end - - describe "GET /api/oauth_tokens" do - setup do - token = insert(:oauth_token) |> Repo.preload(:user) - - %{token: token} - end - - test "renders list", %{token: token} do - response = - build_conn() - |> assign(:user, token.user) - |> get("/api/oauth_tokens") - - keys = - json_response(response, 200) - |> hd() - |> Map.keys() - - assert keys -- ["id", "app_name", "valid_until"] == [] - end - - test "revoke token", %{token: token} do - response = - build_conn() - |> assign(:user, token.user) - |> delete("/api/oauth_tokens/#{token.id}") - - tokens = Token.get_user_tokens(token.user) - - assert tokens == [] - assert response.status == 201 - end - end -end From cd78e63a2528ab813088d5e44a026f6bb05b344b Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Tue, 27 Aug 2019 14:34:37 +0300 Subject: [PATCH 055/400] [#1149] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription. --- lib/pleroma/workers/subscriber.ex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/workers/subscriber.ex b/lib/pleroma/workers/subscriber.ex index 783c44173..e960b35bf 100644 --- a/lib/pleroma/workers/subscriber.ex +++ b/lib/pleroma/workers/subscriber.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Workers.Subscriber do alias Pleroma.Repo alias Pleroma.Web.Federator - alias Pleroma.Web.Websub.WebsubClientSubscription + alias Pleroma.Web.Websub # Note: `max_attempts` is intended to be overridden in `new/1` call use Oban.Worker, @@ -18,12 +18,12 @@ def perform(%{"op" => "refresh_subscriptions"}, _job) do end def perform(%{"op" => "request_subscription", "websub_id" => websub_id}, _job) do - websub = Repo.get(WebsubClientSubscription, websub_id) + websub = Repo.get(Websub.WebsubClientSubscription, websub_id) Federator.perform(:request_subscription, websub) end def perform(%{"op" => "verify_websub", "websub_id" => websub_id}, _job) do - websub = Repo.get(WebsubClientSubscription, websub_id) + websub = Repo.get(Websub.WebsubServerSubscription, websub_id) Federator.perform(:verify_websub, websub) end end From 00abe099cd85b03b880908eef1e469e656d56365 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Tue, 27 Aug 2019 16:21:03 +0300 Subject: [PATCH 056/400] added tests for ActivityPub.like\unlike --- lib/pleroma/activity/queries.ex | 49 ++++++ lib/pleroma/object.ex | 2 - lib/pleroma/web/activity_pub/activity_pub.ex | 9 +- .../activity_pub/activity_pub_controller.ex | 59 +++---- lib/pleroma/web/activity_pub/utils.ex | 150 ++++++++---------- test/support/factory.ex | 16 +- test/web/activity_pub/activity_pub_test.exs | 44 +++++ test/web/activity_pub/utils_test.exs | 102 ++++++++++++ 8 files changed, 304 insertions(+), 127 deletions(-) create mode 100644 lib/pleroma/activity/queries.ex diff --git a/lib/pleroma/activity/queries.ex b/lib/pleroma/activity/queries.ex new file mode 100644 index 000000000..aa5b29566 --- /dev/null +++ b/lib/pleroma/activity/queries.ex @@ -0,0 +1,49 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Activity.Queries do + @moduledoc """ + Contains queries for Activity. + """ + + import Ecto.Query, only: [from: 2] + + @type query :: Ecto.Queryable.t() | Activity.t() + + alias Pleroma.Activity + + @spec by_actor(query, String.t()) :: query + def by_actor(query \\ Activity, actor) do + from( + activity in query, + where: fragment("(?)->>'actor' = ?", activity.data, ^actor) + ) + end + + @spec by_object_id(query, String.t()) :: query + def by_object_id(query \\ Activity, object_id) do + from(activity in query, + where: + fragment( + "coalesce((?)->'object'->>'id', (?)->>'object') = ?", + activity.data, + activity.data, + ^object_id + ) + ) + end + + @spec by_type(query, String.t()) :: query + def by_type(query \\ Activity, activity_type) do + from( + activity in query, + where: fragment("(?)->>'type' = ?", activity.data, ^activity_type) + ) + end + + @spec limit(query, pos_integer()) :: query + def limit(query \\ Activity, limit) do + from(activity in query, limit: ^limit) + end +end diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index c8d339c19..d58eb7f7d 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -150,8 +150,6 @@ def set_cache(%Object{data: %{"id" => ap_id}} = object) do def update_and_set_cache(changeset) do with {:ok, object} <- Repo.update(changeset) do set_cache(object) - else - e -> e end end diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 172c952d4..eeb826814 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -139,7 +139,7 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when # Splice in the child object if we have one. activity = - if !is_nil(object) do + if not is_nil(object) do Map.put(activity, :object, object) else activity @@ -331,12 +331,7 @@ def like( end end - def unlike( - %User{} = actor, - %Object{} = object, - activity_id \\ nil, - local \\ true - ) do + def unlike(%User{} = actor, %Object{} = object, activity_id \\ nil, local \\ true) do with %Activity{} = like_activity <- get_existing_like(actor.ap_id, object), unlike_data <- make_unlike_data(actor, like_activity, activity_id), {:ok, unlike_activity} <- insert(unlike_data, local), diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index ed801a7ae..5c73fc9f3 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -309,42 +309,43 @@ def handle_user_activity(_, _) do end def update_outbox( - %{assigns: %{user: user}} = conn, + %{assigns: %{user: %User{nickname: user_nickname} = user}} = conn, %{"nickname" => nickname} = params - ) do - if nickname == user.nickname do - actor = user.ap_id() + ) + when user_nickname == nickname do + actor = user.ap_id() - params = - params - |> Map.drop(["id"]) - |> Map.put("actor", actor) - |> Transmogrifier.fix_addressing() - - with {:ok, %Activity{} = activity} <- handle_user_activity(user, params) do - conn - |> put_status(:created) - |> put_resp_header("location", activity.data["id"]) - |> json(activity.data) - else - {:error, message} -> - conn - |> put_status(:bad_request) - |> json(message) - end - else - err = - dgettext("errors", "can't update outbox of %{nickname} as %{as_nickname}", - nickname: nickname, - as_nickname: user.nickname - ) + params = + params + |> Map.drop(["id"]) + |> Map.put("actor", actor) + |> Transmogrifier.fix_addressing() + with {:ok, %Activity{} = activity} <- handle_user_activity(user, params) do conn - |> put_status(:forbidden) - |> json(err) + |> put_status(:created) + |> put_resp_header("location", activity.data["id"]) + |> json(activity.data) + else + {:error, message} -> + conn + |> put_status(:bad_request) + |> json(message) end end + def update_outbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = _) do + err = + dgettext("errors", "can't update outbox of %{nickname} as %{as_nickname}", + nickname: nickname, + as_nickname: user.nickname + ) + + conn + |> put_status(:forbidden) + |> json(err) + end + def errors(conn, {:error, :not_found}) do conn |> put_status(:not_found) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 1c3058658..c9c0c3763 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -166,6 +166,7 @@ def create_context(context) do @doc """ Enqueues an activity for federation if it's local """ + @spec maybe_federate(any()) :: :ok def maybe_federate(%Activity{local: true} = activity) do if Pleroma.Config.get!([:instance, :federating]) do priority = @@ -256,46 +257,27 @@ def insert_full_object(map), do: {:ok, map, nil} @doc """ Returns an existing like if a user already liked an object """ + @spec get_existing_like(String.t(), map()) :: Activity.t() | nil def get_existing_like(actor, %{data: %{"id" => id}}) do - query = - from( - activity in Activity, - where: fragment("(?)->>'actor' = ?", activity.data, ^actor), - # this is to use the index - where: - fragment( - "coalesce((?)->'object'->>'id', (?)->>'object') = ?", - activity.data, - activity.data, - ^id - ), - where: fragment("(?)->>'type' = 'Like'", activity.data) - ) - - Repo.one(query) + actor + |> Activity.Queries.by_actor() + |> Activity.Queries.by_object_id(id) + |> Activity.Queries.by_type("Like") + |> Activity.Queries.limit(1) + |> Repo.one() end @doc """ Returns like activities targeting an object """ def get_object_likes(%{data: %{"id" => id}}) do - query = - from( - activity in Activity, - # this is to use the index - where: - fragment( - "coalesce((?)->'object'->>'id', (?)->>'object') = ?", - activity.data, - activity.data, - ^id - ), - where: fragment("(?)->>'type' = 'Like'", activity.data) - ) - - Repo.all(query) + id + |> Activity.Queries.by_object_id() + |> Activity.Queries.by_type("Like") + |> Repo.all() end + @spec make_like_data(User.t(), map(), String.t()) :: map() def make_like_data( %User{ap_id: ap_id} = actor, %{data: %{"actor" => object_actor_id, "id" => id}} = object, @@ -315,7 +297,7 @@ def make_like_data( |> List.delete(actor.ap_id) |> List.delete(object_actor.follower_address) - data = %{ + %{ "type" => "Like", "actor" => ap_id, "object" => id, @@ -323,38 +305,49 @@ def make_like_data( "cc" => cc, "context" => object.data["context"] } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end + @spec update_element_in_object(String.t(), list(any), Object.t()) :: + {:ok, Object.t()} | {:error, Ecto.Changeset.t()} def update_element_in_object(property, element, object) do - with new_data <- - object.data - |> Map.put("#{property}_count", length(element)) - |> Map.put("#{property}s", element), - changeset <- Changeset.change(object, data: new_data), - {:ok, object} <- Object.update_and_set_cache(changeset) do - {:ok, object} - end + data = + Map.merge( + object.data, + %{"#{property}_count" => length(element), "#{property}s" => element} + ) + + object + |> Changeset.change(data: data) + |> Object.update_and_set_cache() end - def update_likes_in_object(likes, object) do + @spec add_like_to_object(Activity.t(), Object.t()) :: + {:ok, Object.t()} | {:error, Ecto.Changeset.t()} + def add_like_to_object(%Activity{data: %{"actor" => actor}}, object) do + [actor | fetch_likes(object)] + |> Enum.uniq() + |> update_likes_in_object(object) + end + + @spec remove_like_from_object(Activity.t(), Object.t()) :: + {:ok, Object.t()} | {:error, Ecto.Changeset.t()} + def remove_like_from_object(%Activity{data: %{"actor" => actor}}, object) do + object + |> fetch_likes() + |> List.delete(actor) + |> update_likes_in_object(object) + end + + defp update_likes_in_object(likes, object) do update_element_in_object("like", likes, object) end - def add_like_to_object(%Activity{data: %{"actor" => actor}}, object) do - likes = if is_list(object.data["likes"]), do: object.data["likes"], else: [] - - with likes <- [actor | likes] |> Enum.uniq() do - update_likes_in_object(likes, object) - end - end - - def remove_like_from_object(%Activity{data: %{"actor" => actor}}, object) do - likes = if is_list(object.data["likes"]), do: object.data["likes"], else: [] - - with likes <- likes |> List.delete(actor) do - update_likes_in_object(likes, object) + defp fetch_likes(object) do + if is_list(object.data["likes"]) do + object.data["likes"] + else + [] end end @@ -405,7 +398,7 @@ def make_follow_data( %User{ap_id: followed_id} = _followed, activity_id ) do - data = %{ + %{ "type" => "Follow", "actor" => follower_id, "to" => [followed_id], @@ -413,10 +406,7 @@ def make_follow_data( "object" => followed_id, "state" => "pending" } - - data = if activity_id, do: Map.put(data, "id", activity_id), else: data - - data + |> maybe_put("id", activity_id) end def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do @@ -478,7 +468,7 @@ def make_announce_data( activity_id, false ) do - data = %{ + %{ "type" => "Announce", "actor" => ap_id, "object" => id, @@ -486,8 +476,7 @@ def make_announce_data( "cc" => [], "context" => object.data["context"] } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end def make_announce_data( @@ -496,7 +485,7 @@ def make_announce_data( activity_id, true ) do - data = %{ + %{ "type" => "Announce", "actor" => ap_id, "object" => id, @@ -504,8 +493,7 @@ def make_announce_data( "cc" => [Pleroma.Constants.as_public()], "context" => object.data["context"] } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end @doc """ @@ -516,7 +504,7 @@ def make_unannounce_data( %Activity{data: %{"context" => context}} = activity, activity_id ) do - data = %{ + %{ "type" => "Undo", "actor" => ap_id, "object" => activity.data, @@ -524,8 +512,7 @@ def make_unannounce_data( "cc" => [Pleroma.Constants.as_public()], "context" => context } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end def make_unlike_data( @@ -533,7 +520,7 @@ def make_unlike_data( %Activity{data: %{"context" => context}} = activity, activity_id ) do - data = %{ + %{ "type" => "Undo", "actor" => ap_id, "object" => activity.data, @@ -541,8 +528,7 @@ def make_unlike_data( "cc" => [Pleroma.Constants.as_public()], "context" => context } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end def add_announce_to_object( @@ -573,14 +559,13 @@ def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do #### Unfollow-related helpers def make_unfollow_data(follower, followed, follow_activity, activity_id) do - data = %{ + %{ "type" => "Undo", "actor" => follower.ap_id, "to" => [followed.ap_id], "object" => follow_activity.data } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end #### Block-related helpers @@ -610,25 +595,23 @@ def fetch_latest_block(%User{ap_id: blocker_id}, %User{ap_id: blocked_id}) do end def make_block_data(blocker, blocked, activity_id) do - data = %{ + %{ "type" => "Block", "actor" => blocker.ap_id, "to" => [blocked.ap_id], "object" => blocked.ap_id } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end def make_unblock_data(blocker, blocked, block_activity, activity_id) do - data = %{ + %{ "type" => "Undo", "actor" => blocker.ap_id, "to" => [blocked.ap_id], "object" => block_activity.data } - - if activity_id, do: Map.put(data, "id", activity_id), else: data + |> maybe_put("id", activity_id) end #### Create-related helpers @@ -799,4 +782,7 @@ def get_existing_votes(actor, %{data: %{"id" => id}}) do Repo.all(query) end + + defp maybe_put(map, _key, nil), do: map + defp maybe_put(map, key, value), do: Map.put(map, key, value) end diff --git a/test/support/factory.ex b/test/support/factory.ex index 62d1de717..719115003 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -207,13 +207,15 @@ def like_activity_factory(attrs \\ %{}) do object = Object.normalize(note_activity) user = insert(:user) - data = %{ - "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), - "actor" => user.ap_id, - "type" => "Like", - "object" => object.data["id"], - "published_at" => DateTime.utc_now() |> DateTime.to_iso8601() - } + data = + %{ + "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(), + "actor" => user.ap_id, + "type" => "Like", + "object" => object.data["id"], + "published_at" => DateTime.utc_now() |> DateTime.to_iso8601() + } + |> Map.merge(attrs[:data_attrs] || %{}) %Pleroma.Activity{ data: data diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 1515f4eb6..f72b44aed 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -21,6 +21,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do :ok end + clear_config([:instance, :federating]) + describe "streaming out participations" do test "it streams them out" do user = insert(:user) @@ -676,6 +678,29 @@ test "returns reblogs for users for whom reblogs have not been muted" do end describe "like an object" do + test_with_mock "sends an activity to federation", Pleroma.Web.Federator, [:passthrough], [] do + Pleroma.Config.put([:instance, :federating], true) + note_activity = insert(:note_activity) + assert object_activity = Object.normalize(note_activity) + + user = insert(:user) + + {:ok, like_activity, _object} = ActivityPub.like(user, object_activity) + assert called(Pleroma.Web.Federator.publish(like_activity, 5)) + end + + test "returns exist activity if object already liked" do + note_activity = insert(:note_activity) + assert object_activity = Object.normalize(note_activity) + + user = insert(:user) + + {:ok, like_activity, _object} = ActivityPub.like(user, object_activity) + + {:ok, like_activity_exist, _object} = ActivityPub.like(user, object_activity) + assert like_activity == like_activity_exist + end + test "adds a like activity to the db" do note_activity = insert(:note_activity) assert object = Object.normalize(note_activity) @@ -706,6 +731,25 @@ test "adds a like activity to the db" do end describe "unliking" do + test_with_mock "sends an activity to federation", Pleroma.Web.Federator, [:passthrough], [] do + Pleroma.Config.put([:instance, :federating], true) + + note_activity = insert(:note_activity) + object = Object.normalize(note_activity) + user = insert(:user) + + {:ok, object} = ActivityPub.unlike(user, object) + refute called(Pleroma.Web.Federator.publish()) + + {:ok, _like_activity, object} = ActivityPub.like(user, object) + assert object.data["like_count"] == 1 + + {:ok, unlike_activity, _, object} = ActivityPub.unlike(user, object) + assert object.data["like_count"] == 0 + + assert called(Pleroma.Web.Federator.publish(unlike_activity, 5)) + end + test "unliking a previously liked object" do note_activity = insert(:note_activity) object = Object.normalize(note_activity) diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs index ca5f057a7..eb429b2c4 100644 --- a/test/web/activity_pub/utils_test.exs +++ b/test/web/activity_pub/utils_test.exs @@ -14,6 +14,8 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do import Pleroma.Factory + require Pleroma.Constants + describe "fetch the latest Follow" do test "fetches the latest Follow activity" do %Activity{data: %{"type" => "Follow"}} = activity = insert(:follow_activity) @@ -87,6 +89,32 @@ test "works with an object that has only IR tags" do end end + describe "make_unlike_data/3" do + test "returns data for unlike activity" do + user = insert(:user) + like_activity = insert(:like_activity, data_attrs: %{"context" => "test context"}) + + assert Utils.make_unlike_data(user, like_activity, nil) == %{ + "type" => "Undo", + "actor" => user.ap_id, + "object" => like_activity.data, + "to" => [user.follower_address, like_activity.data["actor"]], + "cc" => [Pleroma.Constants.as_public()], + "context" => like_activity.data["context"] + } + + assert Utils.make_unlike_data(user, like_activity, "9mJEZK0tky1w2xD2vY") == %{ + "type" => "Undo", + "actor" => user.ap_id, + "object" => like_activity.data, + "to" => [user.follower_address, like_activity.data["actor"]], + "cc" => [Pleroma.Constants.as_public()], + "context" => like_activity.data["context"], + "id" => "9mJEZK0tky1w2xD2vY" + } + end + end + describe "make_like_data" do setup do user = insert(:user) @@ -299,4 +327,78 @@ test "updates the state of the given follow activity" do assert Repo.get(Activity, follow_activity_two.id).data["state"] == "reject" end end + + describe "update_element_in_object/3" do + test "updates likes" do + user = insert(:user) + activity = insert(:note_activity) + object = Object.normalize(activity) + + assert {:ok, updated_object} = + Utils.update_element_in_object( + "like", + [user.ap_id], + object + ) + + assert updated_object.data["likes"] == [user.ap_id] + assert updated_object.data["like_count"] == 1 + end + end + + describe "add_like_to_object/2" do + test "add actor to likes" do + user = insert(:user) + user2 = insert(:user) + object = insert(:note) + + assert {:ok, updated_object} = + Utils.add_like_to_object( + %Activity{data: %{"actor" => user.ap_id}}, + object + ) + + assert updated_object.data["likes"] == [user.ap_id] + assert updated_object.data["like_count"] == 1 + + assert {:ok, updated_object2} = + Utils.add_like_to_object( + %Activity{data: %{"actor" => user2.ap_id}}, + updated_object + ) + + assert updated_object2.data["likes"] == [user2.ap_id, user.ap_id] + assert updated_object2.data["like_count"] == 2 + end + end + + describe "remove_like_from_object/2" do + test "removes ap_id from likes" do + user = insert(:user) + user2 = insert(:user) + object = insert(:note, data: %{"likes" => [user.ap_id, user2.ap_id], "like_count" => 2}) + + assert {:ok, updated_object} = + Utils.remove_like_from_object( + %Activity{data: %{"actor" => user.ap_id}}, + object + ) + + assert updated_object.data["likes"] == [user2.ap_id] + assert updated_object.data["like_count"] == 1 + end + end + + describe "get_existing_like/2" do + test "fetches existing like" do + note_activity = insert(:note_activity) + assert object = Object.normalize(note_activity) + + user = insert(:user) + refute Utils.get_existing_like(user.ap_id, object) + {:ok, like_activity, _object} = ActivityPub.like(user, object) + + assert ^like_activity = Utils.get_existing_like(user.ap_id, object) + end + end end From c30cc039e423e8f31d0222747e301514b7d0dd9e Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 27 Aug 2019 12:22:30 -0500 Subject: [PATCH 057/400] Transmogrifier: Use Containment.get_actor to get actors. --- lib/pleroma/object.ex | 4 ---- lib/pleroma/web/activity_pub/transmogrifier.ex | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index 468549c87..c8d339c19 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -230,8 +230,4 @@ def increase_vote_count(ap_id, name) do _ -> :noop end end - - def get_ap_id(%{"id" => id}), do: id - def get_ap_id(id) when is_binary(id), do: id - def get_ap_id(_), do: {:error, "Object is not a string and has no id."} end diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 6c4259c02..468961bd0 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -464,8 +464,10 @@ def handle_incoming( %{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = data, _options ) do - with %User{local: true} = followed <- User.get_cached_by_ap_id(Object.get_ap_id(followed)), - {:ok, %User{} = follower} <- User.get_or_fetch_by_ap_id(Object.get_ap_id(follower)), + with %User{local: true} = followed <- + User.get_cached_by_ap_id(Containment.get_actor(%{"actor" => followed})), + {:ok, %User{} = follower} <- + User.get_or_fetch_by_ap_id(Containment.get_actor(%{"actor" => follower})), {:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do with deny_follow_blocked <- Pleroma.Config.get([:user, :deny_follow_blocked]), {_, false} <- {:user_blocked, User.blocks?(followed, follower) && deny_follow_blocked}, From ffcd742aa0797b5bb872e58c1e605f22c8652250 Mon Sep 17 00:00:00 2001 From: Maksim Date: Tue, 27 Aug 2019 17:37:19 +0000 Subject: [PATCH 058/400] Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex --- lib/pleroma/web/activity_pub/activity_pub_controller.ex | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index 5c73fc9f3..08bf1c752 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -309,10 +309,9 @@ def handle_user_activity(_, _) do end def update_outbox( - %{assigns: %{user: %User{nickname: user_nickname} = user}} = conn, + %{assigns: %{user: %User{nickname: nickname} = user}} = conn, %{"nickname" => nickname} = params - ) - when user_nickname == nickname do + ) do actor = user.ap_id() params = From 5e4fde1d3d49ec56fae3b199fb4af51057e2dffd Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Tue, 27 Aug 2019 20:48:16 +0300 Subject: [PATCH 059/400] Filter logs by date --- lib/pleroma/moderation_log.ex | 37 ++++++++++++++- lib/pleroma/user/info.ex | 4 +- .../web/admin_api/admin_api_controller.ex | 8 +++- .../admin_api/admin_api_controller_test.exs | 46 +++++++++++++++++++ 4 files changed, 89 insertions(+), 6 deletions(-) diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index 1ef6fe67a..2164ecfc2 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -14,13 +14,46 @@ defmodule Pleroma.ModerationLog do timestamps() end - def get_all(page, page_size) do + def get_all(params) do + params + |> get_all_query() + |> maybe_filter_by_date(params) + |> Repo.all() + end + + defp maybe_filter_by_date(query, %{start_date: nil, end_date: nil}), do: query + + defp maybe_filter_by_date(query, %{start_date: start_date, end_date: nil}) do + from(q in query, + where: q.inserted_at >= ^parse_datetime(start_date) + ) + end + + defp maybe_filter_by_date(query, %{start_date: nil, end_date: end_date}) do + from(q in query, + where: q.inserted_at <= ^parse_datetime(end_date) + ) + end + + defp maybe_filter_by_date(query, %{start_date: start_date, end_date: end_date}) do + from(q in query, + where: q.inserted_at >= ^parse_datetime(start_date), + where: q.inserted_at <= ^parse_datetime(end_date) + ) + end + + defp get_all_query(%{page: page, page_size: page_size}) do from(q in __MODULE__, order_by: [desc: q.inserted_at], limit: ^page_size, offset: ^((page - 1) * page_size) ) - |> Repo.all() + end + + defp parse_datetime(datetime) do + {:ok, parsed_datetime, _} = DateTime.from_iso8601(datetime) + + parsed_datetime end def insert_log(%{ diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 779bfbc18..7027c947b 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -318,9 +318,7 @@ defp valid_field?(%{"name" => name, "value" => value}) do name_limit = Pleroma.Config.get([:instance, :account_field_name_length], 255) value_limit = Pleroma.Config.get([:instance, :account_field_value_length], 255) - is_binary(name) && - is_binary(value) && - String.length(name) <= name_limit && + is_binary(name) && is_binary(value) && String.length(name) <= name_limit && String.length(value) <= value_limit end diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 544b9d7d8..065394a24 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -539,7 +539,13 @@ def status_delete(%{assigns: %{user: user}} = conn, %{"id" => id}) do def list_log(conn, params) do {page, page_size} = page_params(params) - log = ModerationLog.get_all(page, page_size) + log = + ModerationLog.get_all(%{ + page: page, + page_size: page_size, + start_date: params["start_date"], + end_date: params["end_date"] + }) conn |> put_view(ModerationLogView) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 4e2c27431..a7269aee9 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -2348,6 +2348,52 @@ test "returns the log with pagination", %{conn: conn, admin: admin} do assert second_entry["message"] == "@#{admin.nickname} followed relay: https://example.org/relay" end + + test "filters log by date", %{conn: conn, admin: admin} do + first_date = "2017-08-15T15:47:06Z" + second_date = "2017-08-20T15:47:06Z" + + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_follow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.from_iso8601!(first_date) + }) + + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_unfollow", + target: "https://example.org/relay" + }, + inserted_at: NaiveDateTime.from_iso8601!(second_date) + }) + + conn1 = + get( + conn, + "/api/pleroma/admin/moderation_log?start_date=#{second_date}" + ) + + response1 = json_response(conn1, 200) + [first_entry] = response1 + + assert response1 |> length() == 1 + assert first_entry["data"]["action"] == "relay_unfollow" + + assert first_entry["message"] == + "@#{admin.nickname} unfollowed relay: https://example.org/relay" + end end end From 7853b3f17d3b57d7ac91bc909a57143674f57272 Mon Sep 17 00:00:00 2001 From: feld Date: Fri, 30 Aug 2019 00:38:03 +0000 Subject: [PATCH 060/400] Fix AntiFollowbotPolicy when trying to follow a relay --- CHANGELOG.md | 1 + .../web/activity_pub/mrf/anti_followbot_policy.ex | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20af9badc..4acb749ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Reverse Proxy limiting `max_body_length` was incorrectly defined and only checked `Content-Length` headers which may not be sufficient in some circumstances - MRF: fix use of unserializable keyword lists in describe() implementations - ActivityPub: Deactivated user deletion +- MRF: fix ability to follow a relay when AntiFollowbotPolicy was enabled ### Added - Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically. diff --git a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex index de1eb4aa5..b3547ecd4 100644 --- a/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/anti_followbot_policy.ex @@ -25,11 +25,15 @@ defp score_displayname("fedibot"), do: 1.0 defp score_displayname(_), do: 0.0 defp determine_if_followbot(%User{nickname: nickname, name: displayname}) do - # nickname will always be a binary string because it's generated by Pleroma. + # nickname will be a binary string except when following a relay nick_score = - nickname - |> String.downcase() - |> score_nickname() + if is_binary(nickname) do + nickname + |> String.downcase() + |> score_nickname() + else + 0.0 + end # displayname will either be a binary string or nil, if a displayname isn't set. name_score = From cef2e980b1f6b07c2bdb01030559aca83257bd7e Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Wed, 28 Aug 2019 21:32:44 +0300 Subject: [PATCH 061/400] division emoji.ex on loader.ex and emoji.ex --- lib/mix/tasks/pleroma/emoji.ex | 2 +- lib/pleroma/emoji.ex | 212 +++------------------------------ lib/pleroma/emoji/loader.ex | 204 +++++++++++++++++++++++++++++++ test/emoji/loader_test.exs | 83 +++++++++++++ test/emoji_test.exs | 75 ------------ 5 files changed, 304 insertions(+), 272 deletions(-) create mode 100644 lib/pleroma/emoji/loader.ex create mode 100644 test/emoji/loader_test.exs diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex index c2225af7d..dc5f7c193 100644 --- a/lib/mix/tasks/pleroma/emoji.ex +++ b/lib/mix/tasks/pleroma/emoji.ex @@ -235,7 +235,7 @@ def run(["gen-pack", src]) do cwd: tmp_pack_dir ) - emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts) + emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts) File.write!(files_name, Jason.encode!(emoji_map, pretty: true)) diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index 66e20f0e4..ab6ba7d6a 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -4,24 +4,22 @@ defmodule Pleroma.Emoji do @moduledoc """ - The emojis are loaded from: - - * emoji packs in INSTANCE-DIR/emoji - * the files: `config/emoji.txt` and `config/custom_emoji.txt` - * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder - - This GenServer stores in an ETS table the list of the loaded emojis, and also allows to reload the list at runtime. + This GenServer stores in an ETS table the list of the loaded emojis, + and also allows to reload the list at runtime. """ use GenServer + alias Pleroma.Emoji.Loader + require Logger - @type pattern :: Regex.t() | module() | String.t() - @type patterns :: pattern() | [pattern()] - @type group_patterns :: keyword(patterns()) - @ets __MODULE__.Ets - @ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}] + @ets_options [ + :ordered_set, + :protected, + :named_table, + {:read_concurrency, true} + ] @doc false def start_link(_) do @@ -44,7 +42,7 @@ def get(name) do end @doc "Returns all the emojos!!" - @spec get_all() :: [{String.t(), String.t()}, ...] + @spec get_all() :: list({String.t(), String.t(), String.t()}) def get_all do :ets.tab2list(@ets) end @@ -58,13 +56,13 @@ def init(_) do @doc false def handle_cast(:reload, state) do - load() + update_emojis(Loader.load()) {:noreply, state} end @doc false def handle_call(:reload, _from, state) do - load() + update_emojis(Loader.load()) {:reply, :ok, state} end @@ -75,189 +73,11 @@ def terminate(_, _) do @doc false def code_change(_old_vsn, state, _extra) do - load() + update_emojis(Loader.load()) {:ok, state} end - defp load do - emoji_dir_path = - Path.join( - Pleroma.Config.get!([:instance, :static_dir]), - "emoji" - ) - - emoji_groups = Pleroma.Config.get([:emoji, :groups]) - - case File.ls(emoji_dir_path) do - {:error, :enoent} -> - # The custom emoji directory doesn't exist, - # don't do anything - nil - - {:error, e} -> - # There was some other error - Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}") - - {:ok, results} -> - grouped = - Enum.group_by(results, fn file -> File.dir?(Path.join(emoji_dir_path, file)) end) - - packs = grouped[true] || [] - files = grouped[false] || [] - - # Print the packs we've found - Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}") - - if not Enum.empty?(files) do - Logger.warn( - "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{ - Enum.join(files, ", ") - }" - ) - end - - emojis = - Enum.flat_map( - packs, - fn pack -> load_pack(Path.join(emoji_dir_path, pack), emoji_groups) end - ) - - true = :ets.insert(@ets, emojis) - end - - # Compat thing for old custom emoji handling & default emoji, - # it should run even if there are no emoji packs - shortcode_globs = Pleroma.Config.get([:emoji, :shortcode_globs], []) - - emojis = - (load_from_file("config/emoji.txt", emoji_groups) ++ - load_from_file("config/custom_emoji.txt", emoji_groups) ++ - load_from_globs(shortcode_globs, emoji_groups)) - |> Enum.reject(fn value -> value == nil end) - - true = :ets.insert(@ets, emojis) - - :ok - end - - defp load_pack(pack_dir, emoji_groups) do - pack_name = Path.basename(pack_dir) - - emoji_txt = Path.join(pack_dir, "emoji.txt") - - if File.exists?(emoji_txt) do - load_from_file(emoji_txt, emoji_groups) - else - extensions = Pleroma.Config.get([:emoji, :pack_extensions]) - - Logger.info( - "No emoji.txt found for pack \"#{pack_name}\", assuming all #{Enum.join(extensions, ", ")} files are emoji" - ) - - make_shortcode_to_file_map(pack_dir, extensions) - |> Enum.map(fn {shortcode, rel_file} -> - filename = Path.join("/emoji/#{pack_name}", rel_file) - - {shortcode, filename, [to_string(match_extra(emoji_groups, filename))]} - end) - end - end - - def make_shortcode_to_file_map(pack_dir, exts) do - find_all_emoji(pack_dir, exts) - |> Enum.map(&Path.relative_to(&1, pack_dir)) - |> Enum.map(fn f -> {f |> Path.basename() |> Path.rootname(), f} end) - |> Enum.into(%{}) - end - - def find_all_emoji(dir, exts) do - Enum.reduce( - File.ls!(dir), - [], - fn f, acc -> - filepath = Path.join(dir, f) - - if File.dir?(filepath) do - acc ++ find_all_emoji(filepath, exts) - else - acc ++ [filepath] - end - end - ) - |> Enum.filter(fn f -> Path.extname(f) in exts end) - end - - defp load_from_file(file, emoji_groups) do - if File.exists?(file) do - load_from_file_stream(File.stream!(file), emoji_groups) - else - [] - end - end - - defp load_from_file_stream(stream, emoji_groups) do - stream - |> Stream.map(&String.trim/1) - |> Stream.map(fn line -> - case String.split(line, ~r/,\s*/) do - [name, file] -> - {name, file, [to_string(match_extra(emoji_groups, file))]} - - [name, file | tags] -> - {name, file, tags} - - _ -> - nil - end - end) - |> Enum.to_list() - end - - defp load_from_globs(globs, emoji_groups) do - static_path = Path.join(:code.priv_dir(:pleroma), "static") - - paths = - Enum.map(globs, fn glob -> - Path.join(static_path, glob) - |> Path.wildcard() - end) - |> Enum.concat() - - Enum.map(paths, fn path -> - tag = match_extra(emoji_groups, Path.join("/", Path.relative_to(path, static_path))) - shortcode = Path.basename(path, Path.extname(path)) - external_path = Path.join("/", Path.relative_to(path, static_path)) - {shortcode, external_path, [to_string(tag)]} - end) - end - - @doc """ - Finds a matching group for the given emoji filename - """ - @spec match_extra(group_patterns(), String.t()) :: atom() | nil - def match_extra(group_patterns, filename) do - match_group_patterns(group_patterns, fn pattern -> - case pattern do - %Regex{} = regex -> Regex.match?(regex, filename) - string when is_binary(string) -> filename == string - end - end) - end - - defp match_group_patterns(group_patterns, matcher) do - Enum.find_value(group_patterns, fn {group, patterns} -> - patterns = - patterns - |> List.wrap() - |> Enum.map(fn pattern -> - if String.contains?(pattern, "*") do - ~r(#{String.replace(pattern, "*", ".*")}) - else - pattern - end - end) - - Enum.any?(patterns, matcher) && group - end) + defp update_emojis(emojis) do + :ets.insert(@ets, emojis) end end diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex new file mode 100644 index 000000000..e93b0aecc --- /dev/null +++ b/lib/pleroma/emoji/loader.ex @@ -0,0 +1,204 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Emoji.Loader do + @moduledoc """ + The Loader emoji from: + + * emoji packs in INSTANCE-DIR/emoji + * the files: `config/emoji.txt` and `config/custom_emoji.txt` + * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder + """ + alias Pleroma.Config + + require Logger + + @type pattern :: Regex.t() | module() | String.t() + @type patterns :: pattern() | [pattern()] + @type group_patterns :: keyword(patterns()) + @type emoji :: {String.t(), String.t(), list(String.t())} + + @doc """ + Loads emojis from files/packs. + + returns list emojis in format: + `{"000", "/emoji/freespeechextremist.com/000.png", ["Custom"]}` + """ + @spec load() :: list(emoji) + def load do + emoji_dir_path = Path.join(Config.get!([:instance, :static_dir]), "emoji") + + emoji_groups = Config.get([:emoji, :groups]) + + emojis = + case File.ls(emoji_dir_path) do + {:error, :enoent} -> + # The custom emoji directory doesn't exist, + # don't do anything + [] + + {:error, e} -> + # There was some other error + Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}") + [] + + {:ok, results} -> + grouped = + Enum.group_by(results, fn file -> + File.dir?(Path.join(emoji_dir_path, file)) + end) + + packs = grouped[true] || [] + files = grouped[false] || [] + + # Print the packs we've found + Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}") + + if not Enum.empty?(files) do + Logger.warn( + "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{ + Enum.join(files, ", ") + }" + ) + end + + Enum.flat_map(packs, fn pack -> + load_pack(Path.join(emoji_dir_path, pack), emoji_groups) + end) + end + + # Compat thing for old custom emoji handling & default emoji, + # it should run even if there are no emoji packs + shortcode_globs = Config.get([:emoji, :shortcode_globs], []) + + emojis_txt = + (load_from_file("config/emoji.txt", emoji_groups) ++ + load_from_file("config/custom_emoji.txt", emoji_groups) ++ + load_from_globs(shortcode_globs, emoji_groups)) + |> Enum.reject(fn value -> value == nil end) + + emojis ++ emojis_txt + end + + defp load_pack(pack_dir, emoji_groups) do + pack_name = Path.basename(pack_dir) + + emoji_txt = Path.join(pack_dir, "emoji.txt") + + if File.exists?(emoji_txt) do + load_from_file(emoji_txt, emoji_groups) + else + extensions = Config.get([:emoji, :pack_extensions]) + + Logger.info( + "No emoji.txt found for pack \"#{pack_name}\", assuming all #{Enum.join(extensions, ", ")} files are emoji" + ) + + make_shortcode_to_file_map(pack_dir, extensions) + |> Enum.map(fn {shortcode, rel_file} -> + filename = Path.join("/emoji/#{pack_name}", rel_file) + + {shortcode, filename, [to_string(match_extra(emoji_groups, filename))]} + end) + end + end + + def make_shortcode_to_file_map(pack_dir, exts) do + find_all_emoji(pack_dir, exts) + |> Enum.map(&Path.relative_to(&1, pack_dir)) + |> Enum.map(fn f -> {f |> Path.basename() |> Path.rootname(), f} end) + |> Enum.into(%{}) + end + + def find_all_emoji(dir, exts) do + Enum.reduce( + File.ls!(dir), + [], + fn f, acc -> + filepath = Path.join(dir, f) + + if File.dir?(filepath) do + acc ++ find_all_emoji(filepath, exts) + else + acc ++ [filepath] + end + end + ) + |> Enum.filter(fn f -> Path.extname(f) in exts end) + end + + defp load_from_file(file, emoji_groups) do + if File.exists?(file) do + load_from_file_stream(File.stream!(file), emoji_groups) + else + [] + end + end + + defp load_from_file_stream(stream, emoji_groups) do + stream + |> Stream.map(&String.trim/1) + |> Stream.map(fn line -> + case String.split(line, ~r/,\s*/) do + [name, file] -> + {name, file, [to_string(match_extra(emoji_groups, file))]} + + [name, file | tags] -> + {name, file, tags} + + _ -> + nil + end + end) + |> Enum.to_list() + end + + defp load_from_globs(globs, emoji_groups) do + static_path = Path.join(:code.priv_dir(:pleroma), "static") + + paths = + Enum.map(globs, fn glob -> + Path.join(static_path, glob) + |> Path.wildcard() + end) + |> Enum.concat() + + Enum.map(paths, fn path -> + tag = match_extra(emoji_groups, Path.join("/", Path.relative_to(path, static_path))) + shortcode = Path.basename(path, Path.extname(path)) + external_path = Path.join("/", Path.relative_to(path, static_path)) + {shortcode, external_path, [to_string(tag)]} + end) + end + + @doc """ + Finds a matching group for the given emoji filename + """ + @spec match_extra(group_patterns(), String.t()) :: atom() | nil + def match_extra(group_patterns, filename) do + match_group_patterns(group_patterns, fn pattern -> + case pattern do + %Regex{} = regex -> Regex.match?(regex, filename) + string when is_binary(string) -> filename == string + end + end) + end + + defp match_group_patterns(group_patterns, matcher) do + Enum.find_value(group_patterns, fn {group, patterns} -> + patterns = + patterns + |> List.wrap() + |> Enum.map(fn pattern -> + if String.contains?(pattern, "*") do + ~r(#{String.replace(pattern, "*", ".*")}) + else + pattern + end + end) + + Enum.any?(patterns, matcher) && group + end) + end +end diff --git a/test/emoji/loader_test.exs b/test/emoji/loader_test.exs new file mode 100644 index 000000000..045eef150 --- /dev/null +++ b/test/emoji/loader_test.exs @@ -0,0 +1,83 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Emoji.LoaderTest do + use ExUnit.Case, async: true + alias Pleroma.Emoji.Loader + + describe "match_extra/2" do + setup do + groups = [ + "list of files": ["/emoji/custom/first_file.png", "/emoji/custom/second_file.png"], + "wildcard folder": "/emoji/custom/*/file.png", + "wildcard files": "/emoji/custom/folder/*.png", + "special file": "/emoji/custom/special.png" + ] + + {:ok, groups: groups} + end + + test "config for list of files", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/first_file.png") + |> to_string() + + assert group == "list of files" + end + + test "config with wildcard folder", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/some_folder/file.png") + |> to_string() + + assert group == "wildcard folder" + end + + test "config with wildcard folder and subfolders", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/some_folder/another_folder/file.png") + |> to_string() + + assert group == "wildcard folder" + end + + test "config with wildcard files", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/folder/some_file.png") + |> to_string() + + assert group == "wildcard files" + end + + test "config with wildcard files and subfolders", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/folder/another_folder/some_file.png") + |> to_string() + + assert group == "wildcard files" + end + + test "config for special file", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/custom/special.png") + |> to_string() + + assert group == "special file" + end + + test "no mathing returns nil", %{groups: groups} do + group = + groups + |> Loader.match_extra("/emoji/some_undefined.png") + + refute group + end + end +end diff --git a/test/emoji_test.exs b/test/emoji_test.exs index 07ac6ff1d..32a828cc9 100644 --- a/test/emoji_test.exs +++ b/test/emoji_test.exs @@ -32,79 +32,4 @@ test "random emoji", %{emoji_list: emoji_list} do assert is_list(tags) end end - - describe "match_extra/2" do - setup do - groups = [ - "list of files": ["/emoji/custom/first_file.png", "/emoji/custom/second_file.png"], - "wildcard folder": "/emoji/custom/*/file.png", - "wildcard files": "/emoji/custom/folder/*.png", - "special file": "/emoji/custom/special.png" - ] - - {:ok, groups: groups} - end - - test "config for list of files", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/first_file.png") - |> to_string() - - assert group == "list of files" - end - - test "config with wildcard folder", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/some_folder/file.png") - |> to_string() - - assert group == "wildcard folder" - end - - test "config with wildcard folder and subfolders", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/some_folder/another_folder/file.png") - |> to_string() - - assert group == "wildcard folder" - end - - test "config with wildcard files", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/folder/some_file.png") - |> to_string() - - assert group == "wildcard files" - end - - test "config with wildcard files and subfolders", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/folder/another_folder/some_file.png") - |> to_string() - - assert group == "wildcard files" - end - - test "config for special file", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/custom/special.png") - |> to_string() - - assert group == "special file" - end - - test "no mathing returns nil", %{groups: groups} do - group = - groups - |> Emoji.match_extra("/emoji/some_undefined.png") - - refute group - end - end end From d7808b5db437b3300122127cef4c7ad076de7bda Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Thu, 29 Aug 2019 06:22:18 +0300 Subject: [PATCH 062/400] added code\path fields without html tags in ets --- lib/pleroma/emoji/loader.ex | 12 +- lib/pleroma/formatter.ex | 31 ++--- lib/pleroma/web/common_api/utils.ex | 2 +- .../controllers/mastodon_api_controller.ex | 2 +- .../controllers/util_controller.ex | 2 +- test/emoji_test.exs | 8 +- test/formatter_test.exs | 110 +++++++++--------- 7 files changed, 93 insertions(+), 74 deletions(-) diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex index e93b0aecc..70eba9ac6 100644 --- a/lib/pleroma/emoji/loader.ex +++ b/lib/pleroma/emoji/loader.ex @@ -78,7 +78,17 @@ def load do load_from_globs(shortcode_globs, emoji_groups)) |> Enum.reject(fn value -> value == nil end) - emojis ++ emojis_txt + Enum.map(emojis ++ emojis_txt, &prepare_emoji/1) + end + + defp prepare_emoji({code, file, tags} = _emoji) do + { + code, + file, + tags, + Pleroma.HTML.strip_tags(code), + Pleroma.HTML.strip_tags(file) + } end defp load_pack(pack_dir, emoji_groups) do diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 607843a5b..84955289c 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -107,19 +107,22 @@ def emojify(text) do def emojify(text, nil), do: text def emojify(text, emoji, strip \\ false) do - Enum.reduce(emoji, text, fn emoji_data, text -> - emoji = HTML.strip_tags(elem(emoji_data, 0)) - file = HTML.strip_tags(elem(emoji_data, 1)) + Enum.reduce(emoji, text, fn + {_, _, _, emoji, file}, text -> + String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) - html = - if not strip do - "#{emoji}" - else - "" - end - - String.replace(text, ":#{emoji}:", html) |> HTML.filter_tags() + emoji_data, text -> + emoji = HTML.strip_tags(elem(emoji_data, 0)) + file = HTML.strip_tags(elem(emoji_data, 1)) + String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) end) + |> HTML.filter_tags() + end + + defp prepare_emoji_html(_emoji, _file, true), do: "" + + defp prepare_emoji_html(emoji, file, _strip) do + "#{emoji}" end def demojify(text) do @@ -130,7 +133,9 @@ def demojify(text, nil), do: text @doc "Outputs a list of the emoji-shortcodes in a text" def get_emoji(text) when is_binary(text) do - Enum.filter(Emoji.get_all(), fn {emoji, _, _} -> String.contains?(text, ":#{emoji}:") end) + Enum.filter(Emoji.get_all(), fn {emoji, _, _, _, _} -> + String.contains?(text, ":#{emoji}:") + end) end def get_emoji(_), do: [] @@ -138,7 +143,7 @@ def get_emoji(_), do: [] @doc "Outputs a list of the emoji-Maps in a text" def get_emoji_map(text) when is_binary(text) do get_emoji(text) - |> Enum.reduce(%{}, fn {name, file, _group}, acc -> + |> Enum.reduce(%{}, fn {name, file, _group, _, _}, acc -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") end) end diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 6958c7511..9686e6491 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -435,7 +435,7 @@ def confirm_current_password(user, password) do def emoji_from_profile(%{info: _info} = user) do (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name)) - |> Enum.map(fn {shortcode, url, _} -> + |> Enum.map(fn {shortcode, url, _, _, _} -> %{ "type" => "Emoji", "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"}, diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 83e877c0e..603c6b3c6 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -331,7 +331,7 @@ def peers(conn, _params) do defp mastodonized_emoji do Pleroma.Emoji.get_all() - |> Enum.map(fn {shortcode, relative_url, tags} -> + |> Enum.map(fn {shortcode, relative_url, tags, _, _} -> url = to_string(URI.merge(Web.base_url(), relative_url)) %{ diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 3405bd3b7..923480242 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -240,7 +240,7 @@ def version(conn, _params) do def emoji(conn, _params) do emoji = Emoji.get_all() - |> Enum.map(fn {short_code, path, tags} -> + |> Enum.map(fn {short_code, path, tags, _, _} -> {short_code, %{image_url: path, tags: tags}} end) |> Enum.into(%{}) diff --git a/test/emoji_test.exs b/test/emoji_test.exs index 32a828cc9..82f9c52ff 100644 --- a/test/emoji_test.exs +++ b/test/emoji_test.exs @@ -14,9 +14,9 @@ defmodule Pleroma.EmojiTest do test "first emoji", %{emoji_list: emoji_list} do [emoji | _others] = emoji_list - {code, path, tags} = emoji + {code, path, tags, _, _} = emoji - assert tuple_size(emoji) == 3 + assert tuple_size(emoji) == 5 assert is_binary(code) assert is_binary(path) assert is_list(tags) @@ -24,9 +24,9 @@ test "first emoji", %{emoji_list: emoji_list} do test "random emoji", %{emoji_list: emoji_list} do emoji = Enum.random(emoji_list) - {code, path, tags} = emoji + {code, path, tags, _, _} = emoji - assert tuple_size(emoji) == 3 + assert tuple_size(emoji) == 5 assert is_binary(code) assert is_binary(path) assert is_list(tags) diff --git a/test/formatter_test.exs b/test/formatter_test.exs index bfa673049..7a5bd0f9f 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -217,6 +217,27 @@ test "given the 'safe_mention' option, it will keep text after newlines" do assert expected_text =~ "how are you doing?" end + + test "it can parse mentions and return the relevant users" do + text = + "@@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me and @o and @@@jimm" + + o = insert(:user, %{nickname: "o"}) + jimm = insert(:user, %{nickname: "jimm"}) + gsimg = insert(:user, %{nickname: "gsimg"}) + archaeme = insert(:user, %{nickname: "archaeme"}) + archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) + + expected_mentions = [ + {"@archaeme", archaeme}, + {"@archaeme@archae.me", archaeme_remote}, + {"@gsimg", gsimg}, + {"@jimm", jimm}, + {"@o", o} + ] + + assert {_text, ^expected_mentions, []} = Formatter.linkify(text) + end end describe ".parse_tags" do @@ -234,67 +255,50 @@ test "parses tags in the text" do end end - test "it can parse mentions and return the relevant users" do - text = - "@@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me and @o and @@@jimm" + describe "emojify" do + test "it adds cool emoji" do + text = "I love :firefox:" - o = insert(:user, %{nickname: "o"}) - jimm = insert(:user, %{nickname: "jimm"}) - gsimg = insert(:user, %{nickname: "gsimg"}) - archaeme = insert(:user, %{nickname: "archaeme"}) - archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) + expected_result = + "I love \"firefox\"" - expected_mentions = [ - {"@archaeme", archaeme}, - {"@archaeme@archae.me", archaeme_remote}, - {"@gsimg", gsimg}, - {"@jimm", jimm}, - {"@o", o} - ] + assert Formatter.emojify(text) == expected_result + end - assert {_text, ^expected_mentions, []} = Formatter.linkify(text) + test "it does not add XSS emoji" do + text = + "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):" + + custom_emoji = %{ + "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" => + "https://placehold.it/1x1" + } + + expected_result = + "I love \"\"" + + assert Formatter.emojify(text, custom_emoji) == expected_result + end end - test "it adds cool emoji" do - text = "I love :firefox:" + describe "get_emoji" do + test "it returns the emoji used in the text" do + text = "I love :firefox:" - expected_result = - "I love \"firefox\"" + assert Formatter.get_emoji(text) == [ + {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"} + ] + end - assert Formatter.emojify(text) == expected_result - end + test "it returns a nice empty result when no emojis are present" do + text = "I love moominamma" + assert Formatter.get_emoji(text) == [] + end - test "it does not add XSS emoji" do - text = - "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):" - - custom_emoji = %{ - "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" => - "https://placehold.it/1x1" - } - - expected_result = - "I love \"\"" - - assert Formatter.emojify(text, custom_emoji) == expected_result - end - - test "it returns the emoji used in the text" do - text = "I love :firefox:" - - assert Formatter.get_emoji(text) == [ - {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]} - ] - end - - test "it returns a nice empty result when no emojis are present" do - text = "I love moominamma" - assert Formatter.get_emoji(text) == [] - end - - test "it doesn't die when text is absent" do - text = nil - assert Formatter.get_emoji(text) == [] + test "it doesn't die when text is absent" do + text = nil + assert Formatter.get_emoji(text) == [] + end end test "it escapes HTML in plain text" do From 5c90b7073332ac333a5db9dfc82744cee03843fa Mon Sep 17 00:00:00 2001 From: Maksim Date: Thu, 29 Aug 2019 11:45:25 +0000 Subject: [PATCH 063/400] Apply suggestion to lib/pleroma/emoji/loader.ex --- lib/pleroma/emoji/loader.ex | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex index 70eba9ac6..82fc3b8c3 100644 --- a/lib/pleroma/emoji/loader.ex +++ b/lib/pleroma/emoji/loader.ex @@ -122,19 +122,17 @@ def make_shortcode_to_file_map(pack_dir, exts) do end def find_all_emoji(dir, exts) do - Enum.reduce( - File.ls!(dir), - [], - fn f, acc -> - filepath = Path.join(dir, f) + dir + |> File.ls!() + |> Enum.flat_map(fn f -> + filepath = Path.join(dir, f) - if File.dir?(filepath) do - acc ++ find_all_emoji(filepath, exts) - else - acc ++ [filepath] - end + if File.dir?(filepath) do + find_all_emoji(filepath, exts) + else + [filepath] end - ) + end) |> Enum.filter(fn f -> Path.extname(f) in exts end) end From 99b4847da3244a0d023ae25b2669afb07a4eda4f Mon Sep 17 00:00:00 2001 From: kPherox Date: Fri, 30 Aug 2019 21:00:50 +0900 Subject: [PATCH 064/400] Fix missing changes in pleroma/pleroma!1197 --- installation/pleroma.nginx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index e3c70de54..4da9918ca 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -71,26 +71,26 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only - # and `localhost.` resolves to [::0] on some systems: see issue #930 + # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only + # and `localhost.` resolves to [::0] on some systems: see issue #930 proxy_pass http://127.0.0.1:4000; client_max_body_size 16m; } location ~ ^/(media|proxy) { - proxy_cache pleroma_media_cache; + proxy_cache pleroma_media_cache; slice 1m; proxy_cache_key $host$uri$is_args$args$slice_range; proxy_set_header Range $slice_range; proxy_http_version 1.1; proxy_cache_valid 200 206 301 304 1h; - proxy_cache_lock on; + proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_buffering on; + proxy_buffering on; chunked_transfer_encoding on; proxy_ignore_headers Cache-Control; - proxy_hide_header Cache-Control; - proxy_pass http://localhost:4000; + proxy_hide_header Cache-Control; + proxy_pass http://127.0.0.1:4000; } } From d8098d142a0e8412eabdf5fe63705c25bcb1be34 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Thu, 29 Aug 2019 22:01:37 +0300 Subject: [PATCH 065/400] added Emoji.Formatter --- lib/pleroma/emoji/formatter.ex | 59 +++++++++++++++++++ lib/pleroma/formatter.ex | 52 ---------------- lib/pleroma/web/common_api/common_api.ex | 18 +++--- lib/pleroma/web/common_api/utils.ex | 5 +- .../controllers/mastodon_api_controller.ex | 4 +- lib/pleroma/web/metadata/utils.ex | 5 +- .../web/twitter_api/twitter_api_controller.ex | 4 +- .../web/twitter_api/views/activity_view.ex | 6 +- .../web/twitter_api/views/user_view.ex | 7 ++- test/emoji/formatter_test.exs | 54 +++++++++++++++++ test/formatter_test.exs | 46 --------------- 11 files changed, 141 insertions(+), 119 deletions(-) create mode 100644 lib/pleroma/emoji/formatter.ex create mode 100644 test/emoji/formatter_test.exs diff --git a/lib/pleroma/emoji/formatter.ex b/lib/pleroma/emoji/formatter.ex new file mode 100644 index 000000000..acdef3988 --- /dev/null +++ b/lib/pleroma/emoji/formatter.ex @@ -0,0 +1,59 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Emoji.Formatter do + alias Pleroma.Emoji + alias Pleroma.HTML + alias Pleroma.Web.MediaProxy + + def emojify(text) do + emojify(text, Emoji.get_all()) + end + + def emojify(text, nil), do: text + + def emojify(text, emoji, strip \\ false) do + Enum.reduce(emoji, text, fn + {_, _, _, emoji, file}, text -> + String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) + + emoji_data, text -> + emoji = HTML.strip_tags(elem(emoji_data, 0)) + file = HTML.strip_tags(elem(emoji_data, 1)) + String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) + end) + |> HTML.filter_tags() + end + + defp prepare_emoji_html(_emoji, _file, true), do: "" + + defp prepare_emoji_html(emoji, file, _strip) do + "#{emoji}" + end + + def demojify(text) do + emojify(text, Emoji.get_all(), true) + end + + def demojify(text, nil), do: text + + @doc "Outputs a list of the emoji-shortcodes in a text" + def get_emoji(text) when is_binary(text) do + Enum.filter(Emoji.get_all(), fn {emoji, _, _, _, _} -> + String.contains?(text, ":#{emoji}:") + end) + end + + def get_emoji(_), do: [] + + @doc "Outputs a list of the emoji-Maps in a text" + def get_emoji_map(text) when is_binary(text) do + get_emoji(text) + |> Enum.reduce(%{}, fn {name, file, _group, _, _}, acc -> + Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") + end) + end + + def get_emoji_map(_), do: [] +end diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 84955289c..dbbfe3a66 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -3,10 +3,8 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Formatter do - alias Pleroma.Emoji alias Pleroma.HTML alias Pleroma.User - alias Pleroma.Web.MediaProxy @safe_mention_regex ~r/^(\s*(?(@.+?\s+){1,})+)(?.*)/s @link_regex ~r"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~%:/?#[\]@!\$&'\(\)\*\+,;=.]+)|[0-9a-z+\-\.]+:[0-9a-z$-_.+!*'(),]+"ui @@ -100,56 +98,6 @@ def mentions_escape(text, options \\ []) do end end - def emojify(text) do - emojify(text, Emoji.get_all()) - end - - def emojify(text, nil), do: text - - def emojify(text, emoji, strip \\ false) do - Enum.reduce(emoji, text, fn - {_, _, _, emoji, file}, text -> - String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) - - emoji_data, text -> - emoji = HTML.strip_tags(elem(emoji_data, 0)) - file = HTML.strip_tags(elem(emoji_data, 1)) - String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) - end) - |> HTML.filter_tags() - end - - defp prepare_emoji_html(_emoji, _file, true), do: "" - - defp prepare_emoji_html(emoji, file, _strip) do - "#{emoji}" - end - - def demojify(text) do - emojify(text, Emoji.get_all(), true) - end - - def demojify(text, nil), do: text - - @doc "Outputs a list of the emoji-shortcodes in a text" - def get_emoji(text) when is_binary(text) do - Enum.filter(Emoji.get_all(), fn {emoji, _, _, _, _} -> - String.contains?(text, ":#{emoji}:") - end) - end - - def get_emoji(_), do: [] - - @doc "Outputs a list of the emoji-Maps in a text" - def get_emoji_map(text) when is_binary(text) do - get_emoji(text) - |> Enum.reduce(%{}, fn {name, file, _group, _, _}, acc -> - Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") - end) - end - - def get_emoji_map(_), do: [] - def html_escape({text, mentions, hashtags}, type) do {html_escape(text, type), mentions, hashtags} end diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 5faddc9f4..9ee704022 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.Activity alias Pleroma.ActivityExpiration alias Pleroma.Conversation.Participation - alias Pleroma.Formatter + alias Pleroma.Emoji alias Pleroma.Object alias Pleroma.ThreadMute alias Pleroma.User @@ -261,12 +261,7 @@ def post(user, %{"status" => status} = data) do sensitive, poll ), - object <- - Map.put( - object, - "emoji", - Map.merge(Formatter.get_emoji_map(full_payload), poll_emoji) - ) do + object <- put_emoji(object, full_payload, poll_emoji) do preview? = Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false direct? = visibility == "direct" @@ -300,6 +295,15 @@ def post(user, %{"status" => status} = data) do end end + # parse and put emoji to object data + defp put_emoji(map, text, emojis) do + Map.put( + map, + "emoji", + Map.merge(Emoji.Formatter.get_emoji_map(text), emojis) + ) + end + # Updates the emojis for a user based on their profile def update(user) do user = diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 9686e6491..d6907f707 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -9,6 +9,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Pleroma.Activity alias Pleroma.Config alias Pleroma.Conversation.Participation + alias Pleroma.Emoji alias Pleroma.Formatter alias Pleroma.Object alias Pleroma.Plugs.AuthenticationPlug @@ -184,7 +185,7 @@ def make_poll_data(%{"poll" => %{"options" => options, "expires_in" => expires_i "name" => option, "type" => "Note", "replies" => %{"type" => "Collection", "totalItems" => 0} - }, Map.merge(emoji, Formatter.get_emoji_map(option))} + }, Map.merge(emoji, Emoji.Formatter.get_emoji_map(option))} end) case expires_in do @@ -434,7 +435,7 @@ def confirm_current_password(user, password) do end def emoji_from_profile(%{info: _info} = user) do - (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name)) + (Emoji.Formatter.get_emoji(user.bio) ++ Emoji.Formatter.get_emoji(user.name)) |> Enum.map(fn {shortcode, url, _, _, _} -> %{ "type" => "Emoji", diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 603c6b3c6..4f63b03cf 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -13,8 +13,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do alias Pleroma.Bookmark alias Pleroma.Config alias Pleroma.Conversation.Participation + alias Pleroma.Emoji alias Pleroma.Filter - alias Pleroma.Formatter alias Pleroma.HTTP alias Pleroma.Notification alias Pleroma.Object @@ -140,7 +140,7 @@ def update_credentials(%{assigns: %{user: user}} = conn, params) do user_info_emojis = user.info |> Map.get(:emoji, []) - |> Enum.concat(Formatter.get_emoji_map(emojis_text)) + |> Enum.concat(Emoji.Formatter.get_emoji_map(emojis_text)) |> Enum.dedup() info_params = diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 720bd4519..382ecf426 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -3,6 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Utils do + alias Pleroma.Emoji alias Pleroma.Formatter alias Pleroma.HTML alias Pleroma.Web.MediaProxy @@ -13,7 +14,7 @@ def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do |> HtmlEntities.decode() |> String.replace(~r//, " ") |> HTML.get_cached_stripped_html_for_activity(object, "metadata") - |> Formatter.demojify() + |> Emoji.Formatter.demojify() |> Formatter.truncate() end @@ -23,7 +24,7 @@ def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) |> HtmlEntities.decode() |> String.replace(~r//, " ") |> HTML.strip_tags() - |> Formatter.demojify() + |> Emoji.Formatter.demojify() |> Formatter.truncate(max_length) end diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 5dfab6a6c..4141bfba5 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -9,7 +9,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do alias Ecto.Changeset alias Pleroma.Activity - alias Pleroma.Formatter + alias Pleroma.Emoji alias Pleroma.Notification alias Pleroma.Object alias Pleroma.Repo @@ -713,7 +713,7 @@ defp parse_profile_bio(user, params) do emojis_text = (params["description"] || "") <> " " <> (params["name"] || "") emojis = - ((user.info.emoji || []) ++ Formatter.get_emoji_map(emojis_text)) + ((user.info.emoji || []) ++ Emoji.Formatter.get_emoji_map(emojis_text)) |> Enum.dedup() user_info = diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index abae63877..9192ebd34 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do use Pleroma.Web, :view alias Pleroma.Activity - alias Pleroma.Formatter + alias Pleroma.Emoji alias Pleroma.HTML alias Pleroma.Object alias Pleroma.Repo @@ -262,7 +262,7 @@ def render( activity, "twitterapi:content" ) - |> Formatter.emojify(object.data["emoji"]) + |> Emoji.Formatter.emojify(object.data["emoji"]) text = if content do @@ -319,7 +319,7 @@ def render( "possibly_sensitive" => possibly_sensitive, "visibility" => Pleroma.Web.ActivityPub.Visibility.get_visibility(object), "summary" => summary, - "summary_html" => summary |> Formatter.emojify(object.data["emoji"]), + "summary_html" => Emoji.Formatter.emojify(summary, object.data["emoji"]), "card" => card, "muted" => thread_muted? || User.mutes?(opts[:for], user) } diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index 8a7d2fc72..3a6550826 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -4,7 +4,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do use Pleroma.Web, :view - alias Pleroma.Formatter + + alias Pleroma.Emoji alias Pleroma.HTML alias Pleroma.User alias Pleroma.Web.CommonAPI.Utils @@ -72,7 +73,7 @@ defp do_render("user.json", %{user: user = %User{}} = assigns) do description_html = (user.bio || "") |> HTML.filter_tags(User.html_filter_policy(for_user)) - |> Formatter.emojify(emoji) + |> Emoji.Formatter.emojify(emoji) fields = user.info @@ -99,7 +100,7 @@ defp do_render("user.json", %{user: user = %User{}} = assigns) do "name" => user.name || user.nickname, "name_html" => if(user.name, - do: HTML.strip_tags(user.name) |> Formatter.emojify(emoji), + do: HTML.strip_tags(user.name) |> Emoji.Formatter.emojify(emoji), else: user.nickname ), "profile_image_url" => image, diff --git a/test/emoji/formatter_test.exs b/test/emoji/formatter_test.exs new file mode 100644 index 000000000..8b510f48b --- /dev/null +++ b/test/emoji/formatter_test.exs @@ -0,0 +1,54 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Emoji.FormatterTest do + alias Pleroma.Emoji.Formatter + use Pleroma.DataCase + + describe "emojify" do + test "it adds cool emoji" do + text = "I love :firefox:" + + expected_result = + "I love \"firefox\"" + + assert Formatter.emojify(text) == expected_result + end + + test "it does not add XSS emoji" do + text = + "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):" + + custom_emoji = %{ + "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" => + "https://placehold.it/1x1" + } + + expected_result = + "I love \"\"" + + assert Formatter.emojify(text, custom_emoji) == expected_result + end + end + + describe "get_emoji" do + test "it returns the emoji used in the text" do + text = "I love :firefox:" + + assert Formatter.get_emoji(text) == [ + {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"} + ] + end + + test "it returns a nice empty result when no emojis are present" do + text = "I love moominamma" + assert Formatter.get_emoji(text) == [] + end + + test "it doesn't die when text is absent" do + text = nil + assert Formatter.get_emoji(text) == [] + end + end +end diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 7a5bd0f9f..c36681068 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -255,52 +255,6 @@ test "parses tags in the text" do end end - describe "emojify" do - test "it adds cool emoji" do - text = "I love :firefox:" - - expected_result = - "I love \"firefox\"" - - assert Formatter.emojify(text) == expected_result - end - - test "it does not add XSS emoji" do - text = - "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):" - - custom_emoji = %{ - "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" => - "https://placehold.it/1x1" - } - - expected_result = - "I love \"\"" - - assert Formatter.emojify(text, custom_emoji) == expected_result - end - end - - describe "get_emoji" do - test "it returns the emoji used in the text" do - text = "I love :firefox:" - - assert Formatter.get_emoji(text) == [ - {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"} - ] - end - - test "it returns a nice empty result when no emojis are present" do - text = "I love moominamma" - assert Formatter.get_emoji(text) == [] - end - - test "it doesn't die when text is absent" do - text = nil - assert Formatter.get_emoji(text) == [] - end - end - test "it escapes HTML in plain text" do text = "hello & world google.com/?a=b&c=d \n http://test.com/?a=b&c=d 1" expected = "hello & world google.com/?a=b&c=d \n http://test.com/?a=b&c=d 1" From 880307e0d52444326eee8e79b2f66af706d85b4a Mon Sep 17 00:00:00 2001 From: ultem Date: Fri, 30 Aug 2019 19:41:31 +0000 Subject: [PATCH 066/400] minor: Fix version dot --- docs/installation/alpine_linux_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/alpine_linux_en.md b/docs/installation/alpine_linux_en.md index c77618936..f200362ca 100644 --- a/docs/installation/alpine_linux_en.md +++ b/docs/installation/alpine_linux_en.md @@ -1,7 +1,7 @@ # Installing on Alpine Linux ## Installation -This guide is a step-by-step installation guide for Alpine Linux. The instructions were verified against Alpine v.3.10 standard image. You might miss additional dependencies if you use `netboot` instead. +This guide is a step-by-step installation guide for Alpine Linux. The instructions were verified against Alpine v3.10 standard image. You might miss additional dependencies if you use `netboot` instead. It assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.linode.com/docs/tools-reference/custom-kernels-distros/install-alpine-linux-on-your-linode/#configuration). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su -l -s $SHELL -c 'command'` instead. From f182f0f6bd89a2f2e3c4a6000c772512b239fe54 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sat, 31 Aug 2019 00:57:15 +0300 Subject: [PATCH 067/400] Add ability to search moderation logs --- lib/pleroma/moderation_log.ex | 209 ++++++++++++------ .../web/admin_api/admin_api_controller.ex | 4 +- test/moderation_log_test.exs | 36 ++- .../admin_api/admin_api_controller_test.exs | 61 ++++- 4 files changed, 220 insertions(+), 90 deletions(-) diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index 2164ecfc2..c72a413b6 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -18,6 +18,8 @@ def get_all(params) do params |> get_all_query() |> maybe_filter_by_date(params) + |> maybe_filter_by_user(params) + |> maybe_filter_by_search(params) |> Repo.all() end @@ -42,6 +44,23 @@ defp maybe_filter_by_date(query, %{start_date: start_date, end_date: end_date}) ) end + defp maybe_filter_by_user(query, %{user_id: nil}), do: query + + defp maybe_filter_by_user(query, %{user_id: user_id}) do + from(q in query, + where: fragment("(?)->'actor'->>'id' = ?", q.data, ^user_id) + ) + end + + defp maybe_filter_by_search(query, %{search: search}) when is_nil(search) or search == "", + do: query + + defp maybe_filter_by_search(query, %{search: search}) do + from(q in query, + where: fragment("(?)->>'message' ILIKE ?", q.data, ^"%#{search}%") + ) + end + defp get_all_query(%{page: page, page_size: page_size}) do from(q in __MODULE__, order_by: [desc: q.inserted_at], @@ -56,52 +75,71 @@ defp parse_datetime(datetime) do parsed_datetime end + @spec insert_log(%{actor: User, subject: User, action: String.t(), permission: String.t()}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, subject: %User{} = subject, action: action, permission: permission }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - subject: user_to_map(subject), - action: action, - permission: permission + "actor" => user_to_map(actor), + "subject" => user_to_map(subject), + "action" => action, + "permission" => permission, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, subject: User, action: String.t()}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, action: "report_update", subject: %Activity{data: %{"type" => "Flag"}} = subject }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "report_update", - subject: report_to_map(subject) + "actor" => user_to_map(actor), + "action" => "report_update", + "subject" => report_to_map(subject), + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, subject: Activity, action: String.t(), text: String.t()}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, action: "report_response", subject: %Activity{} = subject, text: text }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "report_response", - subject: report_to_map(subject), - text: text + "actor" => user_to_map(actor), + "action" => "report_response", + "subject" => report_to_map(subject), + "text" => text, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{ + actor: User, + subject: Activity, + action: String.t(), + sensitive: String.t(), + visibility: String.t() + }) :: {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, action: "status_update", @@ -109,41 +147,49 @@ def insert_log(%{ sensitive: sensitive, visibility: visibility }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "status_update", - subject: status_to_map(subject), - sensitive: sensitive, - visibility: visibility + "actor" => user_to_map(actor), + "action" => "status_update", + "subject" => status_to_map(subject), + "sensitive" => sensitive, + "visibility" => visibility, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, action: String.t(), subject_id: String.t()}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, action: "status_delete", subject_id: subject_id }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "status_delete", - subject_id: subject_id + "actor" => user_to_map(actor), + "action" => "status_delete", + "subject_id" => subject_id, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end @spec insert_log(%{actor: User, subject: User, action: String.t()}) :: {:ok, ModerationLog} | {:error, any} def insert_log(%{actor: %User{} = actor, subject: subject, action: action}) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: action, - subject: user_to_map(subject) + "actor" => user_to_map(actor), + "action" => action, + "subject" => user_to_map(subject), + "message" => "" } - }) + } + |> insert_log_entry_with_message() end @spec insert_log(%{actor: User, subjects: [User], action: String.t()}) :: @@ -151,97 +197,124 @@ def insert_log(%{actor: %User{} = actor, subject: subject, action: action}) do def insert_log(%{actor: %User{} = actor, subjects: subjects, action: action}) do subjects = Enum.map(subjects, &user_to_map/1) - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: action, - subjects: subjects + "actor" => user_to_map(actor), + "action" => action, + "subjects" => subjects, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, action: String.t(), followed: User, follower: User}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, followed: %User{} = followed, follower: %User{} = follower, action: "follow" }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "follow", - followed: user_to_map(followed), - follower: user_to_map(follower) + "actor" => user_to_map(actor), + "action" => "follow", + "followed" => user_to_map(followed), + "follower" => user_to_map(follower), + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, action: String.t(), followed: User, follower: User}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, followed: %User{} = followed, follower: %User{} = follower, action: "unfollow" }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: "unfollow", - followed: user_to_map(followed), - follower: user_to_map(follower) + "actor" => user_to_map(actor), + "action" => "unfollow", + "followed" => user_to_map(followed), + "follower" => user_to_map(follower), + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, action: String.t(), nicknames: [String.t()], tags: [String.t()]}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, nicknames: nicknames, tags: tags, action: action }) do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - nicknames: nicknames, - tags: tags, - action: action + "actor" => user_to_map(actor), + "nicknames" => nicknames, + "tags" => tags, + "action" => action, + "message" => "" } - }) + } + |> insert_log_entry_with_message() end + @spec insert_log(%{actor: User, action: String.t(), target: String.t()}) :: + {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, action: action, target: target }) when action in ["relay_follow", "relay_unfollow"] do - Repo.insert(%ModerationLog{ + %ModerationLog{ data: %{ - actor: user_to_map(actor), - action: action, - target: target + "actor" => user_to_map(actor), + "action" => action, + "target" => target, + "message" => "" } - }) + } + |> insert_log_entry_with_message() + end + + @spec insert_log_entry_with_message(ModerationLog) :: {:ok, ModerationLog} | {:error, any} + + defp insert_log_entry_with_message(entry) do + entry.data["message"] + |> put_in(get_log_entry_message(entry)) + |> Repo.insert() end defp user_to_map(%User{} = user) do user |> Map.from_struct() |> Map.take([:id, :nickname]) - |> Map.put(:type, "user") + |> Map.new(fn {k, v} -> {Atom.to_string(k), v} end) + |> Map.put("type", "user") end defp report_to_map(%Activity{} = report) do %{ - type: "report", - id: report.id, - state: report.data["state"] + "type" => "report", + "id" => report.id, + "state" => report.data["state"] } end defp status_to_map(%Activity{} = status) do %{ - type: "status", - id: status.id + "type" => "status", + "id" => status.id } end diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 065394a24..135c6ae87 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -544,7 +544,9 @@ def list_log(conn, params) do page: page, page_size: page_size, start_date: params["start_date"], - end_date: params["end_date"] + end_date: params["end_date"], + user_id: params["user_id"], + search: params["search"] }) conn diff --git a/test/moderation_log_test.exs b/test/moderation_log_test.exs index c78708471..a39a00e02 100644 --- a/test/moderation_log_test.exs +++ b/test/moderation_log_test.exs @@ -30,8 +30,7 @@ test "logging user deletion by moderator", %{moderator: moderator, subject1: sub log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == - "@#{moderator.nickname} deleted user @#{subject1.nickname}" + assert log.data["message"] == "@#{moderator.nickname} deleted user @#{subject1.nickname}" end test "logging user creation by moderator", %{ @@ -48,7 +47,7 @@ test "logging user creation by moderator", %{ log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} created users: @#{subject1.nickname}, @#{subject2.nickname}" end @@ -63,7 +62,7 @@ test "logging user follow by admin", %{admin: admin, subject1: subject1, subject log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{admin.nickname} made @#{subject2.nickname} follow @#{subject1.nickname}" end @@ -78,7 +77,7 @@ test "logging user unfollow by admin", %{admin: admin, subject1: subject1, subje log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{admin.nickname} made @#{subject2.nickname} unfollow @#{subject1.nickname}" end @@ -100,8 +99,7 @@ test "logging user tagged by admin", %{admin: admin, subject1: subject1, subject tags = ["foo", "bar"] |> Enum.join(", ") - assert ModerationLog.get_log_entry_message(log) == - "@#{admin.nickname} added tags: #{tags} to users: #{users}" + assert log.data["message"] == "@#{admin.nickname} added tags: #{tags} to users: #{users}" end test "logging user untagged by admin", %{admin: admin, subject1: subject1, subject2: subject2} do @@ -122,7 +120,7 @@ test "logging user untagged by admin", %{admin: admin, subject1: subject1, subje tags = ["foo", "bar"] |> Enum.join(", ") - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{admin.nickname} removed tags: #{tags} from users: #{users}" end @@ -137,8 +135,7 @@ test "logging user grant by moderator", %{moderator: moderator, subject1: subjec log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == - "@#{moderator.nickname} made @#{subject1.nickname} moderator" + assert log.data["message"] == "@#{moderator.nickname} made @#{subject1.nickname} moderator" end test "logging user revoke by moderator", %{moderator: moderator, subject1: subject1} do @@ -152,7 +149,7 @@ test "logging user revoke by moderator", %{moderator: moderator, subject1: subje log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} revoked moderator role from @#{subject1.nickname}" end @@ -166,7 +163,7 @@ test "logging relay follow", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} followed relay: https://example.org/relay" end @@ -180,7 +177,7 @@ test "logging relay unfollow", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} unfollowed relay: https://example.org/relay" end @@ -202,7 +199,7 @@ test "logging report update", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} updated report ##{report.id} with 'resolved' state" end @@ -224,7 +221,7 @@ test "logging report response", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} responded with 'look at this' to report ##{report.id}" end @@ -242,7 +239,7 @@ test "logging status sensitivity update", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} updated status ##{note.id}, set sensitive: 'true'" end @@ -260,7 +257,7 @@ test "logging status visibility update", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} updated status ##{note.id}, set visibility: 'private'" end @@ -278,7 +275,7 @@ test "logging status sensitivity & visibility update", %{moderator: moderator} d log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == + assert log.data["message"] == "@#{moderator.nickname} updated status ##{note.id}, set sensitive: 'true', visibility: 'private'" end @@ -294,8 +291,7 @@ test "logging status deletion", %{moderator: moderator} do log = Repo.one(ModerationLog) - assert ModerationLog.get_log_entry_message(log) == - "@#{moderator.nickname} deleted status ##{note.id}" + assert log.data["message"] == "@#{moderator.nickname} deleted status ##{note.id}" end end end diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index a7269aee9..eaf847b25 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -2251,8 +2251,9 @@ test "returns private statuses with godmode on", %{conn: conn, user: user} do describe "GET /api/pleroma/admin/moderation_log" do setup %{conn: conn} do admin = insert(:user, info: %{is_admin: true}) + moderator = insert(:user, info: %{is_moderator: true}) - %{conn: assign(conn, :user, admin), admin: admin} + %{conn: assign(conn, :user, admin), admin: admin, moderator: moderator} end test "returns the log", %{conn: conn, admin: admin} do @@ -2394,6 +2395,64 @@ test "filters log by date", %{conn: conn, admin: admin} do assert first_entry["message"] == "@#{admin.nickname} unfollowed relay: https://example.org/relay" end + + test "returns log filtered by user", %{conn: conn, admin: admin, moderator: moderator} do + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => admin.id, + "nickname" => admin.nickname, + "type" => "user" + }, + action: "relay_follow", + target: "https://example.org/relay" + } + }) + + Repo.insert(%ModerationLog{ + data: %{ + actor: %{ + "id" => moderator.id, + "nickname" => moderator.nickname, + "type" => "user" + }, + action: "relay_unfollow", + target: "https://example.org/relay" + } + }) + + conn1 = get(conn, "/api/pleroma/admin/moderation_log?user_id=#{moderator.id}") + + response1 = json_response(conn1, 200) + [first_entry] = response1 + + assert response1 |> length() == 1 + assert get_in(first_entry, ["data", "actor", "id"]) == moderator.id + end + + test "returns log filtered by search", %{conn: conn, moderator: moderator} do + ModerationLog.insert_log(%{ + actor: moderator, + action: "relay_follow", + target: "https://example.org/relay" + }) + + ModerationLog.insert_log(%{ + actor: moderator, + action: "relay_unfollow", + target: "https://example.org/relay" + }) + + conn1 = get(conn, "/api/pleroma/admin/moderation_log?search=unfo") + + response1 = json_response(conn1, 200) + [first_entry] = response1 + + assert response1 |> length() == 1 + + assert get_in(first_entry, ["data", "message"]) == + "@#{moderator.nickname} unfollowed relay: https://example.org/relay" + end end end From 4d6e22bb9b718846883e92851ba22e9809b6b93d Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sat, 31 Aug 2019 01:09:48 +0300 Subject: [PATCH 068/400] Style --- lib/pleroma/moderation_log.ex | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index c72a413b6..89a5e13c3 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -248,8 +248,12 @@ def insert_log(%{ |> insert_log_entry_with_message() end - @spec insert_log(%{actor: User, action: String.t(), nicknames: [String.t()], tags: [String.t()]}) :: - {:ok, ModerationLog} | {:error, any} + @spec insert_log(%{ + actor: User, + action: String.t(), + nicknames: [String.t()], + tags: [String.t()] + }) :: {:ok, ModerationLog} | {:error, any} def insert_log(%{ actor: %User{} = actor, nicknames: nicknames, From 6ef0103ca0b194971a2e6f61685316536b742a11 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Sat, 31 Aug 2019 10:14:53 +0300 Subject: [PATCH 069/400] added Emoji struct --- lib/pleroma/emoji.ex | 15 ++++++++++++++ lib/pleroma/emoji/formatter.ex | 12 +++++------ lib/pleroma/emoji/loader.ex | 13 +++--------- lib/pleroma/web/common_api/utils.ex | 2 +- .../controllers/mastodon_api_controller.ex | 2 +- .../controllers/util_controller.ex | 6 ++---- test/emoji/formatter_test.exs | 20 ++++++++++++++----- test/emoji_test.exs | 8 ++++---- 8 files changed, 47 insertions(+), 31 deletions(-) diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index ab6ba7d6a..b246bfbe6 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -21,6 +21,21 @@ defmodule Pleroma.Emoji do {:read_concurrency, true} ] + defstruct [:code, :file, :tags, :safe_code, :safe_file] + + @doc "Build emoji struct" + def build({code, file, tags}) do + %__MODULE__{ + code: code, + file: file, + tags: tags, + safe_code: Pleroma.HTML.strip_tags(code), + safe_file: Pleroma.HTML.strip_tags(file) + } + end + + def build({code, file}), do: build({code, file, []}) + @doc false def start_link(_) do GenServer.start_link(__MODULE__, [], name: __MODULE__) diff --git a/lib/pleroma/emoji/formatter.ex b/lib/pleroma/emoji/formatter.ex index acdef3988..4869d073e 100644 --- a/lib/pleroma/emoji/formatter.ex +++ b/lib/pleroma/emoji/formatter.ex @@ -15,12 +15,12 @@ def emojify(text, nil), do: text def emojify(text, emoji, strip \\ false) do Enum.reduce(emoji, text, fn - {_, _, _, emoji, file}, text -> + {_, %Emoji{safe_code: emoji, safe_file: file}}, text -> String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) - emoji_data, text -> - emoji = HTML.strip_tags(elem(emoji_data, 0)) - file = HTML.strip_tags(elem(emoji_data, 1)) + {unsafe_emoji, unsafe_file}, text -> + emoji = HTML.strip_tags(unsafe_emoji) + file = HTML.strip_tags(unsafe_file) String.replace(text, ":#{emoji}:", prepare_emoji_html(emoji, file, strip)) end) |> HTML.filter_tags() @@ -40,7 +40,7 @@ def demojify(text, nil), do: text @doc "Outputs a list of the emoji-shortcodes in a text" def get_emoji(text) when is_binary(text) do - Enum.filter(Emoji.get_all(), fn {emoji, _, _, _, _} -> + Enum.filter(Emoji.get_all(), fn {emoji, %Emoji{}} -> String.contains?(text, ":#{emoji}:") end) end @@ -50,7 +50,7 @@ def get_emoji(_), do: [] @doc "Outputs a list of the emoji-Maps in a text" def get_emoji_map(text) when is_binary(text) do get_emoji(text) - |> Enum.reduce(%{}, fn {name, file, _group, _, _}, acc -> + |> Enum.reduce(%{}, fn {name, %Emoji{file: file}}, acc -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") end) end diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex index 82fc3b8c3..839316713 100644 --- a/lib/pleroma/emoji/loader.ex +++ b/lib/pleroma/emoji/loader.ex @@ -11,13 +11,14 @@ defmodule Pleroma.Emoji.Loader do * glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder """ alias Pleroma.Config + alias Pleroma.Emoji require Logger @type pattern :: Regex.t() | module() | String.t() @type patterns :: pattern() | [pattern()] @type group_patterns :: keyword(patterns()) - @type emoji :: {String.t(), String.t(), list(String.t())} + @type emoji :: {String.t(), Emoji.t()} @doc """ Loads emojis from files/packs. @@ -81,15 +82,7 @@ def load do Enum.map(emojis ++ emojis_txt, &prepare_emoji/1) end - defp prepare_emoji({code, file, tags} = _emoji) do - { - code, - file, - tags, - Pleroma.HTML.strip_tags(code), - Pleroma.HTML.strip_tags(file) - } - end + defp prepare_emoji({code, _, _} = emoji), do: {code, Emoji.build(emoji)} defp load_pack(pack_dir, emoji_groups) do pack_name = Path.basename(pack_dir) diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index d6907f707..1fb95f4ab 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -436,7 +436,7 @@ def confirm_current_password(user, password) do def emoji_from_profile(%{info: _info} = user) do (Emoji.Formatter.get_emoji(user.bio) ++ Emoji.Formatter.get_emoji(user.name)) - |> Enum.map(fn {shortcode, url, _, _, _} -> + |> Enum.map(fn {shortcode, %Emoji{file: url}} -> %{ "type" => "Emoji", "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{url}"}, diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 4f63b03cf..a50c060bf 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -331,7 +331,7 @@ def peers(conn, _params) do defp mastodonized_emoji do Pleroma.Emoji.get_all() - |> Enum.map(fn {shortcode, relative_url, tags, _, _} -> + |> Enum.map(fn {shortcode, %Pleroma.Emoji{file: relative_url, tags: tags}} -> url = to_string(URI.merge(Web.base_url(), relative_url)) %{ diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 923480242..c14792068 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -239,11 +239,9 @@ def version(conn, _params) do def emoji(conn, _params) do emoji = - Emoji.get_all() - |> Enum.map(fn {short_code, path, tags, _, _} -> - {short_code, %{image_url: path, tags: tags}} + Enum.reduce(Emoji.get_all(), %{}, fn {code, %Emoji{file: file, tags: tags}}, acc -> + Map.put(acc, code, %{image_url: file, tags: tags}) end) - |> Enum.into(%{}) json(conn, emoji) end diff --git a/test/emoji/formatter_test.exs b/test/emoji/formatter_test.exs index 8b510f48b..6d25fc453 100644 --- a/test/emoji/formatter_test.exs +++ b/test/emoji/formatter_test.exs @@ -3,6 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Emoji.FormatterTest do + alias Pleroma.Emoji alias Pleroma.Emoji.Formatter use Pleroma.DataCase @@ -20,15 +21,17 @@ test "it does not add XSS emoji" do text = "I love :'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a):" - custom_emoji = %{ - "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)" => + custom_emoji = + { + "'onload=\"this.src='bacon'\" onerror='var a = document.createElement(\"script\");a.src=\"//51.15.235.162.xip.io/cookie.js\";document.body.appendChild(a)", "https://placehold.it/1x1" - } + } + |> Pleroma.Emoji.build() expected_result = "I love \"\"" - assert Formatter.emojify(text, custom_emoji) == expected_result + assert Formatter.emojify(text, [{custom_emoji.code, custom_emoji}]) == expected_result end end @@ -37,7 +40,14 @@ test "it returns the emoji used in the text" do text = "I love :firefox:" assert Formatter.get_emoji(text) == [ - {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"], "firefox", "/emoji/Firefox.gif"} + {"firefox", + %Emoji{ + code: "firefox", + file: "/emoji/Firefox.gif", + tags: ["Gif", "Fun"], + safe_code: "firefox", + safe_file: "/emoji/Firefox.gif" + }} ] end diff --git a/test/emoji_test.exs b/test/emoji_test.exs index 82f9c52ff..1fdbd0fdf 100644 --- a/test/emoji_test.exs +++ b/test/emoji_test.exs @@ -14,9 +14,9 @@ defmodule Pleroma.EmojiTest do test "first emoji", %{emoji_list: emoji_list} do [emoji | _others] = emoji_list - {code, path, tags, _, _} = emoji + {code, %Emoji{file: path, tags: tags}} = emoji - assert tuple_size(emoji) == 5 + assert tuple_size(emoji) == 2 assert is_binary(code) assert is_binary(path) assert is_list(tags) @@ -24,9 +24,9 @@ test "first emoji", %{emoji_list: emoji_list} do test "random emoji", %{emoji_list: emoji_list} do emoji = Enum.random(emoji_list) - {code, path, tags, _, _} = emoji + {code, %Emoji{file: path, tags: tags}} = emoji - assert tuple_size(emoji) == 5 + assert tuple_size(emoji) == 2 assert is_binary(code) assert is_binary(path) assert is_list(tags) From 90c2dae9a4d5fd7e7c1f0d0f532ce95fbc4c69f9 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:20:34 +0300 Subject: [PATCH 070/400] Remove most of Pleroma.Web.TwitterAPI.TwitterAPI --- lib/pleroma/web/twitter_api/twitter_api.ex | 195 --------- test/notification_test.exs | 87 ++-- test/user_test.exs | 22 +- .../mastodon_api_controller_test.exs | 8 +- test/web/mastodon_api/mastodon_api_test.exs | 7 +- test/web/twitter_api/twitter_api_test.exs | 265 ------------ .../twitter_api/views/activity_view_test.exs | 384 ------------------ .../views/notification_view_test.exs | 112 ----- test/web/twitter_api/views/user_view_test.exs | 323 --------------- 9 files changed, 42 insertions(+), 1361 deletions(-) delete mode 100644 test/web/twitter_api/views/activity_view_test.exs delete mode 100644 test/web/twitter_api/views/notification_view_test.exs delete mode 100644 test/web/twitter_api/views/user_view_test.exs diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 80082ea84..8eda762c7 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -3,133 +3,14 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.TwitterAPI.TwitterAPI do - alias Pleroma.Activity alias Pleroma.Emails.Mailer alias Pleroma.Emails.UserEmail alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.CommonAPI - alias Pleroma.Web.TwitterAPI.UserView - - import Ecto.Query require Pleroma.Constants - def create_status(%User{} = user, %{"status" => _} = data) do - CommonAPI.post(user, data) - end - - def delete(%User{} = user, id) do - with %Activity{data: %{"type" => _type}} <- Activity.get_by_id(id), - {:ok, activity} <- CommonAPI.delete(id, user) do - {:ok, activity} - end - end - - def follow(%User{} = follower, params) do - with {:ok, %User{} = followed} <- get_user(params) do - CommonAPI.follow(follower, followed) - end - end - - def unfollow(%User{} = follower, params) do - with {:ok, %User{} = unfollowed} <- get_user(params), - {:ok, follower} <- CommonAPI.unfollow(follower, unfollowed) do - {:ok, follower, unfollowed} - end - end - - def block(%User{} = blocker, params) do - with {:ok, %User{} = blocked} <- get_user(params), - {:ok, blocker} <- User.block(blocker, blocked), - {:ok, _activity} <- ActivityPub.block(blocker, blocked) do - {:ok, blocker, blocked} - else - err -> err - end - end - - def unblock(%User{} = blocker, params) do - with {:ok, %User{} = blocked} <- get_user(params), - {:ok, blocker} <- User.unblock(blocker, blocked), - {:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do - {:ok, blocker, blocked} - else - err -> err - end - end - - def repeat(%User{} = user, ap_id_or_id) do - with {:ok, _announce, %{data: %{"id" => id}}} <- CommonAPI.repeat(ap_id_or_id, user), - %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do - {:ok, activity} - end - end - - def unrepeat(%User{} = user, ap_id_or_id) do - with {:ok, _unannounce, %{data: %{"id" => id}}} <- CommonAPI.unrepeat(ap_id_or_id, user), - %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do - {:ok, activity} - end - end - - def pin(%User{} = user, ap_id_or_id) do - CommonAPI.pin(ap_id_or_id, user) - end - - def unpin(%User{} = user, ap_id_or_id) do - CommonAPI.unpin(ap_id_or_id, user) - end - - def fav(%User{} = user, ap_id_or_id) do - with {:ok, _fav, %{data: %{"id" => id}}} <- CommonAPI.favorite(ap_id_or_id, user), - %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do - {:ok, activity} - end - end - - def unfav(%User{} = user, ap_id_or_id) do - with {:ok, _unfav, _fav, %{data: %{"id" => id}}} <- CommonAPI.unfavorite(ap_id_or_id, user), - %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do - {:ok, activity} - end - end - - def upload(%Plug.Upload{} = file, %User{} = user, format \\ "xml") do - {:ok, object} = ActivityPub.upload(file, actor: User.ap_id(user)) - - url = List.first(object.data["url"]) - href = url["href"] - type = url["mediaType"] - - case format do - "xml" -> - # Fake this as good as possible... - """ - - - #{object.id} - #{object.id} - #{object.id} - #{href} - #{href} - - - """ - - "json" -> - %{ - media_id: object.id, - media_id_string: "#{object.id}}", - media_url: href, - size: 0 - } - |> Jason.encode!() - end - end - def register_user(params, opts \\ []) do token = params["token"] @@ -236,80 +117,4 @@ def password_reset(nickname_or_email) do {:error, "unknown user"} end end - - def get_user(user \\ nil, params) do - case params do - %{"user_id" => user_id} -> - case User.get_cached_by_nickname_or_id(user_id) do - nil -> - {:error, "No user with such user_id"} - - %User{info: %{deactivated: true}} -> - {:error, "User has been disabled"} - - user -> - {:ok, user} - end - - %{"screen_name" => nickname} -> - case User.get_cached_by_nickname(nickname) do - nil -> {:error, "No user with such screen_name"} - target -> {:ok, target} - end - - _ -> - if user do - {:ok, user} - else - {:error, "You need to specify screen_name or user_id"} - end - end - end - - defp parse_int(string, default) - - defp parse_int(string, default) when is_binary(string) do - with {n, _} <- Integer.parse(string) do - n - else - _e -> default - end - end - - defp parse_int(_, default), do: default - - # TODO: unify the search query with MastoAPI one and do only pagination here - def search(_user, %{"q" => query} = params) do - limit = parse_int(params["rpp"], 20) - page = parse_int(params["page"], 1) - offset = (page - 1) * limit - - q = - from( - [a, o] in Activity.with_preloaded_object(Activity), - where: fragment("?->>'type' = 'Create'", a.data), - where: ^Pleroma.Constants.as_public() in a.recipients, - where: - fragment( - "to_tsvector('english', ?->>'content') @@ plainto_tsquery('english', ?)", - o.data, - ^query - ), - limit: ^limit, - offset: ^offset, - # this one isn't indexed so psql won't take the wrong index. - order_by: [desc: :inserted_at] - ) - - _activities = Repo.all(q) - end - - def get_external_profile(for_user, uri) do - with {:ok, %User{} = user} <- User.get_or_fetch(uri) do - {:ok, UserView.render("show.json", %{user: user, for: for_user})} - else - _e -> - {:error, "Couldn't find user"} - end - end end diff --git a/test/notification_test.exs b/test/notification_test.exs index 80ea2a085..2a52dad8d 100644 --- a/test/notification_test.exs +++ b/test/notification_test.exs @@ -12,7 +12,6 @@ defmodule Pleroma.NotificationTest do alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.CommonAPI alias Pleroma.Web.Streamer - alias Pleroma.Web.TwitterAPI.TwitterAPI describe "create_notifications" do test "notifies someone when they are directly addressed" do @@ -21,7 +20,7 @@ test "notifies someone when they are directly addressed" do third_user = insert(:user) {:ok, activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey @#{other_user.nickname} and @#{third_user.nickname}" }) @@ -39,7 +38,7 @@ test "it creates a notification for subscribed users" do User.subscribe(subscriber, user) - {:ok, status} = TwitterAPI.create_status(user, %{"status" => "Akariiiin"}) + {:ok, status} = CommonAPI.post(user, %{"status" => "Akariiiin"}) {:ok, [notification]} = Notification.create_notifications(status) assert notification.user_id == subscriber.id @@ -184,47 +183,20 @@ test "it doesn't create a notification for user if he is the activity author" do test "it doesn't create a notification for follow-unfollow-follow chains" do user = insert(:user) followed_user = insert(:user) - {:ok, _, _, activity} = TwitterAPI.follow(user, %{"user_id" => followed_user.id}) + {:ok, _, _, activity} = CommonAPI.follow(user, followed_user) Notification.create_notification(activity, followed_user) - TwitterAPI.unfollow(user, %{"user_id" => followed_user.id}) - {:ok, _, _, activity_dupe} = TwitterAPI.follow(user, %{"user_id" => followed_user.id}) + CommonAPI.unfollow(user, followed_user) + {:ok, _, _, activity_dupe} = CommonAPI.follow(user, followed_user) refute Notification.create_notification(activity_dupe, followed_user) end - test "it doesn't create a notification for like-unlike-like chains" do - user = insert(:user) - liked_user = insert(:user) - {:ok, status} = TwitterAPI.create_status(liked_user, %{"status" => "Yui is best yuru"}) - {:ok, fav_status} = TwitterAPI.fav(user, status.id) - Notification.create_notification(fav_status, liked_user) - TwitterAPI.unfav(user, status.id) - {:ok, dupe} = TwitterAPI.fav(user, status.id) - refute Notification.create_notification(dupe, liked_user) - end - - test "it doesn't create a notification for repeat-unrepeat-repeat chains" do - user = insert(:user) - retweeted_user = insert(:user) - - {:ok, status} = - TwitterAPI.create_status(retweeted_user, %{ - "status" => "Send dupe notifications to the shadow realm" - }) - - {:ok, retweeted_activity} = TwitterAPI.repeat(user, status.id) - Notification.create_notification(retweeted_activity, retweeted_user) - TwitterAPI.unrepeat(user, status.id) - {:ok, dupe} = TwitterAPI.repeat(user, status.id) - refute Notification.create_notification(dupe, retweeted_user) - end - test "it doesn't create duplicate notifications for follow+subscribed users" do user = insert(:user) subscriber = insert(:user) - {:ok, _, _, _} = TwitterAPI.follow(subscriber, %{"user_id" => user.id}) + {:ok, _, _, _} = CommonAPI.follow(subscriber, user) User.subscribe(subscriber, user) - {:ok, status} = TwitterAPI.create_status(user, %{"status" => "Akariiiin"}) + {:ok, status} = CommonAPI.post(user, %{"status" => "Akariiiin"}) {:ok, [_notif]} = Notification.create_notifications(status) end @@ -234,8 +206,7 @@ test "it doesn't create subscription notifications if the recipient cannot see t User.subscribe(subscriber, user) - {:ok, status} = - TwitterAPI.create_status(user, %{"status" => "inwisible", "visibility" => "direct"}) + {:ok, status} = CommonAPI.post(user, %{"status" => "inwisible", "visibility" => "direct"}) assert {:ok, []} == Notification.create_notifications(status) end @@ -246,8 +217,7 @@ test "it gets a notification that belongs to the user" do user = insert(:user) other_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{other_user.nickname}"}) {:ok, [notification]} = Notification.create_notifications(activity) {:ok, notification} = Notification.get(other_user, notification.id) @@ -259,8 +229,7 @@ test "it returns error if the notification doesn't belong to the user" do user = insert(:user) other_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{other_user.nickname}"}) {:ok, [notification]} = Notification.create_notifications(activity) {:error, _notification} = Notification.get(user, notification.id) @@ -272,8 +241,7 @@ test "it dismisses a notification that belongs to the user" do user = insert(:user) other_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{other_user.nickname}"}) {:ok, [notification]} = Notification.create_notifications(activity) {:ok, notification} = Notification.dismiss(other_user, notification.id) @@ -285,8 +253,7 @@ test "it returns error if the notification doesn't belong to the user" do user = insert(:user) other_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(user, %{"status" => "hey @#{other_user.nickname}"}) + {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{other_user.nickname}"}) {:ok, [notification]} = Notification.create_notifications(activity) {:error, _notification} = Notification.dismiss(user, notification.id) @@ -300,14 +267,14 @@ test "it clears all notifications belonging to the user" do third_user = insert(:user) {:ok, activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey @#{other_user.nickname} and @#{third_user.nickname} !" }) {:ok, _notifs} = Notification.create_notifications(activity) {:ok, activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey again @#{other_user.nickname} and @#{third_user.nickname} !" }) @@ -325,12 +292,12 @@ test "it sets all notifications as read up to a specified notification ID" do other_user = insert(:user) {:ok, _activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey @#{other_user.nickname}!" }) {:ok, _activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey again @#{other_user.nickname}!" }) @@ -340,7 +307,7 @@ test "it sets all notifications as read up to a specified notification ID" do assert n2.id > n1.id {:ok, _activity} = - TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey yet again @#{other_user.nickname}!" }) @@ -677,7 +644,7 @@ test "it returns notifications for muted user without notifications" do muted = insert(:user) {:ok, user} = User.mute(user, muted, false) - {:ok, _activity} = TwitterAPI.create_status(muted, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(muted, %{"status" => "hey @#{user.nickname}"}) assert length(Notification.for_user(user)) == 1 end @@ -687,7 +654,7 @@ test "it doesn't return notifications for muted user with notifications" do muted = insert(:user) {:ok, user} = User.mute(user, muted) - {:ok, _activity} = TwitterAPI.create_status(muted, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(muted, %{"status" => "hey @#{user.nickname}"}) assert Notification.for_user(user) == [] end @@ -697,7 +664,7 @@ test "it doesn't return notifications for blocked user" do blocked = insert(:user) {:ok, user} = User.block(user, blocked) - {:ok, _activity} = TwitterAPI.create_status(blocked, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"}) assert Notification.for_user(user) == [] end @@ -707,7 +674,7 @@ test "it doesn't return notificatitons for blocked domain" do blocked = insert(:user, ap_id: "http://some-domain.com") {:ok, user} = User.block_domain(user, "some-domain.com") - {:ok, _activity} = TwitterAPI.create_status(blocked, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"}) assert Notification.for_user(user) == [] end @@ -716,8 +683,7 @@ test "it doesn't return notifications for muted thread" do user = insert(:user) another_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(another_user, %{"status" => "hey @#{user.nickname}"}) + {:ok, activity} = CommonAPI.post(another_user, %{"status" => "hey @#{user.nickname}"}) {:ok, _} = Pleroma.ThreadMute.add_mute(user.id, activity.data["context"]) assert Notification.for_user(user) == [] @@ -728,7 +694,7 @@ test "it returns notifications for muted user with notifications and with_muted muted = insert(:user) {:ok, user} = User.mute(user, muted) - {:ok, _activity} = TwitterAPI.create_status(muted, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(muted, %{"status" => "hey @#{user.nickname}"}) assert length(Notification.for_user(user, %{with_muted: true})) == 1 end @@ -738,7 +704,7 @@ test "it returns notifications for blocked user and with_muted parameter" do blocked = insert(:user) {:ok, user} = User.block(user, blocked) - {:ok, _activity} = TwitterAPI.create_status(blocked, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"}) assert length(Notification.for_user(user, %{with_muted: true})) == 1 end @@ -748,7 +714,7 @@ test "it returns notificatitons for blocked domain and with_muted parameter" do blocked = insert(:user, ap_id: "http://some-domain.com") {:ok, user} = User.block_domain(user, "some-domain.com") - {:ok, _activity} = TwitterAPI.create_status(blocked, %{"status" => "hey @#{user.nickname}"}) + {:ok, _activity} = CommonAPI.post(blocked, %{"status" => "hey @#{user.nickname}"}) assert length(Notification.for_user(user, %{with_muted: true})) == 1 end @@ -757,8 +723,7 @@ test "it returns notifications for muted thread with_muted parameter" do user = insert(:user) another_user = insert(:user) - {:ok, activity} = - TwitterAPI.create_status(another_user, %{"status" => "hey @#{user.nickname}"}) + {:ok, activity} = CommonAPI.post(another_user, %{"status" => "hey @#{user.nickname}"}) {:ok, _} = Pleroma.ThreadMute.add_mute(user.id, activity.data["context"]) assert length(Notification.for_user(user, %{with_muted: true})) == 1 diff --git a/test/user_test.exs b/test/user_test.exs index 2cbc1f525..a25b72f4e 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -69,8 +69,8 @@ test "returns all pending follow requests" do locked = insert(:user, %{info: %{locked: true}}) follower = insert(:user) - Pleroma.Web.TwitterAPI.TwitterAPI.follow(follower, %{"user_id" => unlocked.id}) - Pleroma.Web.TwitterAPI.TwitterAPI.follow(follower, %{"user_id" => locked.id}) + CommonAPI.follow(follower, unlocked) + CommonAPI.follow(follower, locked) assert {:ok, []} = User.get_follow_requests(unlocked) assert {:ok, [activity]} = User.get_follow_requests(locked) @@ -83,9 +83,9 @@ test "doesn't return already accepted or duplicate follow requests" do pending_follower = insert(:user) accepted_follower = insert(:user) - Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}) - Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}) - Pleroma.Web.TwitterAPI.TwitterAPI.follow(accepted_follower, %{"user_id" => locked.id}) + CommonAPI.follow(pending_follower, locked) + CommonAPI.follow(pending_follower, locked) + CommonAPI.follow(accepted_follower, locked) User.follow(accepted_follower, locked) assert {:ok, [activity]} = User.get_follow_requests(locked) @@ -1279,11 +1279,9 @@ test "follower count is updated when a follower is blocked" do {:ok, _follower2} = User.follow(follower2, user) {:ok, _follower3} = User.follow(follower3, user) - {:ok, _} = User.block(user, follower) + {:ok, user} = User.block(user, follower) - user_show = Pleroma.Web.TwitterAPI.UserView.render("show.json", %{user: user}) - - assert Map.get(user_show, "followers_count") == 2 + assert User.user_info(user).follower_count == 2 end describe "list_inactive_users_query/1" do @@ -1327,7 +1325,7 @@ test "Only includes users who has no recent activity" do to = Enum.random(users -- [user]) {:ok, _} = - Pleroma.Web.TwitterAPI.TwitterAPI.create_status(user, %{ + CommonAPI.post(user, %{ "status" => "hey @#{to.nickname}" }) end) @@ -1359,12 +1357,12 @@ test "Only includes users with no read notifications" do Enum.each(recipients, fn to -> {:ok, _} = - Pleroma.Web.TwitterAPI.TwitterAPI.create_status(sender, %{ + CommonAPI.post(sender, %{ "status" => "hey @#{to.nickname}" }) {:ok, _} = - Pleroma.Web.TwitterAPI.TwitterAPI.create_status(sender, %{ + CommonAPI.post(sender, %{ "status" => "hey again @#{to.nickname}" }) end) diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 6fcdc19aa..66588c891 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -21,7 +21,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do alias Pleroma.Web.OAuth.Token alias Pleroma.Web.OStatus alias Pleroma.Web.Push - alias Pleroma.Web.TwitterAPI.TwitterAPI import Pleroma.Factory import ExUnit.CaptureLog import Tesla.Mock @@ -1583,12 +1582,9 @@ test "gets an users media", %{conn: conn} do filename: "an_image.jpg" } - media = - TwitterAPI.upload(file, user, "json") - |> Jason.decode!() + {:ok, %{id: media_id}} = ActivityPub.upload(file, actor: user.ap_id) - {:ok, image_post} = - CommonAPI.post(user, %{"status" => "cofe", "media_ids" => [media["media_id"]]}) + {:ok, image_post} = CommonAPI.post(user, %{"status" => "cofe", "media_ids" => [media_id]}) conn = conn diff --git a/test/web/mastodon_api/mastodon_api_test.exs b/test/web/mastodon_api/mastodon_api_test.exs index b4c0427c9..7fcb2bd55 100644 --- a/test/web/mastodon_api/mastodon_api_test.exs +++ b/test/web/mastodon_api/mastodon_api_test.exs @@ -8,8 +8,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do alias Pleroma.Notification alias Pleroma.ScheduledActivity alias Pleroma.User + alias Pleroma.Web.CommonAPI alias Pleroma.Web.MastodonAPI.MastodonAPI - alias Pleroma.Web.TwitterAPI.TwitterAPI import Pleroma.Factory @@ -75,8 +75,9 @@ test "returns notifications for user" do User.subscribe(subscriber, user) - {:ok, status} = TwitterAPI.create_status(user, %{"status" => "Akariiiin"}) - {:ok, status1} = TwitterAPI.create_status(user, %{"status" => "Magi"}) + {:ok, status} = CommonAPI.post(user, %{"status" => "Akariiiin"}) + + {:ok, status1} = CommonAPI.post(user, %{"status" => "Magi"}) {:ok, [notification]} = Notification.create_notifications(status) {:ok, [notification1]} = Notification.create_notifications(status1) res = MastodonAPI.get_notifications(subscriber) diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index cbe83852e..ac9c0c27e 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -4,12 +4,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do use Pleroma.DataCase - alias Pleroma.Activity - alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken - alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.TwitterAPI.ActivityView alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.TwitterAPI.UserView @@ -21,253 +18,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do :ok end - test "create a status" do - user = insert(:user) - mentioned_user = insert(:user, %{nickname: "shp", ap_id: "shp"}) - - object_data = %{ - "type" => "Image", - "url" => [ - %{ - "type" => "Link", - "mediaType" => "image/jpg", - "href" => "http://example.org/image.jpg" - } - ], - "uuid" => 1 - } - - object = Repo.insert!(%Object{data: object_data}) - - input = %{ - "status" => - "Hello again, @shp.\nThis is on another :firefox: line. #2hu #epic #phantasmagoric", - "media_ids" => [object.id] - } - - {:ok, activity = %Activity{}} = TwitterAPI.create_status(user, input) - object = Object.normalize(activity) - - expected_text = - "Hello again, @shp.<script></script>
This is on another :firefox: line.
image.jpg" - - assert get_in(object.data, ["content"]) == expected_text - assert get_in(object.data, ["type"]) == "Note" - assert get_in(object.data, ["actor"]) == user.ap_id - assert get_in(activity.data, ["actor"]) == user.ap_id - assert Enum.member?(get_in(activity.data, ["cc"]), User.ap_followers(user)) - - assert Enum.member?( - get_in(activity.data, ["to"]), - "https://www.w3.org/ns/activitystreams#Public" - ) - - assert Enum.member?(get_in(activity.data, ["to"]), "shp") - assert activity.local == true - - assert %{"firefox" => "http://localhost:4001/emoji/Firefox.gif"} = object.data["emoji"] - - # hashtags - assert object.data["tag"] == ["2hu", "epic", "phantasmagoric"] - - # Add a context - assert is_binary(get_in(activity.data, ["context"])) - assert is_binary(get_in(object.data, ["context"])) - - assert is_list(object.data["attachment"]) - - assert activity.data["object"] == object.data["id"] - - user = User.get_cached_by_ap_id(user.ap_id) - - assert user.info.note_count == 1 - end - - test "create a status that is a reply" do - user = insert(:user) - - input = %{ - "status" => "Hello again." - } - - {:ok, activity = %Activity{}} = TwitterAPI.create_status(user, input) - object = Object.normalize(activity) - - input = %{ - "status" => "Here's your (you).", - "in_reply_to_status_id" => activity.id - } - - {:ok, reply = %Activity{}} = TwitterAPI.create_status(user, input) - reply_object = Object.normalize(reply) - - assert get_in(reply.data, ["context"]) == get_in(activity.data, ["context"]) - - assert get_in(reply_object.data, ["context"]) == get_in(object.data, ["context"]) - - assert get_in(reply_object.data, ["inReplyTo"]) == get_in(activity.data, ["object"]) - assert Activity.get_in_reply_to_activity(reply).id == activity.id - end - - test "Follow another user using user_id" do - user = insert(:user) - followed = insert(:user) - - {:ok, user, followed, _activity} = TwitterAPI.follow(user, %{"user_id" => followed.id}) - assert User.ap_followers(followed) in user.following - - {:ok, _, _, _} = TwitterAPI.follow(user, %{"user_id" => followed.id}) - end - - test "Follow another user using screen_name" do - user = insert(:user) - followed = insert(:user) - - {:ok, user, followed, _activity} = - TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) - - assert User.ap_followers(followed) in user.following - - followed = User.get_cached_by_ap_id(followed.ap_id) - assert followed.info.follower_count == 1 - - {:ok, _, _, _} = TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) - end - - test "Unfollow another user using user_id" do - unfollowed = insert(:user) - user = insert(:user, %{following: [User.ap_followers(unfollowed)]}) - ActivityPub.follow(user, unfollowed) - - {:ok, user, unfollowed} = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id}) - assert user.following == [] - - {:error, msg} = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id}) - assert msg == "Not subscribed!" - end - - test "Unfollow another user using screen_name" do - unfollowed = insert(:user) - user = insert(:user, %{following: [User.ap_followers(unfollowed)]}) - - ActivityPub.follow(user, unfollowed) - - {:ok, user, unfollowed} = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname}) - assert user.following == [] - - {:error, msg} = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname}) - assert msg == "Not subscribed!" - end - - test "Block another user using user_id" do - user = insert(:user) - blocked = insert(:user) - - {:ok, user, blocked} = TwitterAPI.block(user, %{"user_id" => blocked.id}) - assert User.blocks?(user, blocked) - end - - test "Block another user using screen_name" do - user = insert(:user) - blocked = insert(:user) - - {:ok, user, blocked} = TwitterAPI.block(user, %{"screen_name" => blocked.nickname}) - assert User.blocks?(user, blocked) - end - - test "Unblock another user using user_id" do - unblocked = insert(:user) - user = insert(:user) - {:ok, user, _unblocked} = TwitterAPI.block(user, %{"user_id" => unblocked.id}) - - {:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"user_id" => unblocked.id}) - assert user.info.blocks == [] - end - - test "Unblock another user using screen_name" do - unblocked = insert(:user) - user = insert(:user) - {:ok, user, _unblocked} = TwitterAPI.block(user, %{"screen_name" => unblocked.nickname}) - - {:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"screen_name" => unblocked.nickname}) - assert user.info.blocks == [] - end - - test "upload a file" do - user = insert(:user) - - file = %Plug.Upload{ - content_type: "image/jpg", - path: Path.absname("test/fixtures/image.jpg"), - filename: "an_image.jpg" - } - - response = TwitterAPI.upload(file, user) - - assert is_binary(response) - end - - test "it favorites a status, returns the updated activity" do - user = insert(:user) - other_user = insert(:user) - note_activity = insert(:note_activity) - - {:ok, status} = TwitterAPI.fav(user, note_activity.id) - updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) - assert ActivityView.render("activity.json", %{activity: updated_activity})["fave_num"] == 1 - - object = Object.normalize(note_activity) - - assert object.data["like_count"] == 1 - - assert status == updated_activity - - {:ok, _status} = TwitterAPI.fav(other_user, note_activity.id) - - object = Object.normalize(note_activity) - - assert object.data["like_count"] == 2 - - updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) - assert ActivityView.render("activity.json", %{activity: updated_activity})["fave_num"] == 2 - end - - test "it unfavorites a status, returns the updated activity" do - user = insert(:user) - note_activity = insert(:note_activity) - object = Object.normalize(note_activity) - - {:ok, _like_activity, _object} = ActivityPub.like(user, object) - updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) - - assert ActivityView.render("activity.json", activity: updated_activity)["fave_num"] == 1 - - {:ok, activity} = TwitterAPI.unfav(user, note_activity.id) - - assert ActivityView.render("activity.json", activity: activity)["fave_num"] == 0 - end - - test "it retweets a status and returns the retweet" do - user = insert(:user) - note_activity = insert(:note_activity) - - {:ok, status} = TwitterAPI.repeat(user, note_activity.id) - updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) - - assert status == updated_activity - end - - test "it unretweets an already retweeted status" do - user = insert(:user) - note_activity = insert(:note_activity) - - {:ok, _status} = TwitterAPI.repeat(user, note_activity.id) - {:ok, status} = TwitterAPI.unrepeat(user, note_activity.id) - updated_activity = Activity.get_by_ap_id(note_activity.data["id"]) - - assert status == updated_activity - end - test "it registers a new user and returns the user." do data = %{ "nickname" => "lain", @@ -701,19 +451,4 @@ test "it assigns an integer conversation_id" do Supervisor.restart_child(Pleroma.Supervisor, Cachex) :ok end - - describe "fetching a user by uri" do - test "fetches a user by uri" do - id = "https://mastodon.social/users/lambadalambda" - user = insert(:user) - {:ok, represented} = TwitterAPI.get_external_profile(user, id) - remote = User.get_cached_by_ap_id(id) - - assert represented["id"] == UserView.render("show.json", %{user: remote, for: user})["id"] - - # Also fetches the feed. - # assert Activity.get_create_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status") - # credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength - end - end end diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs deleted file mode 100644 index 56d861efb..000000000 --- a/test/web/twitter_api/views/activity_view_test.exs +++ /dev/null @@ -1,384 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do - use Pleroma.DataCase - - alias Pleroma.Activity - alias Pleroma.Object - alias Pleroma.Repo - alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.CommonAPI - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.UserView - - import Pleroma.Factory - import Tesla.Mock - - setup do - mock(fn env -> apply(HttpRequestMock, :request, [env]) end) - :ok - end - - import Mock - - test "returns a temporary ap_id based user for activities missing db users" do - user = insert(:user) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!", "visibility" => "direct"}) - - Repo.delete(user) - Cachex.clear(:user_cache) - - %{"user" => tw_user} = ActivityView.render("activity.json", activity: activity) - - assert tw_user["screen_name"] == "erroruser@example.com" - assert tw_user["name"] == user.ap_id - assert tw_user["statusnet_profile_url"] == user.ap_id - end - - test "tries to get a user by nickname if fetching by ap_id doesn't work" do - user = insert(:user) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!", "visibility" => "direct"}) - - {:ok, user} = - user - |> Ecto.Changeset.change(%{ap_id: "#{user.ap_id}/extension/#{user.nickname}"}) - |> Repo.update() - - Cachex.clear(:user_cache) - - result = ActivityView.render("activity.json", activity: activity) - assert result["user"]["id"] == user.id - end - - test "tells if the message is muted for some reason" do - user = insert(:user) - other_user = insert(:user) - - {:ok, user} = User.mute(user, other_user) - - {:ok, activity} = CommonAPI.post(other_user, %{"status" => "test"}) - status = ActivityView.render("activity.json", %{activity: activity}) - - assert status["muted"] == false - - status = ActivityView.render("activity.json", %{activity: activity, for: user}) - - assert status["muted"] == true - end - - test "a create activity with a html status" do - text = """ - #Bike log - Commute Tuesday\nhttps://pla.bike/posts/20181211/\n#cycling #CHScycling #commute\nMVIMG_20181211_054020.jpg - """ - - {:ok, activity} = CommonAPI.post(insert(:user), %{"status" => text}) - - result = ActivityView.render("activity.json", activity: activity) - - assert result["statusnet_html"] == - "#Bike log - Commute Tuesday
https://pla.bike/posts/20181211/
#cycling #CHScycling #commute
MVIMG_20181211_054020.jpg" - - assert result["text"] == - "#Bike log - Commute Tuesday\nhttps://pla.bike/posts/20181211/\n#cycling #CHScycling #commute\nMVIMG_20181211_054020.jpg" - end - - test "a create activity with a summary containing emoji" do - {:ok, activity} = - CommonAPI.post(insert(:user), %{ - "spoiler_text" => ":firefox: meow", - "status" => "." - }) - - result = ActivityView.render("activity.json", activity: activity) - - expected = ":firefox: meow" - - expected_html = - "\"firefox\" meow" - - assert result["summary"] == expected - assert result["summary_html"] == expected_html - end - - test "a create activity with a summary containing invalid HTML" do - {:ok, activity} = - CommonAPI.post(insert(:user), %{ - "spoiler_text" => "meow", - "status" => "." - }) - - result = ActivityView.render("activity.json", activity: activity) - - expected = "meow" - - assert result["summary"] == expected - assert result["summary_html"] == expected - end - - test "a create activity with a note" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!", "visibility" => "direct"}) - object = Object.normalize(activity) - - result = ActivityView.render("activity.json", activity: activity) - - convo_id = Utils.context_to_conversation_id(object.data["context"]) - - expected = %{ - "activity_type" => "post", - "attachments" => [], - "attentions" => [ - UserView.render("show.json", %{user: other_user}) - ], - "created_at" => object.data["published"] |> Utils.date_to_asctime(), - "external_url" => object.data["id"], - "fave_num" => 0, - "favorited" => false, - "id" => activity.id, - "in_reply_to_status_id" => nil, - "in_reply_to_screen_name" => nil, - "in_reply_to_user_id" => nil, - "in_reply_to_profileurl" => nil, - "in_reply_to_ostatus_uri" => nil, - "is_local" => true, - "is_post_verb" => true, - "possibly_sensitive" => false, - "repeat_num" => 0, - "repeated" => false, - "pinned" => false, - "statusnet_conversation_id" => convo_id, - "summary" => "", - "summary_html" => "", - "statusnet_html" => - "Hey @shp!", - "tags" => [], - "text" => "Hey @shp!", - "uri" => object.data["id"], - "user" => UserView.render("show.json", %{user: user}), - "visibility" => "direct", - "card" => nil, - "muted" => false - } - - assert result == expected - end - - test "a list of activities" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - object = Object.normalize(activity) - - convo_id = Utils.context_to_conversation_id(object.data["context"]) - - mocks = [ - { - Utils, - [:passthrough], - [context_to_conversation_id: fn _ -> false end] - }, - { - User, - [:passthrough], - [get_cached_by_ap_id: fn _ -> nil end] - } - ] - - with_mocks mocks do - [result] = ActivityView.render("index.json", activities: [activity]) - - assert result["statusnet_conversation_id"] == convo_id - assert result["user"] - refute called(Utils.context_to_conversation_id(:_)) - refute called(User.get_cached_by_ap_id(user.ap_id)) - refute called(User.get_cached_by_ap_id(other_user.ap_id)) - end - end - - test "an activity that is a reply" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - - {:ok, answer} = - CommonAPI.post(other_user, %{"status" => "Hi!", "in_reply_to_status_id" => activity.id}) - - result = ActivityView.render("activity.json", %{activity: answer}) - - assert result["in_reply_to_status_id"] == activity.id - end - - test "a like activity" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - {:ok, like, _object} = CommonAPI.favorite(activity.id, other_user) - - result = ActivityView.render("activity.json", activity: like) - activity = Pleroma.Activity.get_by_ap_id(activity.data["id"]) - - expected = %{ - "activity_type" => "like", - "created_at" => like.data["published"] |> Utils.date_to_asctime(), - "external_url" => like.data["id"], - "id" => like.id, - "in_reply_to_status_id" => activity.id, - "is_local" => true, - "is_post_verb" => false, - "favorited_status" => ActivityView.render("activity.json", activity: activity), - "statusnet_html" => "shp favorited a status.", - "text" => "shp favorited a status.", - "uri" => "tag:#{like.data["id"]}:objectType=Favourite", - "user" => UserView.render("show.json", user: other_user) - } - - assert result == expected - end - - test "a like activity for deleted post" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - {:ok, like, _object} = CommonAPI.favorite(activity.id, other_user) - CommonAPI.delete(activity.id, user) - - result = ActivityView.render("activity.json", activity: like) - - expected = %{ - "activity_type" => "like", - "created_at" => like.data["published"] |> Utils.date_to_asctime(), - "external_url" => like.data["id"], - "id" => like.id, - "in_reply_to_status_id" => nil, - "is_local" => true, - "is_post_verb" => false, - "favorited_status" => nil, - "statusnet_html" => "shp favorited a status.", - "text" => "shp favorited a status.", - "uri" => "tag:#{like.data["id"]}:objectType=Favourite", - "user" => UserView.render("show.json", user: other_user) - } - - assert result == expected - end - - test "an announce activity" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - {:ok, announce, object} = CommonAPI.repeat(activity.id, other_user) - - convo_id = Utils.context_to_conversation_id(object.data["context"]) - - activity = Activity.get_by_id(activity.id) - - result = ActivityView.render("activity.json", activity: announce) - - expected = %{ - "activity_type" => "repeat", - "created_at" => announce.data["published"] |> Utils.date_to_asctime(), - "external_url" => announce.data["id"], - "id" => announce.id, - "is_local" => true, - "is_post_verb" => false, - "statusnet_html" => "shp repeated a status.", - "text" => "shp repeated a status.", - "uri" => "tag:#{announce.data["id"]}:objectType=note", - "user" => UserView.render("show.json", user: other_user), - "retweeted_status" => ActivityView.render("activity.json", activity: activity), - "statusnet_conversation_id" => convo_id - } - - assert result == expected - end - - test "A follow activity" do - user = insert(:user) - other_user = insert(:user, %{nickname: "shp"}) - - {:ok, follower} = User.follow(user, other_user) - {:ok, follow} = ActivityPub.follow(follower, other_user) - - result = ActivityView.render("activity.json", activity: follow) - - expected = %{ - "activity_type" => "follow", - "attentions" => [], - "created_at" => follow.data["published"] |> Utils.date_to_asctime(), - "external_url" => follow.data["id"], - "id" => follow.id, - "in_reply_to_status_id" => nil, - "is_local" => true, - "is_post_verb" => false, - "statusnet_html" => "#{user.nickname} started following shp", - "text" => "#{user.nickname} started following shp", - "user" => UserView.render("show.json", user: user) - } - - assert result == expected - end - - test "a delete activity" do - user = insert(:user) - - {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) - {:ok, delete} = CommonAPI.delete(activity.id, user) - - result = ActivityView.render("activity.json", activity: delete) - - expected = %{ - "activity_type" => "delete", - "attentions" => [], - "created_at" => delete.data["published"] |> Utils.date_to_asctime(), - "external_url" => delete.data["id"], - "id" => delete.id, - "in_reply_to_status_id" => nil, - "is_local" => true, - "is_post_verb" => false, - "statusnet_html" => "deleted notice {{tag", - "text" => "deleted notice {{tag", - "uri" => Object.normalize(delete).data["id"], - "user" => UserView.render("show.json", user: user) - } - - assert result == expected - end - - test "a peertube video" do - {:ok, object} = - Pleroma.Object.Fetcher.fetch_object_from_id( - "https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3" - ) - - %Activity{} = activity = Activity.get_create_by_object_ap_id(object.data["id"]) - - result = ActivityView.render("activity.json", activity: activity) - - assert length(result["attachments"]) == 1 - assert result["summary"] == "Friday Night" - end - - test "special characters are not escaped in text field for status created" do - text = "<3 is on the way" - - {:ok, activity} = CommonAPI.post(insert(:user), %{"status" => text}) - - result = ActivityView.render("activity.json", activity: activity) - - assert result["text"] == text - end -end diff --git a/test/web/twitter_api/views/notification_view_test.exs b/test/web/twitter_api/views/notification_view_test.exs deleted file mode 100644 index 6baeeaf63..000000000 --- a/test/web/twitter_api/views/notification_view_test.exs +++ /dev/null @@ -1,112 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.NotificationViewTest do - use Pleroma.DataCase - - alias Pleroma.Notification - alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.NotificationView - alias Pleroma.Web.TwitterAPI.TwitterAPI - alias Pleroma.Web.TwitterAPI.UserView - - import Pleroma.Factory - - setup do - user = insert(:user, bio: "Here's some html") - [user: user] - end - - test "A follow notification" do - note_activity = insert(:note_activity) - user = User.get_cached_by_ap_id(note_activity.data["actor"]) - follower = insert(:user) - - {:ok, follower} = User.follow(follower, user) - {:ok, activity} = ActivityPub.follow(follower, user) - Cachex.put(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id))) - [follow_notif] = Notification.for_user(user) - - represented = %{ - "created_at" => follow_notif.inserted_at |> Utils.format_naive_asctime(), - "from_profile" => UserView.render("show.json", %{user: follower, for: user}), - "id" => follow_notif.id, - "is_seen" => 0, - "notice" => ActivityView.render("activity.json", %{activity: activity, for: user}), - "ntype" => "follow" - } - - assert represented == - NotificationView.render("notification.json", %{notification: follow_notif, for: user}) - end - - test "A mention notification" do - user = insert(:user) - other_user = insert(:user) - - {:ok, activity} = - TwitterAPI.create_status(other_user, %{"status" => "Päivää, @#{user.nickname}"}) - - [notification] = Notification.for_user(user) - - represented = %{ - "created_at" => notification.inserted_at |> Utils.format_naive_asctime(), - "from_profile" => UserView.render("show.json", %{user: other_user, for: user}), - "id" => notification.id, - "is_seen" => 0, - "notice" => ActivityView.render("activity.json", %{activity: activity, for: user}), - "ntype" => "mention" - } - - assert represented == - NotificationView.render("notification.json", %{notification: notification, for: user}) - end - - test "A retweet notification" do - note_activity = insert(:note_activity) - user = User.get_cached_by_ap_id(note_activity.data["actor"]) - repeater = insert(:user) - - {:ok, _activity} = TwitterAPI.repeat(repeater, note_activity.id) - [notification] = Notification.for_user(user) - - represented = %{ - "created_at" => notification.inserted_at |> Utils.format_naive_asctime(), - "from_profile" => UserView.render("show.json", %{user: repeater, for: user}), - "id" => notification.id, - "is_seen" => 0, - "notice" => - ActivityView.render("activity.json", %{activity: notification.activity, for: user}), - "ntype" => "repeat" - } - - assert represented == - NotificationView.render("notification.json", %{notification: notification, for: user}) - end - - test "A like notification" do - note_activity = insert(:note_activity) - user = User.get_cached_by_ap_id(note_activity.data["actor"]) - liker = insert(:user) - - {:ok, _activity} = TwitterAPI.fav(liker, note_activity.id) - [notification] = Notification.for_user(user) - - represented = %{ - "created_at" => notification.inserted_at |> Utils.format_naive_asctime(), - "from_profile" => UserView.render("show.json", %{user: liker, for: user}), - "id" => notification.id, - "is_seen" => 0, - "notice" => - ActivityView.render("activity.json", %{activity: notification.activity, for: user}), - "ntype" => "like" - } - - assert represented == - NotificationView.render("notification.json", %{notification: notification, for: user}) - end -end diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs deleted file mode 100644 index 70c5a0b7f..000000000 --- a/test/web/twitter_api/views/user_view_test.exs +++ /dev/null @@ -1,323 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.UserViewTest do - use Pleroma.DataCase - - alias Pleroma.User - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.TwitterAPI.UserView - - import Pleroma.Factory - - setup do - user = insert(:user, bio: "Here's some html") - [user: user] - end - - test "A user with only a nickname", %{user: user} do - user = %{user | name: nil, nickname: "scarlett@catgirl.science"} - represented = UserView.render("show.json", %{user: user}) - assert represented["name"] == user.nickname - assert represented["name_html"] == user.nickname - end - - test "A user with an avatar object", %{user: user} do - image = "image" - user = %{user | avatar: %{"url" => [%{"href" => image}]}} - represented = UserView.render("show.json", %{user: user}) - assert represented["profile_image_url"] == image - end - - test "A user with emoji in username" do - expected = - "\"karjalanpiirakka\" man" - - user = - insert(:user, %{ - info: %{ - source_data: %{ - "tag" => [ - %{ - "type" => "Emoji", - "icon" => %{"url" => "/file.png"}, - "name" => ":karjalanpiirakka:" - } - ] - } - }, - name: ":karjalanpiirakka: man" - }) - - represented = UserView.render("show.json", %{user: user}) - assert represented["name_html"] == expected - end - - test "A user" do - note_activity = insert(:note_activity) - user = User.get_cached_by_ap_id(note_activity.data["actor"]) - {:ok, user} = User.update_note_count(user) - follower = insert(:user) - second_follower = insert(:user) - - User.follow(follower, user) - User.follow(second_follower, user) - User.follow(user, follower) - {:ok, user} = User.update_follower_count(user) - Cachex.put(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id))) - - image = "http://localhost:4001/images/avi.png" - banner = "http://localhost:4001/images/banner.png" - - represented = %{ - "id" => user.id, - "name" => user.name, - "screen_name" => user.nickname, - "name_html" => user.name, - "description" => HtmlSanitizeEx.strip_tags(user.bio |> String.replace("
", "\n")), - "description_html" => HtmlSanitizeEx.basic_html(user.bio), - "created_at" => user.inserted_at |> Utils.format_naive_asctime(), - "favourites_count" => 0, - "statuses_count" => 1, - "friends_count" => 1, - "followers_count" => 2, - "profile_image_url" => image, - "profile_image_url_https" => image, - "profile_image_url_profile_size" => image, - "profile_image_url_original" => image, - "following" => false, - "follows_you" => false, - "statusnet_blocking" => false, - "statusnet_profile_url" => user.ap_id, - "cover_photo" => banner, - "background_image" => nil, - "is_local" => true, - "locked" => false, - "hide_follows" => false, - "hide_followers" => false, - "fields" => [], - "pleroma" => %{ - "confirmation_pending" => false, - "tags" => [], - "skip_thread_containment" => false - }, - "rights" => %{"admin" => false, "delete_others_notice" => false}, - "role" => "member" - } - - assert represented == UserView.render("show.json", %{user: user}) - end - - test "User exposes settings for themselves and only for themselves", %{user: user} do - as_user = UserView.render("show.json", %{user: user, for: user}) - assert as_user["default_scope"] == user.info.default_scope - assert as_user["no_rich_text"] == user.info.no_rich_text - assert as_user["pleroma"]["notification_settings"] == user.info.notification_settings - as_stranger = UserView.render("show.json", %{user: user}) - refute as_stranger["default_scope"] - refute as_stranger["no_rich_text"] - refute as_stranger["pleroma"]["notification_settings"] - end - - test "A user for a given other follower", %{user: user} do - follower = insert(:user, %{following: [User.ap_followers(user)]}) - {:ok, user} = User.update_follower_count(user) - image = "http://localhost:4001/images/avi.png" - banner = "http://localhost:4001/images/banner.png" - - represented = %{ - "id" => user.id, - "name" => user.name, - "screen_name" => user.nickname, - "name_html" => user.name, - "description" => HtmlSanitizeEx.strip_tags(user.bio |> String.replace("
", "\n")), - "description_html" => HtmlSanitizeEx.basic_html(user.bio), - "created_at" => user.inserted_at |> Utils.format_naive_asctime(), - "favourites_count" => 0, - "statuses_count" => 0, - "friends_count" => 0, - "followers_count" => 1, - "profile_image_url" => image, - "profile_image_url_https" => image, - "profile_image_url_profile_size" => image, - "profile_image_url_original" => image, - "following" => true, - "follows_you" => false, - "statusnet_blocking" => false, - "statusnet_profile_url" => user.ap_id, - "cover_photo" => banner, - "background_image" => nil, - "is_local" => true, - "locked" => false, - "hide_follows" => false, - "hide_followers" => false, - "fields" => [], - "pleroma" => %{ - "confirmation_pending" => false, - "tags" => [], - "skip_thread_containment" => false - }, - "rights" => %{"admin" => false, "delete_others_notice" => false}, - "role" => "member" - } - - assert represented == UserView.render("show.json", %{user: user, for: follower}) - end - - test "A user that follows you", %{user: user} do - follower = insert(:user) - {:ok, follower} = User.follow(follower, user) - {:ok, user} = User.update_follower_count(user) - image = "http://localhost:4001/images/avi.png" - banner = "http://localhost:4001/images/banner.png" - - represented = %{ - "id" => follower.id, - "name" => follower.name, - "screen_name" => follower.nickname, - "name_html" => follower.name, - "description" => HtmlSanitizeEx.strip_tags(follower.bio |> String.replace("
", "\n")), - "description_html" => HtmlSanitizeEx.basic_html(follower.bio), - "created_at" => follower.inserted_at |> Utils.format_naive_asctime(), - "favourites_count" => 0, - "statuses_count" => 0, - "friends_count" => 1, - "followers_count" => 0, - "profile_image_url" => image, - "profile_image_url_https" => image, - "profile_image_url_profile_size" => image, - "profile_image_url_original" => image, - "following" => false, - "follows_you" => true, - "statusnet_blocking" => false, - "statusnet_profile_url" => follower.ap_id, - "cover_photo" => banner, - "background_image" => nil, - "is_local" => true, - "locked" => false, - "hide_follows" => false, - "hide_followers" => false, - "fields" => [], - "pleroma" => %{ - "confirmation_pending" => false, - "tags" => [], - "skip_thread_containment" => false - }, - "rights" => %{"admin" => false, "delete_others_notice" => false}, - "role" => "member" - } - - assert represented == UserView.render("show.json", %{user: follower, for: user}) - end - - test "a user that is a moderator" do - user = insert(:user, %{info: %{is_moderator: true}}) - represented = UserView.render("show.json", %{user: user, for: user}) - - assert represented["rights"]["delete_others_notice"] - assert represented["role"] == "moderator" - end - - test "a user that is a admin" do - user = insert(:user, %{info: %{is_admin: true}}) - represented = UserView.render("show.json", %{user: user, for: user}) - - assert represented["rights"]["admin"] - assert represented["role"] == "admin" - end - - test "A moderator with hidden role for another user", %{user: user} do - admin = insert(:user, %{info: %{is_moderator: true, show_role: false}}) - represented = UserView.render("show.json", %{user: admin, for: user}) - - assert represented["role"] == nil - end - - test "An admin with hidden role for another user", %{user: user} do - admin = insert(:user, %{info: %{is_admin: true, show_role: false}}) - represented = UserView.render("show.json", %{user: admin, for: user}) - - assert represented["role"] == nil - end - - test "A regular user for the admin", %{user: user} do - admin = insert(:user, %{info: %{is_admin: true}}) - represented = UserView.render("show.json", %{user: user, for: admin}) - - assert represented["pleroma"]["deactivated"] == false - end - - test "A blocked user for the blocker" do - user = insert(:user) - blocker = insert(:user) - User.block(blocker, user) - image = "http://localhost:4001/images/avi.png" - banner = "http://localhost:4001/images/banner.png" - - represented = %{ - "id" => user.id, - "name" => user.name, - "screen_name" => user.nickname, - "name_html" => user.name, - "description" => HtmlSanitizeEx.strip_tags(user.bio |> String.replace("
", "\n")), - "description_html" => HtmlSanitizeEx.basic_html(user.bio), - "created_at" => user.inserted_at |> Utils.format_naive_asctime(), - "favourites_count" => 0, - "statuses_count" => 0, - "friends_count" => 0, - "followers_count" => 0, - "profile_image_url" => image, - "profile_image_url_https" => image, - "profile_image_url_profile_size" => image, - "profile_image_url_original" => image, - "following" => false, - "follows_you" => false, - "statusnet_blocking" => true, - "statusnet_profile_url" => user.ap_id, - "cover_photo" => banner, - "background_image" => nil, - "is_local" => true, - "locked" => false, - "hide_follows" => false, - "hide_followers" => false, - "fields" => [], - "pleroma" => %{ - "confirmation_pending" => false, - "tags" => [], - "skip_thread_containment" => false - }, - "rights" => %{"admin" => false, "delete_others_notice" => false}, - "role" => "member" - } - - blocker = User.get_cached_by_id(blocker.id) - assert represented == UserView.render("show.json", %{user: user, for: blocker}) - end - - test "a user with mastodon fields" do - fields = [ - %{ - "name" => "Pronouns", - "value" => "she/her" - }, - %{ - "name" => "Website", - "value" => "https://example.org/" - } - ] - - user = - insert(:user, %{ - info: %{ - source_data: %{ - "attachment" => - Enum.map(fields, fn field -> Map.put(field, "type", "PropertyValue") end) - } - } - }) - - userview = UserView.render("show.json", %{user: user}) - assert userview["fields"] == fields - end -end From 7808eee9aa4a02c289173a45e0b02def3bf51773 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Sat, 31 Aug 2019 16:23:15 +0900 Subject: [PATCH 071/400] Update Japanese document to follow English document --- docs/installation/debian_based_jp.md | 141 +++++++++++++-------------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/docs/installation/debian_based_jp.md b/docs/installation/debian_based_jp.md index caf72363b..5ca6b3634 100644 --- a/docs/installation/debian_based_jp.md +++ b/docs/installation/debian_based_jp.md @@ -5,180 +5,179 @@ ## インストール -このガイドはDebian Stretchを仮定しています。Ubuntu 16.04でも可能です。 +このガイドはDebian Stretchを利用することを想定しています。Ubuntu 16.04や18.04でもおそらく動作します。また、ユーザはrootもしくはsudoにより管理者権限を持っていることを前提とします。もし、以下の操作をrootユーザで行う場合は、 `sudo` を無視してください。ただし、`sudo -Hu pleroma` のようにユーザを指定している場合には `su -s $SHELL -c 'command'` を代わりに使ってください。 ### 必要なソフトウェア -- PostgreSQL 9.6+ (postgresql-contrib-9.6 または他のバージョンの PSQL をインストールしてください) -- Elixir 1.5 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like))。または [asdf](https://github.com/asdf-vm/asdf) を pleroma ユーザーでインストール。 -- erlang-dev +- PostgreSQL 9.6以上 (Ubuntu16.04では9.5しか提供されていないので，[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください) +- postgresql-contrib 9.6以上 (同上) +- Elixir 1.5 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください) + - erlang-dev - erlang-tools - erlang-parsetools +- erlang-eldap (LDAP認証を有効化するときのみ必要) - erlang-ssh -- erlang-xmerl (Jessieではバックポートからインストールすること！) +- erlang-xmerl - git - build-essential -- openssh -- openssl -- nginx prefered (Apacheも動くかもしれませんが、誰もテストしていません！) -- certbot (または何らかのACME Let's encryptクライアント) + +#### このガイドで利用している追加パッケージ + +- nginx (おすすめです。他のリバースプロキシを使う場合は、参考となる設定をこのリポジトリから探してください) +- certbot (または何らかのLet's Encrypt向けACMEクライアント) ### システムを準備する * まずシステムをアップデートしてください。 ``` -apt update && apt dist-upgrade +sudo apt update +sudo apt full-upgrade ``` -* 複数のツールとpostgresqlをインストールします。あとで必要になるので。 +* 上記に挙げたパッケージをインストールしておきます。 ``` -apt install git build-essential openssl ssh sudo postgresql-9.6 postgresql-contrib-9.6 +sudo apt install git build-essential postgresql postgresql-contrib ``` -(postgresqlのバージョンは、あなたのディストロにあわせて変えてください。または、バージョン番号がいらないかもしれません。) + ### ElixirとErlangをインストールします * Erlangのリポジトリをダウンロードおよびインストールします。 ``` -wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb && sudo dpkg -i /tmp/erlang-solutions_1.0_all.deb +wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb +sudo dpkg -i /tmp/erlang-solutions_1.0_all.deb ``` * ElixirとErlangをインストールします、 ``` -apt update && apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh +sudo apt update +sudo apt install elixir erlang-dev erlang-parsetools erlang-xmerl erlang-tools erlang-ssh ``` ### Pleroma BE (バックエンド) をインストールします -* 新しいユーザーを作ります。 -``` -adduser pleroma -``` -(Give it any password you want, make it STRONG) +* Pleroma用に新しいユーザーを作ります。 -* 新しいユーザーをsudoグループに入れます。 ``` -usermod -aG sudo pleroma +sudo useradd -r -s /bin/false -m -d /var/lib/pleroma -U pleroma ``` -* 新しいユーザーに変身し、ホームディレクトリに移動します。 -``` -su pleroma -cd ~ -``` +**注意**: Pleromaユーザとして単発のコマンドを実行したい場合はは、`sudo -Hu pleroma command` を使ってください。シェルを使いたい場合は `sudo -Hu pleroma $SHELL`です。もし `sudo` を使わない場合は、rootユーザで `su -l pleroma -s $SHELL -c 'command'` とすることでコマンドを、`su -l pleroma -s $SHELL` とすることでシェルを開始できます。 * Gitリポジトリをクローンします。 ``` -git clone -b master https://git.pleroma.social/pleroma/pleroma +sudo mkdir -p /opt/pleroma +sudo chown -R pleroma:pleroma /opt/pleroma +sudo -Hu pleroma git clone -b master https://git.pleroma.social/pleroma/pleroma /opt/pleroma ``` * 新しいディレクトリに移動します。 ``` -cd pleroma/ +cd /opt/pleroma ``` * Pleromaが依存するパッケージをインストールします。Hexをインストールしてもよいか聞かれたら、yesを入力してください。 ``` -mix deps.get +sudo -Hu pleroma mix deps.get ``` * コンフィギュレーションを生成します。 ``` -mix pleroma.instance gen +sudo -Hu pleroma mix pleroma.instance gen ``` * rebar3をインストールしてもよいか聞かれたら、yesを入力してください。 - * この処理には時間がかかります。私もよく分かりませんが、何らかのコンパイルが行われているようです。 - * あなたのインスタンスについて、いくつかの質問があります。その回答は `config/generated_config.exs` というコンフィギュレーションファイルに保存されます。 + * このときにpleromaの一部がコンパイルされるため、この処理には時間がかかります。 + * あなたのインスタンスについて、いくつかの質問されます。この質問により `config/generated_config.exs` という設定ファイルが生成されます。 -**注意**: メディアプロクシを有効にすると回答して、なおかつ、キャッシュのURLは空欄のままにしている場合は、`generated_config.exs` を編集して、`base_url` で始まる行をコメントアウトまたは削除してください。そして、上にある行の `true` の後にあるコンマを消してください。 * コンフィギュレーションを確認して、もし問題なければ、ファイル名を変更してください。 ``` mv config/{generated_config.exs,prod.secret.exs} ``` -* これまでのコマンドで、すでに `config/setup_db.psql` というファイルが作られています。このファイルをもとに、データベースを作成します。 +* 先程のコマンドで、すでに `config/setup_db.psql` というファイルが作られています。このファイルをもとに、データベースを作成します。 ``` -sudo su postgres -c 'psql -f config/setup_db.psql' +sudo -Hu pleroma mix pleroma.instance gen ``` -* そして、データベースのミグレーションを実行します。 +* そして、データベースのマイグレーションを実行します。 ``` -MIX_ENV=prod mix ecto.migrate +sudo -Hu pleroma MIX_ENV=prod mix ecto.migrate ``` -* Pleromaを起動できるようになりました。 +* これでPleromaを起動できるようになりました。 ``` -MIX_ENV=prod mix phx.server +sudo -Hu pleroma MIX_ENV=prod mix phx.server ``` -### インストールを終わらせる +### インストールの最終段階 -あなたの新しいインスタンスを世界に向けて公開するには、nginxまたは何らかのウェブサーバー (プロクシ) を使用する必要があります。また、Pleroma のためにシステムサービスファイルを作成する必要があります。 +あなたの新しいインスタンスを世界に向けて公開するには、nginx等のWebサーバやプロキシサーバをPleromaの前段に使用する必要があります。また、Pleroma のためにシステムサービスファイルを作成する必要があります。 #### Nginx * まだインストールしていないなら、nginxをインストールします。 ``` -apt install nginx +sudo apt install nginx ``` * SSLをセットアップします。他の方法でもよいですが、ここではcertbotを説明します。 certbotを使うならば、まずそれをインストールします。 ``` -apt install certbot +sudo apt install certbot ``` そしてセットアップします。 ``` -mkdir -p /var/lib/letsencrypt/.well-known -% certbot certonly --email your@emailaddress --webroot -w /var/lib/letsencrypt/ -d yourdomain +sudo mkdir -p /var/lib/letsencrypt/ +sudo certbot certonly --email -d --standalone ``` -もしうまくいかないときは、先にnginxを設定してください。ssl "on" を "off" に変えてから再試行してください。 +もしうまくいかないときは、nginxが正しく動いていない可能性があります。先にnginxを設定してください。ssl "on" を "off" に変えてから再試行してください。 --- -* nginxコンフィギュレーションの例をnginxフォルダーにコピーします。 +* nginxの設定ファイルサンプルをnginxフォルダーにコピーします。 ``` -cp /home/pleroma/pleroma/installation/pleroma.nginx /etc/nginx/sites-enabled/pleroma.nginx +sudo cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.nginx +sudo ln -s /etc/nginx/sites-available/pleroma.nginx /etc/nginx/sites-enabled/pleroma.nginx ``` -* nginxを起動する前に、コンフィギュレーションを編集してください。例えば、サーバー名、証明書のパスなどを変更する必要があります。 +* nginxを起動する前に、設定ファイルを編集してください。例えば、サーバー名、証明書のパスなどを変更する必要があります。 * nginxを再起動します。 ``` -systemctl reload nginx.service +sudo systemctl enable --now nginx.service ``` +もし証明書を更新する必要が出てきた場合には、nginxの関連するlocationブロックのコメントアウトを外し、以下のコマンドを動かします。 + +``` +sudo certbot certonly --email -d --webroot -w /var/lib/letsencrypt/ +``` + +#### 他のWebサーバやプロキシ +これに関してはサンプルが `/opt/pleroma/installation/` にあるので、探してみてください。 + #### Systemd サービス -* サービスファイルの例をコピーします。 +* サービスファイルのサンプルをコピーします。 ``` -cp /home/pleroma/pleroma/installation/pleroma.service /usr/lib/systemd/system/pleroma.service +sudo cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service ``` -* サービスファイルを変更します。すべてのパスが正しいことを確認してください。また、`[Service]` セクションに以下の行があることを確認してください。 +* サービスファイルを変更します。すべてのパスが正しいことを確認してください +* サービスを有効化し `pleroma.service` を開始してください ``` -Environment="MIX_ENV=prod" +sudo systemctl enable --now pleroma.service ``` -* `pleroma.service` を enable および start してください。 +#### 初期ユーザの作成 + +新たにインスタンスを作成したら、以下のコマンドにより管理者権限を持った初期ユーザを作成できます。 + ``` -systemctl enable --now pleroma.service +sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new --admin ``` -#### モデレーターを作る - -新たにユーザーを作ったら、モデレーター権限を与えたいかもしれません。以下のタスクで可能です。 -``` -mix set_moderator username [true|false] -``` - -モデレーターはすべてのポストを消すことができます。将来的には他のことも可能になるかもしれません。 - -#### メディアプロクシを有効にする - -`generate_config` でメディアプロクシを有効にしているなら、すでにメディアプロクシが動作しています。あとから設定を変更したいなら、[How to activate mediaproxy](How-to-activate-mediaproxy) を見てください。 - -#### コンフィギュレーションとカスタマイズ +#### その他の設定とカスタマイズ * [Backup your instance](backup.html) * [Configuration tips](general-tips-for-customizing-pleroma-fe.html) From 985122cc03380b8e3decd4ac7180ea5b0f7ab30d Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:31:15 +0300 Subject: [PATCH 072/400] Remove Activity, User and Notification views from TwitterAPI --- .../web/twitter_api/views/activity_view.ex | 366 ------------------ .../twitter_api/views/notification_view.ex | 71 ---- .../web/twitter_api/views/user_view.ex | 191 --------- test/web/twitter_api/twitter_api_test.exs | 38 +- 4 files changed, 15 insertions(+), 651 deletions(-) delete mode 100644 lib/pleroma/web/twitter_api/views/activity_view.ex delete mode 100644 lib/pleroma/web/twitter_api/views/notification_view.ex delete mode 100644 lib/pleroma/web/twitter_api/views/user_view.ex diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex deleted file mode 100644 index abae63877..000000000 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ /dev/null @@ -1,366 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.ActivityView do - use Pleroma.Web, :view - alias Pleroma.Activity - alias Pleroma.Formatter - alias Pleroma.HTML - alias Pleroma.Object - alias Pleroma.Repo - alias Pleroma.User - alias Pleroma.Web.CommonAPI - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.MastodonAPI.StatusView - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter - alias Pleroma.Web.TwitterAPI.UserView - - import Ecto.Query - require Logger - require Pleroma.Constants - - defp query_context_ids([]), do: [] - - defp query_context_ids(contexts) do - query = from(o in Object, where: fragment("(?)->>'id' = ANY(?)", o.data, ^contexts)) - - Repo.all(query) - end - - defp query_users([]), do: [] - - defp query_users(user_ids) do - query = from(user in User, where: user.ap_id in ^user_ids) - - Repo.all(query) - end - - defp collect_context_ids(activities) do - _contexts = - activities - |> Enum.reject(& &1.data["context_id"]) - |> Enum.map(fn %{data: data} -> - data["context"] - end) - |> Enum.filter(& &1) - |> query_context_ids() - |> Enum.reduce(%{}, fn %{data: %{"id" => ap_id}, id: id}, acc -> - Map.put(acc, ap_id, id) - end) - end - - defp collect_users(activities) do - activities - |> Enum.map(fn activity -> - case activity.data do - data = %{"type" => "Follow"} -> - [data["actor"], data["object"]] - - data -> - [data["actor"]] - end ++ activity.recipients - end) - |> List.flatten() - |> Enum.uniq() - |> query_users() - |> Enum.reduce(%{}, fn user, acc -> - Map.put(acc, user.ap_id, user) - end) - end - - defp get_context_id(%{data: %{"context_id" => context_id}}, _) when not is_nil(context_id), - do: context_id - - defp get_context_id(%{data: %{"context" => nil}}, _), do: nil - - defp get_context_id(%{data: %{"context" => context}}, options) do - cond do - id = options[:context_ids][context] -> id - true -> Utils.context_to_conversation_id(context) - end - end - - defp get_context_id(_, _), do: nil - - defp get_user(ap_id, opts) do - cond do - user = opts[:users][ap_id] -> - user - - String.ends_with?(ap_id, "/followers") -> - nil - - ap_id == Pleroma.Constants.as_public() -> - nil - - user = User.get_cached_by_ap_id(ap_id) -> - user - - user = User.get_by_guessed_nickname(ap_id) -> - user - - true -> - User.error_user(ap_id) - end - end - - def render("index.json", opts) do - context_ids = collect_context_ids(opts.activities) - users = collect_users(opts.activities) - - opts = - opts - |> Map.put(:context_ids, context_ids) - |> Map.put(:users, users) - - safe_render_many( - opts.activities, - ActivityView, - "activity.json", - opts - ) - end - - def render("activity.json", %{activity: %{data: %{"type" => "Delete"}} = activity} = opts) do - user = get_user(activity.data["actor"], opts) - created_at = activity.data["published"] |> Utils.date_to_asctime() - - %{ - "id" => activity.id, - "uri" => activity.data["object"], - "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "attentions" => [], - "statusnet_html" => "deleted notice {{tag", - "text" => "deleted notice {{tag", - "is_local" => activity.local, - "is_post_verb" => false, - "created_at" => created_at, - "in_reply_to_status_id" => nil, - "external_url" => activity.data["id"], - "activity_type" => "delete" - } - end - - def render("activity.json", %{activity: %{data: %{"type" => "Follow"}} = activity} = opts) do - user = get_user(activity.data["actor"], opts) - created_at = activity.data["published"] || DateTime.to_iso8601(activity.inserted_at) - created_at = created_at |> Utils.date_to_asctime() - - followed = get_user(activity.data["object"], opts) - text = "#{user.nickname} started following #{followed.nickname}" - - %{ - "id" => activity.id, - "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "attentions" => [], - "statusnet_html" => text, - "text" => text, - "is_local" => activity.local, - "is_post_verb" => false, - "created_at" => created_at, - "in_reply_to_status_id" => nil, - "external_url" => activity.data["id"], - "activity_type" => "follow" - } - end - - def render("activity.json", %{activity: %{data: %{"type" => "Announce"}} = activity} = opts) do - user = get_user(activity.data["actor"], opts) - created_at = activity.data["published"] |> Utils.date_to_asctime() - announced_activity = Activity.get_create_by_object_ap_id(activity.data["object"]) - - text = "#{user.nickname} repeated a status." - - retweeted_status = render("activity.json", Map.merge(opts, %{activity: announced_activity})) - - %{ - "id" => activity.id, - "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "statusnet_html" => text, - "text" => text, - "is_local" => activity.local, - "is_post_verb" => false, - "uri" => "tag:#{activity.data["id"]}:objectType=note", - "created_at" => created_at, - "retweeted_status" => retweeted_status, - "statusnet_conversation_id" => get_context_id(announced_activity, opts), - "external_url" => activity.data["id"], - "activity_type" => "repeat" - } - end - - def render("activity.json", %{activity: %{data: %{"type" => "Like"}} = activity} = opts) do - user = get_user(activity.data["actor"], opts) - liked_activity = Activity.get_create_by_object_ap_id(activity.data["object"]) - liked_activity_id = if liked_activity, do: liked_activity.id, else: nil - - created_at = - activity.data["published"] - |> Utils.date_to_asctime() - - text = "#{user.nickname} favorited a status." - - favorited_status = - if liked_activity, - do: render("activity.json", Map.merge(opts, %{activity: liked_activity})), - else: nil - - %{ - "id" => activity.id, - "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "statusnet_html" => text, - "text" => text, - "is_local" => activity.local, - "is_post_verb" => false, - "uri" => "tag:#{activity.data["id"]}:objectType=Favourite", - "created_at" => created_at, - "favorited_status" => favorited_status, - "in_reply_to_status_id" => liked_activity_id, - "external_url" => activity.data["id"], - "activity_type" => "like" - } - end - - def render( - "activity.json", - %{activity: %{data: %{"type" => "Create", "object" => object_id}} = activity} = opts - ) do - user = get_user(activity.data["actor"], opts) - - object = Object.normalize(object_id) - - created_at = object.data["published"] |> Utils.date_to_asctime() - like_count = object.data["like_count"] || 0 - announcement_count = object.data["announcement_count"] || 0 - favorited = opts[:for] && opts[:for].ap_id in (object.data["likes"] || []) - repeated = opts[:for] && opts[:for].ap_id in (object.data["announcements"] || []) - pinned = activity.id in user.info.pinned_activities - - attentions = - [] - |> Utils.maybe_notify_to_recipients(activity) - |> Utils.maybe_notify_mentioned_recipients(activity) - |> Enum.map(fn ap_id -> get_user(ap_id, opts) end) - |> Enum.filter(& &1) - |> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end) - - conversation_id = get_context_id(activity, opts) - - tags = object.data["tag"] || [] - possibly_sensitive = object.data["sensitive"] || Enum.member?(tags, "nsfw") - - tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags - - {summary, content} = render_content(object.data) - - html = - content - |> HTML.get_cached_scrubbed_html_for_activity( - User.html_filter_policy(opts[:for]), - activity, - "twitterapi:content" - ) - |> Formatter.emojify(object.data["emoji"]) - - text = - if content do - content - |> String.replace(~r//, "\n") - |> HTML.get_cached_stripped_html_for_activity(activity, "twitterapi:content") - else - "" - end - - reply_parent = Activity.get_in_reply_to_activity(activity) - - reply_user = reply_parent && User.get_cached_by_ap_id(reply_parent.actor) - - summary = HTML.strip_tags(summary) - - card = - StatusView.render( - "card.json", - Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) - ) - - thread_muted? = - case activity.thread_muted? do - thread_muted? when is_boolean(thread_muted?) -> thread_muted? - nil -> CommonAPI.thread_muted?(user, activity) - end - - %{ - "id" => activity.id, - "uri" => object.data["id"], - "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "statusnet_html" => html, - "text" => text, - "is_local" => activity.local, - "is_post_verb" => true, - "created_at" => created_at, - "in_reply_to_status_id" => reply_parent && reply_parent.id, - "in_reply_to_screen_name" => reply_user && reply_user.nickname, - "in_reply_to_profileurl" => User.profile_url(reply_user), - "in_reply_to_ostatus_uri" => reply_user && reply_user.ap_id, - "in_reply_to_user_id" => reply_user && reply_user.id, - "statusnet_conversation_id" => conversation_id, - "attachments" => (object.data["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts), - "attentions" => attentions, - "fave_num" => like_count, - "repeat_num" => announcement_count, - "favorited" => !!favorited, - "repeated" => !!repeated, - "pinned" => pinned, - "external_url" => object.data["external_url"] || object.data["id"], - "tags" => tags, - "activity_type" => "post", - "possibly_sensitive" => possibly_sensitive, - "visibility" => Pleroma.Web.ActivityPub.Visibility.get_visibility(object), - "summary" => summary, - "summary_html" => summary |> Formatter.emojify(object.data["emoji"]), - "card" => card, - "muted" => thread_muted? || User.mutes?(opts[:for], user) - } - end - - def render("activity.json", %{activity: unhandled_activity}) do - Logger.warn("#{__MODULE__} unhandled activity: #{inspect(unhandled_activity)}") - nil - end - - def render_content(%{"type" => "Note"} = object) do - summary = object["summary"] - - content = - if !!summary and summary != "" do - "

#{summary}

#{object["content"]}" - else - object["content"] - end - - {summary, content} - end - - def render_content(%{"type" => object_type} = object) - when object_type in ["Article", "Page", "Video"] do - summary = object["name"] || object["summary"] - - content = - if !!summary and summary != "" and is_bitstring(object["url"]) do - "

#{summary}

#{object["content"]}" - else - object["content"] - end - - {summary, content} - end - - def render_content(object) do - summary = object["summary"] || "Unhandled activity type: #{object["type"]}" - content = "

#{summary}

#{object["content"]}" - - {summary, content} - end -end diff --git a/lib/pleroma/web/twitter_api/views/notification_view.ex b/lib/pleroma/web/twitter_api/views/notification_view.ex deleted file mode 100644 index 085cd5aa3..000000000 --- a/lib/pleroma/web/twitter_api/views/notification_view.ex +++ /dev/null @@ -1,71 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.NotificationView do - use Pleroma.Web, :view - alias Pleroma.Notification - alias Pleroma.User - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.TwitterAPI.ActivityView - alias Pleroma.Web.TwitterAPI.UserView - - require Pleroma.Constants - - defp get_user(ap_id, opts) do - cond do - user = opts[:users][ap_id] -> - user - - String.ends_with?(ap_id, "/followers") -> - nil - - ap_id == Pleroma.Constants.as_public() -> - nil - - true -> - User.get_cached_by_ap_id(ap_id) - end - end - - def render("notification.json", %{notifications: notifications, for: user}) do - render_many( - notifications, - Pleroma.Web.TwitterAPI.NotificationView, - "notification.json", - for: user - ) - end - - def render( - "notification.json", - %{ - notification: %Notification{ - id: id, - seen: seen, - activity: activity, - inserted_at: created_at - }, - for: user - } = opts - ) do - ntype = - case activity.data["type"] do - "Create" -> "mention" - "Like" -> "like" - "Announce" -> "repeat" - "Follow" -> "follow" - end - - from = get_user(activity.data["actor"], opts) - - %{ - "id" => id, - "ntype" => ntype, - "notice" => ActivityView.render("activity.json", %{activity: activity, for: user}), - "from_profile" => UserView.render("show.json", %{user: from, for: user}), - "is_seen" => if(seen, do: 1, else: 0), - "created_at" => created_at |> Utils.format_naive_asctime() - } - end -end diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex deleted file mode 100644 index 8a7d2fc72..000000000 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ /dev/null @@ -1,191 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.UserView do - use Pleroma.Web, :view - alias Pleroma.Formatter - alias Pleroma.HTML - alias Pleroma.User - alias Pleroma.Web.CommonAPI.Utils - alias Pleroma.Web.MediaProxy - - def render("show.json", %{user: user = %User{}} = assigns) do - render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns) - end - - def render("index.json", %{users: users, for: user}) do - users - |> render_many(Pleroma.Web.TwitterAPI.UserView, "user.json", for: user) - |> Enum.filter(&Enum.any?/1) - end - - def render("user.json", %{user: user = %User{}} = assigns) do - if User.visible_for?(user, assigns[:for]), - do: do_render("user.json", assigns), - else: %{} - end - - def render("short.json", %{ - user: %User{ - nickname: nickname, - id: id, - ap_id: ap_id, - name: name - } - }) do - %{ - "fullname" => name, - "id" => id, - "ostatus_uri" => ap_id, - "profile_url" => ap_id, - "screen_name" => nickname - } - end - - defp do_render("user.json", %{user: user = %User{}} = assigns) do - for_user = assigns[:for] - image = User.avatar_url(user) |> MediaProxy.url() - - {following, follows_you, statusnet_blocking} = - if for_user do - { - User.following?(for_user, user), - User.following?(user, for_user), - User.blocks?(for_user, user) - } - else - {false, false, false} - end - - user_info = User.get_cached_user_info(user) - - emoji = - (user.info.source_data["tag"] || []) - |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end) - |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} -> - {String.trim(name, ":"), url} - end) - - emoji = Enum.dedup(emoji ++ user.info.emoji) - - description_html = - (user.bio || "") - |> HTML.filter_tags(User.html_filter_policy(for_user)) - |> Formatter.emojify(emoji) - - fields = - user.info - |> User.Info.fields() - |> Enum.map(fn %{"name" => name, "value" => value} -> - %{ - "name" => Pleroma.HTML.strip_tags(name), - "value" => Pleroma.HTML.filter_tags(value, Pleroma.HTML.Scrubber.LinksOnly) - } - end) - - data = - %{ - "created_at" => user.inserted_at |> Utils.format_naive_asctime(), - "description" => HTML.strip_tags((user.bio || "") |> String.replace("
", "\n")), - "description_html" => description_html, - "favourites_count" => 0, - "followers_count" => user_info[:follower_count], - "following" => following, - "follows_you" => follows_you, - "statusnet_blocking" => statusnet_blocking, - "friends_count" => user_info[:following_count], - "id" => user.id, - "name" => user.name || user.nickname, - "name_html" => - if(user.name, - do: HTML.strip_tags(user.name) |> Formatter.emojify(emoji), - else: user.nickname - ), - "profile_image_url" => image, - "profile_image_url_https" => image, - "profile_image_url_profile_size" => image, - "profile_image_url_original" => image, - "screen_name" => user.nickname, - "statuses_count" => user_info[:note_count], - "statusnet_profile_url" => user.ap_id, - "cover_photo" => User.banner_url(user) |> MediaProxy.url(), - "background_image" => image_url(user.info.background) |> MediaProxy.url(), - "is_local" => user.local, - "locked" => user.info.locked, - "hide_followers" => user.info.hide_followers, - "hide_follows" => user.info.hide_follows, - "fields" => fields, - - # Pleroma extension - "pleroma" => - %{ - "confirmation_pending" => user_info.confirmation_pending, - "tags" => user.tags, - "skip_thread_containment" => user.info.skip_thread_containment - } - |> maybe_with_activation_status(user, for_user) - |> with_notification_settings(user, for_user) - } - |> maybe_with_user_settings(user, for_user) - |> maybe_with_role(user, for_user) - - if assigns[:token] do - Map.put(data, "token", token_string(assigns[:token])) - else - data - end - end - - defp with_notification_settings(data, %User{id: user_id} = user, %User{id: user_id}) do - Map.put(data, "notification_settings", user.info.notification_settings) - end - - defp with_notification_settings(data, _, _), do: data - - defp maybe_with_activation_status(data, user, %User{info: %{is_admin: true}}) do - Map.put(data, "deactivated", user.info.deactivated) - end - - defp maybe_with_activation_status(data, _, _), do: data - - defp maybe_with_role(data, %User{id: id} = user, %User{id: id}) do - Map.merge(data, %{ - "role" => role(user), - "show_role" => user.info.show_role, - "rights" => %{ - "delete_others_notice" => !!user.info.is_moderator, - "admin" => !!user.info.is_admin - } - }) - end - - defp maybe_with_role(data, %User{info: %{show_role: true}} = user, _user) do - Map.merge(data, %{ - "role" => role(user), - "rights" => %{ - "delete_others_notice" => !!user.info.is_moderator, - "admin" => !!user.info.is_admin - } - }) - end - - defp maybe_with_role(data, _, _), do: data - - defp maybe_with_user_settings(data, %User{info: info, id: id} = _user, %User{id: id}) do - data - |> Kernel.put_in(["default_scope"], info.default_scope) - |> Kernel.put_in(["no_rich_text"], info.no_rich_text) - end - - defp maybe_with_user_settings(data, _, _), do: data - defp role(%User{info: %{:is_admin => true}}), do: "admin" - defp role(%User{info: %{:is_moderator => true}}), do: "moderator" - defp role(_), do: "member" - - defp image_url(%{"url" => [%{"href" => href} | _]}), do: href - defp image_url(_), do: nil - - defp token_string(%Pleroma.Web.OAuth.Token{token: token_str}), do: token_str - defp token_string(token), do: token -end diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index ac9c0c27e..50ed43c15 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -7,9 +7,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken - alias Pleroma.Web.TwitterAPI.ActivityView alias Pleroma.Web.TwitterAPI.TwitterAPI - alias Pleroma.Web.TwitterAPI.UserView + alias Pleroma.Web.MastodonAPI.AccountView import Pleroma.Factory @@ -31,8 +30,8 @@ test "it registers a new user and returns the user." do fetched_user = User.get_cached_by_nickname("lain") - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) end test "it registers a new user with empty string in bio and returns the user." do @@ -49,8 +48,8 @@ test "it registers a new user with empty string in bio and returns the user." do fetched_user = User.get_cached_by_nickname("lain") - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) end test "it sends confirmation email if :account_activation_required is specified in instance config" do @@ -147,8 +146,8 @@ test "returns user on success" do assert invite.used == true - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) end test "returns error on invalid token" do @@ -212,8 +211,8 @@ test "returns error on expired token" do {:ok, user} = TwitterAPI.register_user(data) fetched_user = User.get_cached_by_nickname("vinny") - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) end {:ok, data: data, check_fn: check_fn} @@ -287,8 +286,8 @@ test "returns user on success, after him registration fails" do assert invite.used == true - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) data = %{ "nickname" => "GrimReaper", @@ -338,8 +337,8 @@ test "returns user on success" do refute invite.used - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) end test "error after max uses" do @@ -362,8 +361,8 @@ test "error after max uses" do invite = Repo.get_by(UserInviteToken, token: invite.token) assert invite.used == true - assert UserView.render("show.json", %{user: user}) == - UserView.render("show.json", %{user: fetched_user}) + assert AccountView.render("account.json", %{user: user}) == + AccountView.render("account.json", %{user: fetched_user}) data = %{ "nickname" => "GrimReaper", @@ -439,13 +438,6 @@ test "it returns the error on registration problems" do refute User.get_cached_by_nickname("lain") end - test "it assigns an integer conversation_id" do - note_activity = insert(:note_activity) - status = ActivityView.render("activity.json", activity: note_activity) - - assert is_number(status["statusnet_conversation_id"]) - end - setup do Supervisor.terminate_child(Pleroma.Supervisor, Cachex) Supervisor.restart_child(Pleroma.Supervisor, Cachex) From 2e7bb107e0267d0e50aebaa3e6db1312e1557b18 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:34:29 +0300 Subject: [PATCH 073/400] Remove Mention of TwitterAPI in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5aad34ccc..846442346 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Pleroma is a microblogging server software that can federate (= exchange message Pleroma is written in Elixir, high-performance and can run on small devices like a Raspberry Pi. -For clients it supports both the [GNU Social API with Qvitter extensions](https://twitter-api.readthedocs.io/en/latest/index.html) and the [Mastodon client API](https://docs.joinmastodon.org/api/guidelines/). +For clients it supports the [Mastodon client API](https://docs.joinmastodon.org/api/guidelines/) with Pleroma extensions (see "Pleroma's APIs and Mastodon API extensions" section on ). - [Client Applications for Pleroma](https://docs-develop.pleroma.social/clients.html) From 64410497d20869f9b6c1c92a48761157048b0cb9 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:41:15 +0300 Subject: [PATCH 074/400] Remove TwitterAPI representers --- .../representers/base_representer.ex | 38 ------------ .../representers/object_representer.ex | 39 ------------ .../representers/object_representer_test.exs | 60 ------------------- 3 files changed, 137 deletions(-) delete mode 100644 lib/pleroma/web/twitter_api/representers/base_representer.ex delete mode 100644 lib/pleroma/web/twitter_api/representers/object_representer.ex delete mode 100644 test/web/twitter_api/representers/object_representer_test.exs diff --git a/lib/pleroma/web/twitter_api/representers/base_representer.ex b/lib/pleroma/web/twitter_api/representers/base_representer.ex deleted file mode 100644 index 3d31e6079..000000000 --- a/lib/pleroma/web/twitter_api/representers/base_representer.ex +++ /dev/null @@ -1,38 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.Representers.BaseRepresenter do - defmacro __using__(_opts) do - quote do - def to_json(object) do - to_json(object, %{}) - end - - def to_json(object, options) do - object - |> to_map(options) - |> Jason.encode!() - end - - def enum_to_list(enum, options) do - mapping = fn el -> to_map(el, options) end - Enum.map(enum, mapping) - end - - def to_map(object) do - to_map(object, %{}) - end - - def enum_to_json(enum) do - enum_to_json(enum, %{}) - end - - def enum_to_json(enum, options) do - enum - |> enum_to_list(options) - |> Jason.encode!() - end - end - end -end diff --git a/lib/pleroma/web/twitter_api/representers/object_representer.ex b/lib/pleroma/web/twitter_api/representers/object_representer.ex deleted file mode 100644 index 47130ba06..000000000 --- a/lib/pleroma/web/twitter_api/representers/object_representer.ex +++ /dev/null @@ -1,39 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do - use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter - alias Pleroma.Object - - def to_map(%Object{data: %{"url" => [url | _]}} = object, _opts) do - data = object.data - - %{ - url: url["href"] |> Pleroma.Web.MediaProxy.url(), - mimetype: url["mediaType"] || url["mimeType"], - id: data["uuid"], - oembed: false, - description: data["name"] - } - end - - def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do - %{ - url: url |> Pleroma.Web.MediaProxy.url(), - mimetype: data["mediaType"] || data["mimeType"], - id: data["uuid"], - oembed: false, - description: data["name"] - } - end - - def to_map(%Object{}, _opts) do - %{} - end - - # If we only get the naked data, wrap in an object - def to_map(%{} = data, opts) do - to_map(%Object{data: data}, opts) - end -end diff --git a/test/web/twitter_api/representers/object_representer_test.exs b/test/web/twitter_api/representers/object_representer_test.exs deleted file mode 100644 index c3cf330f1..000000000 --- a/test/web/twitter_api/representers/object_representer_test.exs +++ /dev/null @@ -1,60 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do - use Pleroma.DataCase - - alias Pleroma.Object - alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter - - test "represent an image attachment" do - object = %Object{ - id: 5, - data: %{ - "type" => "Image", - "url" => [ - %{ - "mediaType" => "sometype", - "href" => "someurl" - } - ], - "uuid" => 6 - } - } - - expected_object = %{ - id: 6, - url: "someurl", - mimetype: "sometype", - oembed: false, - description: nil - } - - assert expected_object == ObjectRepresenter.to_map(object) - end - - test "represents mastodon-style attachments" do - object = %Object{ - id: nil, - data: %{ - "mediaType" => "image/png", - "name" => "blabla", - "type" => "Document", - "url" => - "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png" - } - } - - expected_object = %{ - url: - "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png", - mimetype: "image/png", - oembed: false, - id: nil, - description: "blabla" - } - - assert expected_object == ObjectRepresenter.to_map(object) - end -end From dbfcba85ec2d3336219c75a32adbcff93a684309 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:45:37 +0300 Subject: [PATCH 075/400] Add a changelog entry for twitterapi removal and fix credo issues --- CHANGELOG.md | 1 + test/web/twitter_api/twitter_api_test.exs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdcb014a..e8ea83005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,6 +103,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - RichMedia: add the rich media ttl based on image expiration time. ### Removed +- GNU Social API with Qvitter extensions support - Emoji: Remove longfox emojis. - Remove `Reply-To` header from report emails for admins. - ActivityPub: The `accept_blocks` configuration setting. diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 50ed43c15..0a57e174f 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -7,8 +7,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do alias Pleroma.Repo alias Pleroma.User alias Pleroma.UserInviteToken - alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.MastodonAPI.AccountView + alias Pleroma.Web.TwitterAPI.TwitterAPI import Pleroma.Factory From 9cabc02864ff33b76f424a342732ef8039dfd73d Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 10:57:35 +0300 Subject: [PATCH 076/400] Remove a useless import --- test/web/twitter_api/twitter_api_test.exs | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 0a57e174f..c5b18234e 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -10,8 +10,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.TwitterAPI.TwitterAPI - import Pleroma.Factory - setup_all do Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) :ok From bd3ed3a62299bad5d717aaff0a0bd088ff1c1ef7 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 11:40:04 +0300 Subject: [PATCH 077/400] Add back /api/qvitter/statuses/notifications/read.json --- lib/pleroma/web/router.ex | 6 +++++ .../web/twitter_api/twitter_api_controller.ex | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 53728e298..eb7cbbc96 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -495,6 +495,12 @@ defmodule Pleroma.Web.Router do get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens) delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token) + + scope [] do + pipe_through(:oauth_read) + + post("/qvitter/statuses/notifications/read", TwitterAPI.Controller, :notifications_read) + end end pipeline :ap_service_actor do diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 1c3b11a57..8ca754b51 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -7,6 +7,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do alias Ecto.Changeset alias Pleroma.User + alias Pleroma.Notification alias Pleroma.Web.OAuth.Token alias Pleroma.Web.TwitterAPI.TokenView @@ -58,4 +59,28 @@ defp json_reply(conn, status, json) do |> put_resp_content_type("application/json") |> send_resp(status, json) end + + def notifications_read(%{assigns: %{user: user}} = conn, %{"latest_id" => latest_id} = params) do + Notification.set_read_up_to(user, latest_id) + + notifications = Notification.for_user(user, params) + + conn + # XXX: This is a hack because pleroma-fe still uses that API. + |> put_view(Pleroma.Web.MastodonAPI.NotificationView) + |> render("index.json", %{notifications: notifications, for: user}) + end + + def notifications_read(%{assigns: %{user: _user}} = conn, _) do + bad_request_reply(conn, "You need to specify latest_id") + end + + defp bad_request_reply(conn, error_message) do + json = error_json(conn, error_message) + json_reply(conn, 400, json) + end + + defp error_json(conn, error_message) do + %{"error" => error_message, "request" => conn.request_path} |> Jason.encode!() + end end From 70eed0594ce4fe2ec668c5ee3ad42c941b29888e Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 31 Aug 2019 13:08:43 +0300 Subject: [PATCH 078/400] credo fixes --- lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 8ca754b51..42234ae09 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -6,8 +6,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller alias Ecto.Changeset - alias Pleroma.User alias Pleroma.Notification + alias Pleroma.User alias Pleroma.Web.OAuth.Token alias Pleroma.Web.TwitterAPI.TokenView From a90ea8ba1562818b025f677ffeea35f7ca08ddf2 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Sat, 31 Aug 2019 19:08:56 +0300 Subject: [PATCH 079/400] [#1149] Addressed code review comments (code style, jobs pruning etc.). --- CHANGELOG.md | 2 +- config/config.exs | 2 +- config/test.exs | 2 + docs/config.md | 56 ++++++++++++++++++- lib/pleroma/activity_expiration_worker.ex | 6 +- lib/pleroma/application.ex | 2 +- lib/pleroma/digest_email_worker.ex | 4 +- lib/pleroma/emails/mailer.ex | 4 +- lib/pleroma/scheduled_activity_worker.ex | 2 +- lib/pleroma/user.ex | 2 +- lib/pleroma/web/activity_pub/activity_pub.ex | 2 +- .../mrf/mediaproxy_warming_policy.ex | 2 +- lib/pleroma/web/activity_pub/publisher.ex | 2 +- .../web/activity_pub/transmogrifier.ex | 4 +- lib/pleroma/web/federator/federator.ex | 8 +-- lib/pleroma/web/federator/publisher.ex | 9 +-- lib/pleroma/web/oauth/token/clean_worker.ex | 2 +- lib/pleroma/web/push/push.ex | 6 +- lib/pleroma/web/salmon/salmon.ex | 2 +- .../workers/activity_expiration_worker.ex | 21 +++++++ lib/pleroma/workers/background_worker.ex | 19 ++----- lib/pleroma/workers/helper.ex | 13 ----- .../workers/{mailer.ex => mailer_worker.ex} | 19 +++---- .../{publisher.ex => publisher_worker.ex} | 8 ++- .../{receiver.ex => receiver_worker.ex} | 4 +- .../workers/scheduled_activity_worker.ex | 2 +- .../{subscriber.ex => subscriber_worker.ex} | 4 +- ...smogrifier.ex => transmogrifier_worker.ex} | 6 +- .../{web_pusher.ex => web_pusher_worker.ex} | 4 +- lib/pleroma/workers/worker_helper.ex | 23 ++++++++ test/user_test.exs | 2 +- .../activity_pub_controller_test.exs | 2 +- test/web/federator_test.exs | 2 +- test/web/websub/websub_test.exs | 2 +- 34 files changed, 163 insertions(+), 87 deletions(-) create mode 100644 lib/pleroma/workers/activity_expiration_worker.ex delete mode 100644 lib/pleroma/workers/helper.ex rename lib/pleroma/workers/{mailer.ex => mailer_worker.ex} (58%) rename lib/pleroma/workers/{publisher.ex => publisher_worker.ex} (76%) rename lib/pleroma/workers/{receiver.ex => receiver_worker.ex} (83%) rename lib/pleroma/workers/{subscriber.ex => subscriber_worker.ex} (88%) rename lib/pleroma/workers/{transmogrifier.ex => transmogrifier_worker.ex} (73%) rename lib/pleroma/workers/{web_pusher.ex => web_pusher_worker.ex} (82%) create mode 100644 lib/pleroma/workers/worker_helper.ex diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b73c783f..c9d6fef17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template -- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) with [Oban](https://github.com/sorentwo/oban) +- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings). - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler ### Fixed diff --git a/config/config.exs b/config/config.exs index da89aa3e9..6fb4a0969 100644 --- a/config/config.exs +++ b/config/config.exs @@ -470,7 +470,7 @@ config :pleroma, Oban, repo: Pleroma.Repo, verbose: false, - prune: {:maxage, 60 * 60 * 24 * 7}, + prune: {:maxlen, 1500}, queues: [ activity_expiration: 10, federator_incoming: 50, diff --git a/config/test.exs b/config/test.exs index 0ef809ac1..df512b5d7 100644 --- a/config/test.exs +++ b/config/test.exs @@ -65,6 +65,8 @@ queues: false, prune: :disabled +config :pleroma, Pleroma.Scheduler, jobs: [] + config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, total_user_limit: 3, diff --git a/docs/config.md b/docs/config.md index 2e351e272..29a4d4c97 100644 --- a/docs/config.md +++ b/docs/config.md @@ -404,20 +404,29 @@ curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerando [Oban](https://github.com/sorentwo/oban) asynchronous job processor configuration. +Configuration options described in [Oban readme](https://github.com/sorentwo/oban#usage): +* `repo` - app's Ecto repo (`Pleroma.Repo`) +* `verbose` - logs verbosity +* `prune` - non-retryable jobs [pruning settings](https://github.com/sorentwo/oban#pruning) (`:disabled` / `{:maxlen, value}` / `{:maxage, value}`) +* `queues` - job queues (see below) + Pleroma has the following queues: +* `activity_expiration` - Activity expiration * `federator_outgoing` - Outgoing federation * `federator_incoming` - Incoming federation -* `mailer` - Email sender, see [`Pleroma.Emails.Mailer`](#pleroma-emails-mailer) +* `mailer` - Email sender, see [`Pleroma.Emails.Mailer`](#pleromaemailsmailer) * `transmogrifier` - Transmogrifier * `web_push` - Web push notifications -* `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity) +* `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivity`](#pleromascheduledactivity) Example: ```elixir config :pleroma, Oban, repo: Pleroma.Repo, + verbose: false, + prune: {:maxlen, 1500}, queues: [ federator_incoming: 50, federator_outgoing: 50 @@ -426,12 +435,37 @@ config :pleroma, Oban, This config contains two queues: `federator_incoming` and `federator_outgoing`. Both have the number of max concurrent jobs set to `50`. +### Migrating `pleroma_job_queue` settings + +`config :pleroma_job_queue, :queues` is replaced by `config :pleroma, Oban, :queues` and uses the same format (keys are queues' names, values are max concurrent jobs numbers). + +### Note on running with PostgreSQL in silent mode + +If you are running PostgreSQL in [`silent_mode`](https://postgresqlco.nf/en/doc/param/silent_mode?version=9.1), it's advised to set [`log_destination`](https://postgresqlco.nf/en/doc/param/log_destination?version=9.1) to `syslog`, +otherwise `postmaster.log` file may grow because of "you don't own a lock of type ShareLock" warnings (see https://github.com/sorentwo/oban/issues/52). + ## :workers Includes custom worker options not interpretable directly by `Oban`. * `retries` — keyword lists where keys are `Oban` queues (see above) and values are numbers of max attempts for failed jobs. +Example: + +```elixir +config :pleroma, :workers, + retries: [ + federator_incoming: 5, + federator_outgoing: 5 + ] +``` + +### Migrating `Pleroma.Web.Federator.RetryQueue` settings + +* `max_retries` is replaced with `config :pleroma, :workers, retries: [federator_outgoing: 5]` +* `enabled: false` corresponds to `config :pleroma, :workers, retries: [federator_outgoing: 1]` +* deprecated options: `max_jobs`, `initial_timeout` + ## Pleroma.Web.Metadata * `providers`: a list of metadata providers to enable. Providers available: * Pleroma.Web.Metadata.Providers.OpenGraph @@ -491,6 +525,24 @@ config :auto_linker, ] ``` +## Pleroma.Scheduler + +Configuration for [Quantum](https://github.com/quantum-elixir/quantum-core) jobs scheduler. + +See [Quantum readme](https://github.com/quantum-elixir/quantum-core#usage) for the list of supported options. + +Example: + +```elixir +config :pleroma, Pleroma.Scheduler, + global: true, + overlap: true, + timezone: :utc, + jobs: [{"0 */6 * * * *", {Pleroma.Web.Websub, :refresh_subscriptions, []}}] +``` + +The above example defines a single job which invokes `Pleroma.Web.Websub.refresh_subscriptions()` every 6 hours ("0 */6 * * * *", [crontab format](https://en.wikipedia.org/wiki/Cron)). + ## Pleroma.ScheduledActivity * `daily_user_limit`: the number of scheduled activities a user is allowed to create in a single day (Default: `25`) diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex index 5c0c53232..7aba7eece 100644 --- a/lib/pleroma/activity_expiration_worker.ex +++ b/lib/pleroma/activity_expiration_worker.ex @@ -9,13 +9,13 @@ defmodule Pleroma.ActivityExpirationWorker do alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.CommonAPI - alias Pleroma.Workers.BackgroundWorker + alias Pleroma.Workers.ActivityExpirationWorker require Logger use GenServer import Ecto.Query - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] @schedule_interval :timer.minutes(1) @@ -57,7 +57,7 @@ def handle_info(:perform, state) do "op" => "activity_expiration", "activity_expiration_id" => expiration.id } - |> BackgroundWorker.new(worker_args(:activity_expiration)) + |> ActivityExpirationWorker.new(worker_args(:activity_expiration)) |> Repo.insert() end) diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 7d38ed5c4..f8f866dbd 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -43,7 +43,7 @@ def start(_type, _args) do hackney_pool_children() ++ [ Pleroma.Stats, - {Oban, Application.get_env(:pleroma, Oban)}, + {Oban, Pleroma.Config.get(Oban)}, %{ id: :web_push_init, start: {Task, :start_link, [&Pleroma.Web.Push.init/0]}, diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/digest_email_worker.ex index ffc48bfab..4ab2a4ef4 100644 --- a/lib/pleroma/digest_email_worker.ex +++ b/lib/pleroma/digest_email_worker.ex @@ -4,11 +4,11 @@ defmodule Pleroma.DigestEmailWorker do alias Pleroma.Repo - alias Pleroma.Workers.Mailer, as: MailerWorker + alias Pleroma.Workers.MailerWorker import Ecto.Query - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def perform do config = Pleroma.Config.get([:email_notifications, :digest]) diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex index bb534f602..9cbe7313c 100644 --- a/lib/pleroma/emails/mailer.ex +++ b/lib/pleroma/emails/mailer.ex @@ -10,7 +10,7 @@ defmodule Pleroma.Emails.Mailer do """ alias Pleroma.Repo - alias Pleroma.Workers.Mailer, as: MailerWorker + alias Pleroma.Workers.MailerWorker alias Swoosh.DeliveryError @otp_app :pleroma @@ -19,7 +19,7 @@ defmodule Pleroma.Emails.Mailer do @spec enabled?() :: boolean() def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled]) - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] @doc "add email to queue" def deliver_async(email, config \\ []) do diff --git a/lib/pleroma/scheduled_activity_worker.ex b/lib/pleroma/scheduled_activity_worker.ex index a01fb4fcb..8bf534f42 100644 --- a/lib/pleroma/scheduled_activity_worker.ex +++ b/lib/pleroma/scheduled_activity_worker.ex @@ -18,7 +18,7 @@ defmodule Pleroma.ScheduledActivityWorker do @schedule_interval :timer.minutes(1) - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def start_link(_) do GenServer.start_link(__MODULE__, nil) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 18bba0fbb..abfa063fb 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -41,7 +41,7 @@ defmodule Pleroma.User do @strict_local_nickname_regex ~r/^[a-zA-Z\d]+$/ @extended_local_nickname_regex ~r/^[a-zA-Z\d_-]+$/ - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] schema "users" do field(:bio, :string) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 50279cca5..74c5eb91c 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -26,7 +26,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do require Logger require Pleroma.Constants - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] # For Announce activities, we filter the recipients based on following status for any actors # that match actual users. See issue #164 for more information about why this is necessary. diff --git a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex index b188164ee..178321558 100644 --- a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex @@ -18,7 +18,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do recv_timeout: 10_000 ] - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def perform(:prefetch, url) do Logger.info("Prefetching #{inspect(url)}") diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex index 24d101dc8..a6322e25a 100644 --- a/lib/pleroma/web/activity_pub/publisher.ex +++ b/lib/pleroma/web/activity_pub/publisher.ex @@ -85,7 +85,7 @@ def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = pa end def publish_one(%{actor_id: actor_id} = params) do - actor = User.get_by_id(actor_id) + actor = User.get_cached_by_id(actor_id) params |> Map.delete(:actor_id) diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index b068d28a7..9437f9a16 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -15,14 +15,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Visibility alias Pleroma.Web.Federator - alias Pleroma.Workers.Transmogrifier, as: TransmogrifierWorker + alias Pleroma.Workers.TransmogrifierWorker import Ecto.Query require Logger require Pleroma.Constants - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] @doc """ Modifies an incoming AP object (mastodon format) to our internal format. diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index cf7e50fee..8f43066e3 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -12,13 +12,13 @@ defmodule Pleroma.Web.Federator do alias Pleroma.Web.Federator.Publisher alias Pleroma.Web.OStatus alias Pleroma.Web.Websub - alias Pleroma.Workers.Publisher, as: PublisherWorker - alias Pleroma.Workers.Receiver, as: ReceiverWorker - alias Pleroma.Workers.Subscriber, as: SubscriberWorker + alias Pleroma.Workers.PublisherWorker + alias Pleroma.Workers.ReceiverWorker + alias Pleroma.Workers.SubscriberWorker require Logger - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def init do # To do: consider removing this call in favor of scheduled execution (`quantum`-based) diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex index 05d2be615..42be109ab 100644 --- a/lib/pleroma/web/federator/publisher.ex +++ b/lib/pleroma/web/federator/publisher.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.Federator.Publisher do alias Pleroma.Activity alias Pleroma.Config alias Pleroma.User - alias Pleroma.Workers.Publisher, as: PublisherWorker + alias Pleroma.Workers.PublisherWorker require Logger @@ -31,12 +31,7 @@ defmodule Pleroma.Web.Federator.Publisher do """ @spec enqueue_one(module(), Map.t()) :: :ok def enqueue_one(module, %{} = params) do - worker_args = - if max_attempts = Pleroma.Config.get([:workers, :retries, :federator_outgoing]) do - [max_attempts: max_attempts] - else - [] - end + worker_args = Pleroma.Workers.WorkerHelper.worker_args(:federator_outgoing) %{"op" => "publish_one", "module" => to_string(module), "params" => params} |> PublisherWorker.new(worker_args) diff --git a/lib/pleroma/web/oauth/token/clean_worker.ex b/lib/pleroma/web/oauth/token/clean_worker.ex index 943e73289..b150a68a7 100644 --- a/lib/pleroma/web/oauth/token/clean_worker.ex +++ b/lib/pleroma/web/oauth/token/clean_worker.ex @@ -20,7 +20,7 @@ defmodule Pleroma.Web.OAuth.Token.CleanWorker do alias Pleroma.Web.OAuth.Token alias Pleroma.Workers.BackgroundWorker - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def start_link(_), do: GenServer.start_link(__MODULE__, %{}) diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push/push.ex index b4f0e5127..4973b529c 100644 --- a/lib/pleroma/web/push/push.ex +++ b/lib/pleroma/web/push/push.ex @@ -4,11 +4,11 @@ defmodule Pleroma.Web.Push do alias Pleroma.Repo - alias Pleroma.Workers.WebPusher + alias Pleroma.Workers.WebPusherWorker require Logger - defdelegate worker_args(queue), to: Pleroma.Workers.Helper + import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] def init do unless enabled() do @@ -36,7 +36,7 @@ def enabled do def send(notification) do %{"op" => "web_push", "notification_id" => notification.id} - |> WebPusher.new(worker_args(:web_push)) + |> WebPusherWorker.new(worker_args(:web_push)) |> Repo.insert() end end diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex index bbaa293fd..8ba7380c0 100644 --- a/lib/pleroma/web/salmon/salmon.ex +++ b/lib/pleroma/web/salmon/salmon.ex @@ -171,7 +171,7 @@ def publish_one(%{recipient: url, feed: feed} = params) when is_binary(url) do end def publish_one(%{recipient_id: recipient_id} = params) do - recipient = User.get_by_id(recipient_id) + recipient = User.get_cached_by_id(recipient_id) params |> Map.delete(:recipient_id) diff --git a/lib/pleroma/workers/activity_expiration_worker.ex b/lib/pleroma/workers/activity_expiration_worker.ex new file mode 100644 index 000000000..0b491eabb --- /dev/null +++ b/lib/pleroma/workers/activity_expiration_worker.ex @@ -0,0 +1,21 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.ActivityExpirationWorker do + # Note: `max_attempts` is intended to be overridden in `new/2` call + use Oban.Worker, + queue: "activity_expiration", + max_attempts: 1 + + @impl Oban.Worker + def perform( + %{ + "op" => "activity_expiration", + "activity_expiration_id" => activity_expiration_id + }, + _job + ) do + Pleroma.ActivityExpirationWorker.perform(:execute, activity_expiration_id) + end +end diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex index fbce7d789..7b5575a5f 100644 --- a/lib/pleroma/workers/background_worker.ex +++ b/lib/pleroma/workers/background_worker.ex @@ -8,24 +8,24 @@ defmodule Pleroma.Workers.BackgroundWorker do alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy alias Pleroma.Web.OAuth.Token.CleanWorker - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "background", max_attempts: 1 @impl Oban.Worker def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do - user = User.get_by_id(user_id) + user = User.get_cached_by_id(user_id) User.perform(:fetch_initial_posts, user) end def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}, _job) do - user = User.get_by_id(user_id) + user = User.get_cached_by_id(user_id) User.perform(:deactivate_async, user, status) end def perform(%{"op" => "delete_user", "user_id" => user_id}, _job) do - user = User.get_by_id(user_id) + user = User.get_cached_by_id(user_id) User.perform(:delete, user) end @@ -37,7 +37,7 @@ def perform( }, _job ) do - blocker = User.get_by_id(blocker_id) + blocker = User.get_cached_by_id(blocker_id) User.perform(:blocks_import, blocker, blocked_identifiers) end @@ -49,7 +49,7 @@ def perform( }, _job ) do - follower = User.get_by_id(follower_id) + follower = User.get_cached_by_id(follower_id) User.perform(:follow_import, follower, followed_identifiers) end @@ -69,11 +69,4 @@ def perform(%{"op" => "fetch_data_for_activity", "activity_id" => activity_id}, activity = Activity.get_by_id(activity_id) Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity) end - - def perform( - %{"op" => "activity_expiration", "activity_expiration_id" => activity_expiration_id}, - _job - ) do - Pleroma.ActivityExpirationWorker.perform(:execute, activity_expiration_id) - end end diff --git a/lib/pleroma/workers/helper.ex b/lib/pleroma/workers/helper.ex deleted file mode 100644 index 3286ce0e8..000000000 --- a/lib/pleroma/workers/helper.ex +++ /dev/null @@ -1,13 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Workers.Helper do - def worker_args(queue) do - if max_attempts = Pleroma.Config.get([:workers, :retries, queue]) do - [max_attempts: max_attempts] - else - [] - end - end -end diff --git a/lib/pleroma/workers/mailer.ex b/lib/pleroma/workers/mailer_worker.ex similarity index 58% rename from lib/pleroma/workers/mailer.ex rename to lib/pleroma/workers/mailer_worker.ex index 1cce2ea03..4f73d61bc 100644 --- a/lib/pleroma/workers/mailer.ex +++ b/lib/pleroma/workers/mailer_worker.ex @@ -2,26 +2,25 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.Mailer do +defmodule Pleroma.Workers.MailerWorker do alias Pleroma.User - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "mailer", max_attempts: 1 @impl Oban.Worker def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}, _job) do - email = - encoded_email - |> Base.decode64!() - |> :erlang.binary_to_term() - - Pleroma.Emails.Mailer.deliver(email, config) + encoded_email + |> Base.decode64!() + |> :erlang.binary_to_term() + |> Pleroma.Emails.Mailer.deliver(config) end def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do - user = User.get_by_id(user_id) - Pleroma.DigestEmailWorker.perform(user) + user_id + |> User.get_cached_by_id() + |> Pleroma.DigestEmailWorker.perform() end end diff --git a/lib/pleroma/workers/publisher.ex b/lib/pleroma/workers/publisher_worker.ex similarity index 76% rename from lib/pleroma/workers/publisher.ex rename to lib/pleroma/workers/publisher_worker.ex index 00fae99c7..5671d2a29 100644 --- a/lib/pleroma/workers/publisher.ex +++ b/lib/pleroma/workers/publisher_worker.ex @@ -2,15 +2,19 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.Publisher do +defmodule Pleroma.Workers.PublisherWorker do alias Pleroma.Activity alias Pleroma.Web.Federator - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "federator_outgoing", max_attempts: 1 + def backoff(attempt) when is_integer(attempt) do + Pleroma.Workers.WorkerHelper.sidekiq_backoff(attempt, 5) + end + @impl Oban.Worker def perform(%{"op" => "publish", "activity_id" => activity_id}, _job) do activity = Activity.get_by_id(activity_id) diff --git a/lib/pleroma/workers/receiver.ex b/lib/pleroma/workers/receiver_worker.ex similarity index 83% rename from lib/pleroma/workers/receiver.ex rename to lib/pleroma/workers/receiver_worker.ex index 4ee270d74..cdce630f2 100644 --- a/lib/pleroma/workers/receiver.ex +++ b/lib/pleroma/workers/receiver_worker.ex @@ -2,10 +2,10 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.Receiver do +defmodule Pleroma.Workers.ReceiverWorker do alias Pleroma.Web.Federator - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "federator_incoming", max_attempts: 1 diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex index d9724c78a..4094411ae 100644 --- a/lib/pleroma/workers/scheduled_activity_worker.ex +++ b/lib/pleroma/workers/scheduled_activity_worker.ex @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.ScheduledActivityWorker do - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "scheduled_activities", max_attempts: 1 diff --git a/lib/pleroma/workers/subscriber.ex b/lib/pleroma/workers/subscriber_worker.ex similarity index 88% rename from lib/pleroma/workers/subscriber.ex rename to lib/pleroma/workers/subscriber_worker.ex index e960b35bf..22d1dc956 100644 --- a/lib/pleroma/workers/subscriber.ex +++ b/lib/pleroma/workers/subscriber_worker.ex @@ -2,12 +2,12 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.Subscriber do +defmodule Pleroma.Workers.SubscriberWorker do alias Pleroma.Repo alias Pleroma.Web.Federator alias Pleroma.Web.Websub - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "federator_outgoing", max_attempts: 1 diff --git a/lib/pleroma/workers/transmogrifier.ex b/lib/pleroma/workers/transmogrifier_worker.ex similarity index 73% rename from lib/pleroma/workers/transmogrifier.ex rename to lib/pleroma/workers/transmogrifier_worker.ex index e13202c06..6f5c1a2f2 100644 --- a/lib/pleroma/workers/transmogrifier.ex +++ b/lib/pleroma/workers/transmogrifier_worker.ex @@ -2,17 +2,17 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.Transmogrifier do +defmodule Pleroma.Workers.TransmogrifierWorker do alias Pleroma.User - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "transmogrifier", max_attempts: 1 @impl Oban.Worker def perform(%{"op" => "user_upgrade", "user_id" => user_id}, _job) do - user = User.get_by_id(user_id) + user = User.get_cached_by_id(user_id) Pleroma.Web.ActivityPub.Transmogrifier.perform(:user_upgrade, user) end end diff --git a/lib/pleroma/workers/web_pusher.ex b/lib/pleroma/workers/web_pusher_worker.ex similarity index 82% rename from lib/pleroma/workers/web_pusher.ex rename to lib/pleroma/workers/web_pusher_worker.ex index 7b78bb3ea..2b1d3b99a 100644 --- a/lib/pleroma/workers/web_pusher.ex +++ b/lib/pleroma/workers/web_pusher_worker.ex @@ -2,11 +2,11 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.WebPusher do +defmodule Pleroma.Workers.WebPusherWorker do alias Pleroma.Notification alias Pleroma.Repo - # Note: `max_attempts` is intended to be overridden in `new/1` call + # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "web_push", max_attempts: 1 diff --git a/lib/pleroma/workers/worker_helper.ex b/lib/pleroma/workers/worker_helper.ex new file mode 100644 index 000000000..f9ed2e64d --- /dev/null +++ b/lib/pleroma/workers/worker_helper.ex @@ -0,0 +1,23 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.WorkerHelper do + alias Pleroma.Config + + def worker_args(queue) do + case Config.get([:workers, :retries, queue]) do + nil -> [] + max_attempts -> [max_attempts: max_attempts] + end + end + + def sidekiq_backoff(attempt, pow \\ 4, base_backoff \\ 15) do + backoff = + :math.pow(attempt, pow) + + base_backoff + + :rand.uniform(2 * base_backoff) * attempt + + trunc(backoff) + end +end diff --git a/test/user_test.exs b/test/user_test.exs index 86232de99..0acd0db4e 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1123,7 +1123,7 @@ test "it deletes a user, all follow relationships and all activities", %{user: u "id" => "pleroma:fakeid" } }, - all_enqueued(worker: Pleroma.Workers.Publisher) + all_enqueued(worker: Pleroma.Workers.PublisherWorker) ) end end diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index a1b567a46..f1c1bb503 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -17,7 +17,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do alias Pleroma.Web.ActivityPub.UserView alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI - alias Pleroma.Workers.Receiver, as: ReceiverWorker + alias Pleroma.Workers.ReceiverWorker setup_all do Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index 5724672fd..4096d4690 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -7,7 +7,7 @@ defmodule Pleroma.Web.FederatorTest do alias Pleroma.Tests.ObanHelpers alias Pleroma.Web.CommonAPI alias Pleroma.Web.Federator - alias Pleroma.Workers.Publisher, as: PublisherWorker + alias Pleroma.Workers.PublisherWorker use Pleroma.DataCase use Oban.Testing, repo: Pleroma.Repo diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs index 414610879..929acf5a2 100644 --- a/test/web/websub/websub_test.exs +++ b/test/web/websub/websub_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Web.WebsubTest do alias Pleroma.Web.Websub alias Pleroma.Web.Websub.WebsubClientSubscription alias Pleroma.Web.Websub.WebsubServerSubscription - alias Pleroma.Workers.Subscriber, as: SubscriberWorker + alias Pleroma.Workers.SubscriberWorker import Pleroma.Factory import Tesla.Mock From dd017c65a4b86501c435f5cb01804300e6b7c6dd Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Sat, 31 Aug 2019 21:58:42 +0300 Subject: [PATCH 080/400] [#1149] Refactored Oban workers API (introduced `enqueue/3`). --- lib/pleroma/activity_expiration_worker.ex | 13 +++------ lib/pleroma/digest_email_worker.ex | 10 ++----- lib/pleroma/emails/mailer.ex | 7 +---- lib/pleroma/scheduled_activity_worker.ex | 10 +++---- lib/pleroma/user.ex | 28 +++++-------------- lib/pleroma/web/activity_pub/activity_pub.ex | 6 +--- .../mrf/mediaproxy_warming_policy.ex | 11 ++------ .../web/activity_pub/transmogrifier.ex | 6 +--- lib/pleroma/web/federator/federator.ex | 26 ++++------------- lib/pleroma/web/federator/publisher.ex | 9 +++--- lib/pleroma/web/oauth/token/clean_worker.ex | 7 +---- lib/pleroma/web/push/push.ex | 7 +---- .../workers/activity_expiration_worker.ex | 2 ++ lib/pleroma/workers/background_worker.ex | 2 ++ lib/pleroma/workers/digest_emails_worker.ex | 21 ++++++++++++++ lib/pleroma/workers/mailer_worker.ex | 10 ++----- lib/pleroma/workers/publisher_worker.ex | 2 ++ lib/pleroma/workers/receiver_worker.ex | 2 ++ .../workers/scheduled_activity_worker.ex | 2 ++ lib/pleroma/workers/subscriber_worker.ex | 2 ++ lib/pleroma/workers/transmogrifier_worker.ex | 2 ++ lib/pleroma/workers/web_pusher_worker.ex | 2 ++ lib/pleroma/workers/worker_helper.ex | 18 ++++++++++++ 23 files changed, 92 insertions(+), 113 deletions(-) create mode 100644 lib/pleroma/workers/digest_emails_worker.ex diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex index 7aba7eece..c0820c202 100644 --- a/lib/pleroma/activity_expiration_worker.ex +++ b/lib/pleroma/activity_expiration_worker.ex @@ -9,14 +9,11 @@ defmodule Pleroma.ActivityExpirationWorker do alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.CommonAPI - alias Pleroma.Workers.ActivityExpirationWorker require Logger use GenServer import Ecto.Query - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - @schedule_interval :timer.minutes(1) def start_link(_) do @@ -53,12 +50,10 @@ def perform(:execute, expiration_id) do def handle_info(:perform, state) do ActivityExpiration.due_expirations(@schedule_interval) |> Enum.each(fn expiration -> - %{ - "op" => "activity_expiration", - "activity_expiration_id" => expiration.id - } - |> ActivityExpirationWorker.new(worker_args(:activity_expiration)) - |> Repo.insert() + Pleroma.Workers.ActivityExpirationWorker.enqueue( + "activity_expiration", + %{"activity_expiration_id" => expiration.id} + ) end) schedule_next() diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/digest_email_worker.ex index 4ab2a4ef4..5be7cf26b 100644 --- a/lib/pleroma/digest_email_worker.ex +++ b/lib/pleroma/digest_email_worker.ex @@ -4,12 +4,10 @@ defmodule Pleroma.DigestEmailWorker do alias Pleroma.Repo - alias Pleroma.Workers.MailerWorker + alias Pleroma.Workers.DigestEmailsWorker import Ecto.Query - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def perform do config = Pleroma.Config.get([:email_notifications, :digest]) negative_interval = -Map.fetch!(config, :interval) @@ -23,11 +21,9 @@ def perform do where: u.last_digest_emailed_at < datetime_add(^now, ^negative_interval, "day"), select: u ) - |> Pleroma.Repo.all() + |> Repo.all() |> Enum.each(fn user -> - %{"op" => "digest_email", "user_id" => user.id} - |> MailerWorker.new([queue: "digest_emails"] ++ worker_args(:digest_emails)) - |> Repo.insert() + DigestEmailsWorker.enqueue("digest_email", %{"user_id" => user.id}) end) end diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex index 9cbe7313c..eb96f2e8b 100644 --- a/lib/pleroma/emails/mailer.ex +++ b/lib/pleroma/emails/mailer.ex @@ -9,7 +9,6 @@ defmodule Pleroma.Emails.Mailer do The module contains functions to delivery email using Swoosh.Mailer. """ - alias Pleroma.Repo alias Pleroma.Workers.MailerWorker alias Swoosh.DeliveryError @@ -19,8 +18,6 @@ defmodule Pleroma.Emails.Mailer do @spec enabled?() :: boolean() def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled]) - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - @doc "add email to queue" def deliver_async(email, config \\ []) do encoded_email = @@ -28,9 +25,7 @@ def deliver_async(email, config \\ []) do |> :erlang.term_to_binary() |> Base.encode64() - %{"op" => "email", "encoded_email" => encoded_email, "config" => config} - |> MailerWorker.new(worker_args(:mailer)) - |> Repo.insert() + MailerWorker.enqueue("email", %{"encoded_email" => encoded_email, "config" => config}) end @doc "callback to perform send email from queue" diff --git a/lib/pleroma/scheduled_activity_worker.ex b/lib/pleroma/scheduled_activity_worker.ex index 8bf534f42..c41a542de 100644 --- a/lib/pleroma/scheduled_activity_worker.ex +++ b/lib/pleroma/scheduled_activity_worker.ex @@ -8,7 +8,6 @@ defmodule Pleroma.ScheduledActivityWorker do """ alias Pleroma.Config - alias Pleroma.Repo alias Pleroma.ScheduledActivity alias Pleroma.User alias Pleroma.Web.CommonAPI @@ -18,8 +17,6 @@ defmodule Pleroma.ScheduledActivityWorker do @schedule_interval :timer.minutes(1) - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def start_link(_) do GenServer.start_link(__MODULE__, nil) end @@ -49,9 +46,10 @@ def perform(:execute, scheduled_activity_id) do def handle_info(:perform, state) do ScheduledActivity.due_activities(@schedule_interval) |> Enum.each(fn scheduled_activity -> - %{"op" => "execute", "activity_id" => scheduled_activity.id} - |> Pleroma.Workers.ScheduledActivityWorker.new(worker_args(:scheduled_activities)) - |> Repo.insert() + Pleroma.Workers.ScheduledActivityWorker.enqueue( + "execute", + %{"activity_id" => scheduled_activity.id} + ) end) schedule_next() diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index abfa063fb..2fe7e1748 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -41,8 +41,6 @@ defmodule Pleroma.User do @strict_local_nickname_regex ~r/^[a-zA-Z\d]+$/ @extended_local_nickname_regex ~r/^[a-zA-Z\d_-]+$/ - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - schema "users" do field(:bio, :string) field(:email, :string) @@ -623,9 +621,7 @@ def get_or_fetch_by_nickname(nickname) do @doc "Fetch some posts when the user has just been federated with" def fetch_initial_posts(user) do - %{"op" => "fetch_initial_posts", "user_id" => user.id} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("fetch_initial_posts", %{"user_id" => user.id}) end @spec get_followers_query(User.t(), pos_integer() | nil) :: Ecto.Query.t() @@ -1056,9 +1052,7 @@ def unblock_domain(user, domain) do end def deactivate_async(user, status \\ true) do - %{"op" => "deactivate_user", "user_id" => user.id, "status" => status} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("deactivate_user", %{"user_id" => user.id, "status" => status}) end def deactivate(%User{} = user, status \\ true) do @@ -1087,9 +1081,7 @@ def update_notification_settings(%User{} = user, settings \\ %{}) do end def delete(%User{} = user) do - %{"op" => "delete_user", "user_id" => user.id} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("delete_user", %{"user_id" => user.id}) end @spec perform(atom(), User.t()) :: {:ok, User.t()} @@ -1198,24 +1190,18 @@ def external_users(opts \\ []) do end def blocks_import(%User{} = blocker, blocked_identifiers) when is_list(blocked_identifiers) do - %{ - "op" => "blocks_import", + BackgroundWorker.enqueue("blocks_import", %{ "blocker_id" => blocker.id, "blocked_identifiers" => blocked_identifiers - } - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + }) end def follow_import(%User{} = follower, followed_identifiers) when is_list(followed_identifiers) do - %{ - "op" => "follow_import", + BackgroundWorker.enqueue("follow_import", %{ "follower_id" => follower.id, "followed_identifiers" => followed_identifiers - } - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + }) end def delete_user_activities(%User{ap_id: ap_id} = user) do diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 74c5eb91c..90b409606 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -26,8 +26,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do require Logger require Pleroma.Constants - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - # For Announce activities, we filter the recipients based on following status for any actors # that match actual users. See issue #164 for more information about why this is necessary. defp get_recipients(%{"type" => "Announce"} = data) do @@ -148,9 +146,7 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when activity end - %{"op" => "fetch_data_for_activity", "activity_id" => activity.id} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("fetch_data_for_activity", %{"activity_id" => activity.id}) Notification.create_notifications(activity) diff --git a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex index 178321558..26b8539fe 100644 --- a/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/mediaproxy_warming_policy.ex @@ -7,7 +7,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do @behaviour Pleroma.Web.ActivityPub.MRF alias Pleroma.HTTP - alias Pleroma.Repo alias Pleroma.Web.MediaProxy alias Pleroma.Workers.BackgroundWorker @@ -18,8 +17,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do recv_timeout: 10_000 ] - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def perform(:prefetch, url) do Logger.info("Prefetching #{inspect(url)}") @@ -34,9 +31,7 @@ def perform(:preload, %{"object" => %{"attachment" => attachments}} = _message) url |> Enum.each(fn %{"href" => href} -> - %{"op" => "media_proxy_prefetch", "url" => href} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("media_proxy_prefetch", %{"url" => href}) x -> Logger.debug("Unhandled attachment URL object #{inspect(x)}") @@ -52,9 +47,7 @@ def filter( %{"type" => "Create", "object" => %{"attachment" => attachments} = _object} = message ) when is_list(attachments) and length(attachments) > 0 do - %{"op" => "media_proxy_preload", "message" => message} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("media_proxy_preload", %{"message" => message}) {:ok, message} end diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 9437f9a16..f27455e8b 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -22,8 +22,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do require Logger require Pleroma.Constants - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - @doc """ Modifies an incoming AP object (mastodon format) to our internal format. """ @@ -1054,9 +1052,7 @@ def upgrade_user_from_ap_id(ap_id) do already_ap <- User.ap_enabled?(user), {:ok, user} <- user |> User.upgrade_changeset(data) |> User.update_and_set_cache() do unless already_ap do - %{"op" => "user_upgrade", "user_id" => user.id} - |> TransmogrifierWorker.new(worker_args(:transmogrifier)) - |> Repo.insert() + TransmogrifierWorker.enqueue("user_upgrade", %{"user_id" => user.id}) end {:ok, user} diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index 8f43066e3..1a2da014a 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -18,8 +18,6 @@ defmodule Pleroma.Web.Federator do require Logger - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def init do # To do: consider removing this call in favor of scheduled execution (`quantum`-based) refresh_subscriptions(schedule_in: 60) @@ -40,15 +38,11 @@ def allowed_incoming_reply_depth?(depth) do # Client API def incoming_doc(doc) do - %{"op" => "incoming_doc", "body" => doc} - |> ReceiverWorker.new(worker_args(:federator_incoming)) - |> Pleroma.Repo.insert() + ReceiverWorker.enqueue("incoming_doc", %{"body" => doc}) end def incoming_ap_doc(params) do - %{"op" => "incoming_ap_doc", "params" => params} - |> ReceiverWorker.new(worker_args(:federator_incoming)) - |> Pleroma.Repo.insert() + ReceiverWorker.enqueue("incoming_ap_doc", %{"params" => params}) end def publish(%{id: "pleroma:fakeid"} = activity) do @@ -56,27 +50,19 @@ def publish(%{id: "pleroma:fakeid"} = activity) do end def publish(activity) do - %{"op" => "publish", "activity_id" => activity.id} - |> PublisherWorker.new(worker_args(:federator_outgoing)) - |> Pleroma.Repo.insert() + PublisherWorker.enqueue("publish", %{"activity_id" => activity.id}) end def verify_websub(websub) do - %{"op" => "verify_websub", "websub_id" => websub.id} - |> SubscriberWorker.new(worker_args(:federator_outgoing)) - |> Pleroma.Repo.insert() + SubscriberWorker.enqueue("verify_websub", %{"websub_id" => websub.id}) end def request_subscription(websub) do - %{"op" => "request_subscription", "websub_id" => websub.id} - |> SubscriberWorker.new(worker_args(:federator_outgoing)) - |> Pleroma.Repo.insert() + SubscriberWorker.enqueue("request_subscription", %{"websub_id" => websub.id}) end def refresh_subscriptions(worker_args \\ []) do - %{"op" => "refresh_subscriptions"} - |> SubscriberWorker.new(worker_args ++ [max_attempts: 1] ++ worker_args(:federator_outgoing)) - |> Pleroma.Repo.insert() + SubscriberWorker.enqueue("refresh_subscriptions", %{}, worker_args ++ [max_attempts: 1]) end # Job Worker Callbacks diff --git a/lib/pleroma/web/federator/publisher.ex b/lib/pleroma/web/federator/publisher.ex index 42be109ab..937064638 100644 --- a/lib/pleroma/web/federator/publisher.ex +++ b/lib/pleroma/web/federator/publisher.ex @@ -31,11 +31,10 @@ defmodule Pleroma.Web.Federator.Publisher do """ @spec enqueue_one(module(), Map.t()) :: :ok def enqueue_one(module, %{} = params) do - worker_args = Pleroma.Workers.WorkerHelper.worker_args(:federator_outgoing) - - %{"op" => "publish_one", "module" => to_string(module), "params" => params} - |> PublisherWorker.new(worker_args) - |> Pleroma.Repo.insert() + PublisherWorker.enqueue( + "publish_one", + %{"module" => to_string(module), "params" => params} + ) end @doc """ diff --git a/lib/pleroma/web/oauth/token/clean_worker.ex b/lib/pleroma/web/oauth/token/clean_worker.ex index b150a68a7..eb94bf86f 100644 --- a/lib/pleroma/web/oauth/token/clean_worker.ex +++ b/lib/pleroma/web/oauth/token/clean_worker.ex @@ -16,12 +16,9 @@ defmodule Pleroma.Web.OAuth.Token.CleanWorker do @one_day ) - alias Pleroma.Repo alias Pleroma.Web.OAuth.Token alias Pleroma.Workers.BackgroundWorker - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def start_link(_), do: GenServer.start_link(__MODULE__, %{}) def init(_) do @@ -31,9 +28,7 @@ def init(_) do @doc false def handle_info(:perform, state) do - %{"op" => "clean_expired_tokens"} - |> BackgroundWorker.new(worker_args(:background)) - |> Repo.insert() + BackgroundWorker.enqueue("clean_expired_tokens", %{}) Process.send_after(self(), :perform, @interval) {:noreply, state} diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push/push.ex index 4973b529c..7ef1532ac 100644 --- a/lib/pleroma/web/push/push.ex +++ b/lib/pleroma/web/push/push.ex @@ -3,13 +3,10 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Push do - alias Pleroma.Repo alias Pleroma.Workers.WebPusherWorker require Logger - import Pleroma.Workers.WorkerHelper, only: [worker_args: 1] - def init do unless enabled() do Logger.warn(""" @@ -35,8 +32,6 @@ def enabled do end def send(notification) do - %{"op" => "web_push", "notification_id" => notification.id} - |> WebPusherWorker.new(worker_args(:web_push)) - |> Repo.insert() + WebPusherWorker.enqueue("web_push", %{"notification_id" => notification.id}) end end diff --git a/lib/pleroma/workers/activity_expiration_worker.ex b/lib/pleroma/workers/activity_expiration_worker.ex index 0b491eabb..60dd3feba 100644 --- a/lib/pleroma/workers/activity_expiration_worker.ex +++ b/lib/pleroma/workers/activity_expiration_worker.ex @@ -8,6 +8,8 @@ defmodule Pleroma.Workers.ActivityExpirationWorker do queue: "activity_expiration", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "activity_expiration" + @impl Oban.Worker def perform( %{ diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex index 7b5575a5f..b9aef3a92 100644 --- a/lib/pleroma/workers/background_worker.ex +++ b/lib/pleroma/workers/background_worker.ex @@ -13,6 +13,8 @@ defmodule Pleroma.Workers.BackgroundWorker do queue: "background", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "background" + @impl Oban.Worker def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do user = User.get_cached_by_id(user_id) diff --git a/lib/pleroma/workers/digest_emails_worker.ex b/lib/pleroma/workers/digest_emails_worker.ex new file mode 100644 index 000000000..ca073ce67 --- /dev/null +++ b/lib/pleroma/workers/digest_emails_worker.ex @@ -0,0 +1,21 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Workers.DigestEmailsWorker do + alias Pleroma.User + + # Note: `max_attempts` is intended to be overridden in `new/2` call + use Oban.Worker, + queue: "digest_emails", + max_attempts: 1 + + use Pleroma.Workers.WorkerHelper, queue: "digest_emails" + + @impl Oban.Worker + def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do + user_id + |> User.get_cached_by_id() + |> Pleroma.DigestEmailWorker.perform() + end +end diff --git a/lib/pleroma/workers/mailer_worker.ex b/lib/pleroma/workers/mailer_worker.ex index 4f73d61bc..a4bd54a6c 100644 --- a/lib/pleroma/workers/mailer_worker.ex +++ b/lib/pleroma/workers/mailer_worker.ex @@ -3,13 +3,13 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.MailerWorker do - alias Pleroma.User - # Note: `max_attempts` is intended to be overridden in `new/2` call use Oban.Worker, queue: "mailer", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "mailer" + @impl Oban.Worker def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}, _job) do encoded_email @@ -17,10 +17,4 @@ def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => con |> :erlang.binary_to_term() |> Pleroma.Emails.Mailer.deliver(config) end - - def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do - user_id - |> User.get_cached_by_id() - |> Pleroma.DigestEmailWorker.perform() - end end diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex index 5671d2a29..a3ac22635 100644 --- a/lib/pleroma/workers/publisher_worker.ex +++ b/lib/pleroma/workers/publisher_worker.ex @@ -11,6 +11,8 @@ defmodule Pleroma.Workers.PublisherWorker do queue: "federator_outgoing", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing" + def backoff(attempt) when is_integer(attempt) do Pleroma.Workers.WorkerHelper.sidekiq_backoff(attempt, 5) end diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex index cdce630f2..3cc415ce4 100644 --- a/lib/pleroma/workers/receiver_worker.ex +++ b/lib/pleroma/workers/receiver_worker.ex @@ -10,6 +10,8 @@ defmodule Pleroma.Workers.ReceiverWorker do queue: "federator_incoming", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "federator_incoming" + @impl Oban.Worker def perform(%{"op" => "incoming_doc", "body" => doc}, _job) do Federator.perform(:incoming_doc, doc) diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex index 4094411ae..936bb64d3 100644 --- a/lib/pleroma/workers/scheduled_activity_worker.ex +++ b/lib/pleroma/workers/scheduled_activity_worker.ex @@ -8,6 +8,8 @@ defmodule Pleroma.Workers.ScheduledActivityWorker do queue: "scheduled_activities", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "scheduled_activities" + @impl Oban.Worker def perform(%{"op" => "execute", "activity_id" => activity_id}, _job) do Pleroma.ScheduledActivityWorker.perform(:execute, activity_id) diff --git a/lib/pleroma/workers/subscriber_worker.ex b/lib/pleroma/workers/subscriber_worker.ex index 22d1dc956..4fb994554 100644 --- a/lib/pleroma/workers/subscriber_worker.ex +++ b/lib/pleroma/workers/subscriber_worker.ex @@ -12,6 +12,8 @@ defmodule Pleroma.Workers.SubscriberWorker do queue: "federator_outgoing", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing" + @impl Oban.Worker def perform(%{"op" => "refresh_subscriptions"}, _job) do Federator.perform(:refresh_subscriptions) diff --git a/lib/pleroma/workers/transmogrifier_worker.ex b/lib/pleroma/workers/transmogrifier_worker.ex index 6f5c1a2f2..6fecc2bf9 100644 --- a/lib/pleroma/workers/transmogrifier_worker.ex +++ b/lib/pleroma/workers/transmogrifier_worker.ex @@ -10,6 +10,8 @@ defmodule Pleroma.Workers.TransmogrifierWorker do queue: "transmogrifier", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "transmogrifier" + @impl Oban.Worker def perform(%{"op" => "user_upgrade", "user_id" => user_id}, _job) do user = User.get_cached_by_id(user_id) diff --git a/lib/pleroma/workers/web_pusher_worker.ex b/lib/pleroma/workers/web_pusher_worker.ex index 2b1d3b99a..4c2591a5c 100644 --- a/lib/pleroma/workers/web_pusher_worker.ex +++ b/lib/pleroma/workers/web_pusher_worker.ex @@ -11,6 +11,8 @@ defmodule Pleroma.Workers.WebPusherWorker do queue: "web_push", max_attempts: 1 + use Pleroma.Workers.WorkerHelper, queue: "web_push" + @impl Oban.Worker def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) do notification = Repo.get(Notification, notification_id) diff --git a/lib/pleroma/workers/worker_helper.ex b/lib/pleroma/workers/worker_helper.ex index f9ed2e64d..b12f198d4 100644 --- a/lib/pleroma/workers/worker_helper.ex +++ b/lib/pleroma/workers/worker_helper.ex @@ -4,6 +4,7 @@ defmodule Pleroma.Workers.WorkerHelper do alias Pleroma.Config + alias Pleroma.Workers.WorkerHelper def worker_args(queue) do case Config.get([:workers, :retries, queue]) do @@ -20,4 +21,21 @@ def sidekiq_backoff(attempt, pow \\ 4, base_backoff \\ 15) do trunc(backoff) end + + defmacro __using__(opts) do + caller_module = __CALLER__.module + queue = Keyword.fetch!(opts, :queue) + + quote do + def enqueue(op, params, worker_args \\ []) do + params = Map.merge(%{"op" => op}, params) + queue_atom = String.to_atom(unquote(queue)) + worker_args = worker_args ++ WorkerHelper.worker_args(queue_atom) + + unquote(caller_module) + |> apply(:new, [params, worker_args]) + |> Pleroma.Repo.insert() + end + end + end end From 9c96b17e16a4911d3e20149e1b54b12baaf71617 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sun, 1 Sep 2019 21:23:30 +0300 Subject: [PATCH 081/400] Add pagination to logs --- lib/pleroma/moderation_log.ex | 29 +++++++++++++------ .../admin_api/views/moderation_log_view.ex | 5 +++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index 89a5e13c3..352cad433 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -15,12 +15,18 @@ defmodule Pleroma.ModerationLog do end def get_all(params) do - params - |> get_all_query() - |> maybe_filter_by_date(params) - |> maybe_filter_by_user(params) - |> maybe_filter_by_search(params) - |> Repo.all() + base_query = + get_all_query() + |> maybe_filter_by_date(params) + |> maybe_filter_by_user(params) + |> maybe_filter_by_search(params) + + query_with_pagination = base_query |> paginate_query(params) + + %{ + items: Repo.all(query_with_pagination), + count: Repo.aggregate(base_query, :count, :id) + } end defp maybe_filter_by_date(query, %{start_date: nil, end_date: nil}), do: query @@ -61,14 +67,19 @@ defp maybe_filter_by_search(query, %{search: search}) do ) end - defp get_all_query(%{page: page, page_size: page_size}) do - from(q in __MODULE__, - order_by: [desc: q.inserted_at], + defp paginate_query(query, %{page: page, page_size: page_size}) do + from(q in query, limit: ^page_size, offset: ^((page - 1) * page_size) ) end + defp get_all_query do + from(q in __MODULE__, + order_by: [desc: q.inserted_at] + ) + end + defp parse_datetime(datetime) do {:ok, parsed_datetime, _} = DateTime.from_iso8601(datetime) diff --git a/lib/pleroma/web/admin_api/views/moderation_log_view.ex b/lib/pleroma/web/admin_api/views/moderation_log_view.ex index b3fc7cfe5..e7752d1f3 100644 --- a/lib/pleroma/web/admin_api/views/moderation_log_view.ex +++ b/lib/pleroma/web/admin_api/views/moderation_log_view.ex @@ -8,7 +8,10 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogView do alias Pleroma.ModerationLog def render("index.json", %{log: log}) do - render_many(log, __MODULE__, "show.json", as: :log_entry) + %{ + items: render_many(log.items, __MODULE__, "show.json", as: :log_entry), + total: log.count + } end def render("show.json", %{log_entry: log_entry}) do From c5ffbfb8d547199f2345e28f085dd12e8b443f21 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sun, 1 Sep 2019 21:25:55 +0300 Subject: [PATCH 082/400] Changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdcb014a..0d44944eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mix Tasks: `mix pleroma.database fix_likes_collections` - Federation: Remove `likes` from objects. - Admin API: Added moderation log +- Admin API: Added moderation log filters (user/start date/end date/search/pagination) ### Changed - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text From 6c2fd1b78bbbb4486a5dddeffa053199ba8cc015 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Sun, 1 Sep 2019 21:38:15 +0300 Subject: [PATCH 083/400] Fix tests --- .../admin_api/admin_api_controller_test.exs | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index eaf847b25..b87fffc34 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -2286,9 +2286,9 @@ test "returns the log", %{conn: conn, admin: admin} do conn = get(conn, "/api/pleroma/admin/moderation_log") response = json_response(conn, 200) - [first_entry, second_entry] = response + [first_entry, second_entry] = response["items"] - assert response |> length() == 2 + assert response["total"] == 2 assert first_entry["data"]["action"] == "relay_unfollow" assert first_entry["message"] == @@ -2330,9 +2330,10 @@ test "returns the log with pagination", %{conn: conn, admin: admin} do conn1 = get(conn, "/api/pleroma/admin/moderation_log?page_size=1&page=1") response1 = json_response(conn1, 200) - [first_entry] = response1 + [first_entry] = response1["items"] - assert response1 |> length() == 1 + assert response1["total"] == 2 + assert response1["items"] |> length() == 1 assert first_entry["data"]["action"] == "relay_unfollow" assert first_entry["message"] == @@ -2341,9 +2342,10 @@ test "returns the log with pagination", %{conn: conn, admin: admin} do conn2 = get(conn, "/api/pleroma/admin/moderation_log?page_size=1&page=2") response2 = json_response(conn2, 200) - [second_entry] = response2 + [second_entry] = response2["items"] - assert response2 |> length() == 1 + assert response2["total"] == 2 + assert response2["items"] |> length() == 1 assert second_entry["data"]["action"] == "relay_follow" assert second_entry["message"] == @@ -2387,9 +2389,9 @@ test "filters log by date", %{conn: conn, admin: admin} do ) response1 = json_response(conn1, 200) - [first_entry] = response1 + [first_entry] = response1["items"] - assert response1 |> length() == 1 + assert response1["total"] == 1 assert first_entry["data"]["action"] == "relay_unfollow" assert first_entry["message"] == @@ -2424,9 +2426,9 @@ test "returns log filtered by user", %{conn: conn, admin: admin, moderator: mode conn1 = get(conn, "/api/pleroma/admin/moderation_log?user_id=#{moderator.id}") response1 = json_response(conn1, 200) - [first_entry] = response1 + [first_entry] = response1["items"] - assert response1 |> length() == 1 + assert response1["total"] == 1 assert get_in(first_entry, ["data", "actor", "id"]) == moderator.id end @@ -2446,9 +2448,9 @@ test "returns log filtered by search", %{conn: conn, moderator: moderator} do conn1 = get(conn, "/api/pleroma/admin/moderation_log?search=unfo") response1 = json_response(conn1, 200) - [first_entry] = response1 + [first_entry] = response1["items"] - assert response1 |> length() == 1 + assert response1["total"] == 1 assert get_in(first_entry, ["data", "message"]) == "@#{moderator.nickname} unfollowed relay: https://example.org/relay" From 35ef470d000c53e21c6f867d53ca3a83260d93b8 Mon Sep 17 00:00:00 2001 From: Sadposter Date: Mon, 2 Sep 2019 12:15:21 +0100 Subject: [PATCH 084/400] truncate fields for remote users instead --- lib/pleroma/user/info.ex | 7 +++++++ test/user_test.exs | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 779bfbc18..0beb2f721 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -242,6 +242,7 @@ def set_keys(info, keys) do end def remote_user_creation(info, params) do + params = Map.put(params, "fields", Enum.map(params["fields"], &truncate_field/1)) info |> cast(params, [ :ap_enabled, @@ -326,6 +327,12 @@ defp valid_field?(%{"name" => name, "value" => value}) do defp valid_field?(_), do: false + defp truncate_field(%{"name" => name, "value" => value}) do + {name, _chopped} = String.split_at(name, Pleroma.Config.get([:instance, :account_field_name_length], 255)) + {value, _chopped} = String.split_at(value, Pleroma.Config.get([:instance, :account_field_value_length], 255)) + %{"name" => name, "value" => value} + end + @spec confirmation_changeset(Info.t(), keyword()) :: Changeset.t() def confirmation_changeset(info, opts) do need_confirmation? = Keyword.get(opts, :need_confirmation) diff --git a/test/user_test.exs b/test/user_test.exs index 2cbc1f525..68a469fe3 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1117,11 +1117,20 @@ test "get_public_key_for_ap_id fetches a user that's not in the db" do assert {:ok, _key} = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin") end - test "insert or update a user from given data" do - user = insert(:user, %{nickname: "nick@name.de"}) - data = %{ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname} + describe "insert or update a user from given data" do + test "with normal data" do + user = insert(:user, %{nickname: "nick@name.de"}) + data = %{ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname} - assert {:ok, %User{}} = User.insert_or_update_user(data) + assert {:ok, %User{}} = User.insert_or_update_user(data) + end + + test "with overly long fields" do + current_max_length = Pleroma.Config.get([:instance, :account_field_value_length], 255) + user = insert(:user, nickname: "nickname@supergood.domain") + data = %{ap_id: user.ap_id, info: %{ fields: [%{"name" => "myfield", "value" => String.duplicate("h", current_max_length + 1)}] }} + assert {:ok, %User{}} = User.insert_or_update_user(data) + end end describe "per-user rich-text filtering" do From 05c935c3961e4c1a20c7713611920318d45d4b57 Mon Sep 17 00:00:00 2001 From: Sadposter Date: Mon, 2 Sep 2019 12:15:40 +0100 Subject: [PATCH 085/400] mix format --- lib/pleroma/user/info.ex | 9 +++++++-- test/user_test.exs | 23 ++++++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index 0beb2f721..ca1282d02 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -243,6 +243,7 @@ def set_keys(info, keys) do def remote_user_creation(info, params) do params = Map.put(params, "fields", Enum.map(params["fields"], &truncate_field/1)) + info |> cast(params, [ :ap_enabled, @@ -328,8 +329,12 @@ defp valid_field?(%{"name" => name, "value" => value}) do defp valid_field?(_), do: false defp truncate_field(%{"name" => name, "value" => value}) do - {name, _chopped} = String.split_at(name, Pleroma.Config.get([:instance, :account_field_name_length], 255)) - {value, _chopped} = String.split_at(value, Pleroma.Config.get([:instance, :account_field_value_length], 255)) + {name, _chopped} = + String.split_at(name, Pleroma.Config.get([:instance, :account_field_name_length], 255)) + + {value, _chopped} = + String.split_at(value, Pleroma.Config.get([:instance, :account_field_value_length], 255)) + %{"name" => name, "value" => value} end diff --git a/test/user_test.exs b/test/user_test.exs index 68a469fe3..0ca310331 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1119,17 +1119,26 @@ test "get_public_key_for_ap_id fetches a user that's not in the db" do describe "insert or update a user from given data" do test "with normal data" do - user = insert(:user, %{nickname: "nick@name.de"}) - data = %{ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname} + user = insert(:user, %{nickname: "nick@name.de"}) + data = %{ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname} - assert {:ok, %User{}} = User.insert_or_update_user(data) + assert {:ok, %User{}} = User.insert_or_update_user(data) end test "with overly long fields" do - current_max_length = Pleroma.Config.get([:instance, :account_field_value_length], 255) - user = insert(:user, nickname: "nickname@supergood.domain") - data = %{ap_id: user.ap_id, info: %{ fields: [%{"name" => "myfield", "value" => String.duplicate("h", current_max_length + 1)}] }} - assert {:ok, %User{}} = User.insert_or_update_user(data) + current_max_length = Pleroma.Config.get([:instance, :account_field_value_length], 255) + user = insert(:user, nickname: "nickname@supergood.domain") + + data = %{ + ap_id: user.ap_id, + info: %{ + fields: [ + %{"name" => "myfield", "value" => String.duplicate("h", current_max_length + 1)} + ] + } + } + + assert {:ok, %User{}} = User.insert_or_update_user(data) end end From d0f07e55d28d25684130cb1090d0bdbb48807548 Mon Sep 17 00:00:00 2001 From: Sadposter Date: Mon, 2 Sep 2019 12:31:23 +0100 Subject: [PATCH 086/400] use atom key for fields --- lib/pleroma/user/info.ex | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index ca1282d02..151e025de 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -242,7 +242,12 @@ def set_keys(info, keys) do end def remote_user_creation(info, params) do - params = Map.put(params, "fields", Enum.map(params["fields"], &truncate_field/1)) + params = + if Map.has_key?(params, :fields) do + Map.put(params, :fields, Enum.map(params[:fields], &truncate_field/1)) + else + params + end info |> cast(params, [ From e73685834c1797404c943f66417ffa30add87e04 Mon Sep 17 00:00:00 2001 From: Sadposter Date: Mon, 2 Sep 2019 12:35:55 +0100 Subject: [PATCH 087/400] add mandatory fields for user update --- test/user_test.exs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/user_test.exs b/test/user_test.exs index 0ca310331..92a48f630 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1131,6 +1131,8 @@ test "with overly long fields" do data = %{ ap_id: user.ap_id, + name: user.name, + nickname: user.nickname, info: %{ fields: [ %{"name" => "myfield", "value" => String.duplicate("h", current_max_length + 1)} From b49085c156a6a4449c95c2c315f6250317122735 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Mon, 2 Sep 2019 14:57:40 +0300 Subject: [PATCH 088/400] [#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper. --- config/config.exs | 2 +- lib/pleroma/application.ex | 4 ++-- .../activity_expiration_daemon.ex} | 2 +- .../digest_email_daemon.ex} | 2 +- .../scheduled_activity_daemon.ex} | 2 +- lib/pleroma/workers/activity_expiration_worker.ex | 7 +------ lib/pleroma/workers/background_worker.ex | 5 ----- lib/pleroma/workers/digest_emails_worker.ex | 7 +------ lib/pleroma/workers/mailer_worker.ex | 5 ----- lib/pleroma/workers/publisher_worker.ex | 5 ----- lib/pleroma/workers/receiver_worker.ex | 5 ----- lib/pleroma/workers/scheduled_activity_worker.ex | 7 +------ lib/pleroma/workers/subscriber_worker.ex | 5 ----- lib/pleroma/workers/transmogrifier_worker.ex | 5 ----- lib/pleroma/workers/web_pusher_worker.ex | 5 ----- lib/pleroma/workers/worker_helper.ex | 5 +++++ .../activity_expiration_daemon_test.exs} | 2 +- .../digest_email_daemon_test.exs} | 6 +++--- .../scheduled_activity_daemon_test.exs} | 4 ++-- 19 files changed, 20 insertions(+), 65 deletions(-) rename lib/pleroma/{activity_expiration_worker.ex => daemons/activity_expiration_daemon.ex} (96%) rename lib/pleroma/{digest_email_worker.ex => daemons/digest_email_daemon.ex} (96%) rename lib/pleroma/{scheduled_activity_worker.ex => daemons/scheduled_activity_daemon.ex} (96%) rename test/{activity_expiration_worker_test.exs => daemons/activity_expiration_daemon_test.exs} (86%) rename test/{web/digest_email_worker_test.exs => daemons/digest_email_daemon_test.exs} (88%) rename test/{scheduled_activity_worker_test.exs => daemons/scheduled_activity_daemon_test.exs} (82%) diff --git a/config/config.exs b/config/config.exs index 6fb4a0969..b742a650d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -54,7 +54,7 @@ scheduled_jobs = with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest], true <- digest_config[:active] do - [{digest_config[:schedule], {Pleroma.DigestEmailWorker, :perform, []}}] + [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}] else _ -> [] end diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index f8f866dbd..0c27027a0 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -36,8 +36,8 @@ def start(_type, _args) do Pleroma.Emoji, Pleroma.Captcha, Pleroma.FlakeId, - Pleroma.ScheduledActivityWorker, - Pleroma.ActivityExpirationWorker + Pleroma.Daemons.ScheduledActivityDaemon, + Pleroma.Daemons.ActivityExpirationDaemon ] ++ cachex_children() ++ hackney_pool_children() ++ diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/daemons/activity_expiration_daemon.ex similarity index 96% rename from lib/pleroma/activity_expiration_worker.ex rename to lib/pleroma/daemons/activity_expiration_daemon.ex index c0820c202..cab7628c4 100644 --- a/lib/pleroma/activity_expiration_worker.ex +++ b/lib/pleroma/daemons/activity_expiration_daemon.ex @@ -2,7 +2,7 @@ # Copyright © 2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.ActivityExpirationWorker do +defmodule Pleroma.Daemons.ActivityExpirationDaemon do alias Pleroma.Activity alias Pleroma.ActivityExpiration alias Pleroma.Config diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/daemons/digest_email_daemon.ex similarity index 96% rename from lib/pleroma/digest_email_worker.ex rename to lib/pleroma/daemons/digest_email_daemon.ex index 5be7cf26b..462ad2c55 100644 --- a/lib/pleroma/digest_email_worker.ex +++ b/lib/pleroma/daemons/digest_email_daemon.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.DigestEmailWorker do +defmodule Pleroma.Daemons.DigestEmailDaemon do alias Pleroma.Repo alias Pleroma.Workers.DigestEmailsWorker diff --git a/lib/pleroma/scheduled_activity_worker.ex b/lib/pleroma/daemons/scheduled_activity_daemon.ex similarity index 96% rename from lib/pleroma/scheduled_activity_worker.ex rename to lib/pleroma/daemons/scheduled_activity_daemon.ex index c41a542de..aee5f723a 100644 --- a/lib/pleroma/scheduled_activity_worker.ex +++ b/lib/pleroma/daemons/scheduled_activity_daemon.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.ScheduledActivityWorker do +defmodule Pleroma.Daemons.ScheduledActivityDaemon do @moduledoc """ Sends scheduled activities to the job queue. """ diff --git a/lib/pleroma/workers/activity_expiration_worker.ex b/lib/pleroma/workers/activity_expiration_worker.ex index 60dd3feba..4e3e4195f 100644 --- a/lib/pleroma/workers/activity_expiration_worker.ex +++ b/lib/pleroma/workers/activity_expiration_worker.ex @@ -3,11 +3,6 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.ActivityExpirationWorker do - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "activity_expiration", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "activity_expiration" @impl Oban.Worker @@ -18,6 +13,6 @@ def perform( }, _job ) do - Pleroma.ActivityExpirationWorker.perform(:execute, activity_expiration_id) + Pleroma.Daemons.ActivityExpirationDaemon.perform(:execute, activity_expiration_id) end end diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex index b9aef3a92..082f20ab7 100644 --- a/lib/pleroma/workers/background_worker.ex +++ b/lib/pleroma/workers/background_worker.ex @@ -8,11 +8,6 @@ defmodule Pleroma.Workers.BackgroundWorker do alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy alias Pleroma.Web.OAuth.Token.CleanWorker - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "background", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "background" @impl Oban.Worker diff --git a/lib/pleroma/workers/digest_emails_worker.ex b/lib/pleroma/workers/digest_emails_worker.ex index ca073ce67..3e5a836d0 100644 --- a/lib/pleroma/workers/digest_emails_worker.ex +++ b/lib/pleroma/workers/digest_emails_worker.ex @@ -5,17 +5,12 @@ defmodule Pleroma.Workers.DigestEmailsWorker do alias Pleroma.User - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "digest_emails", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "digest_emails" @impl Oban.Worker def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do user_id |> User.get_cached_by_id() - |> Pleroma.DigestEmailWorker.perform() + |> Pleroma.Daemons.DigestEmailDaemon.perform() end end diff --git a/lib/pleroma/workers/mailer_worker.ex b/lib/pleroma/workers/mailer_worker.ex index a4bd54a6c..1b7a0eb3e 100644 --- a/lib/pleroma/workers/mailer_worker.ex +++ b/lib/pleroma/workers/mailer_worker.ex @@ -3,11 +3,6 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.MailerWorker do - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "mailer", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "mailer" @impl Oban.Worker diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex index a3ac22635..455f7fc7e 100644 --- a/lib/pleroma/workers/publisher_worker.ex +++ b/lib/pleroma/workers/publisher_worker.ex @@ -6,11 +6,6 @@ defmodule Pleroma.Workers.PublisherWorker do alias Pleroma.Activity alias Pleroma.Web.Federator - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "federator_outgoing", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing" def backoff(attempt) when is_integer(attempt) do diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex index 3cc415ce4..83d528a66 100644 --- a/lib/pleroma/workers/receiver_worker.ex +++ b/lib/pleroma/workers/receiver_worker.ex @@ -5,11 +5,6 @@ defmodule Pleroma.Workers.ReceiverWorker do alias Pleroma.Web.Federator - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "federator_incoming", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "federator_incoming" @impl Oban.Worker diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex index 936bb64d3..ca7d53af1 100644 --- a/lib/pleroma/workers/scheduled_activity_worker.ex +++ b/lib/pleroma/workers/scheduled_activity_worker.ex @@ -3,15 +3,10 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.ScheduledActivityWorker do - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "scheduled_activities", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "scheduled_activities" @impl Oban.Worker def perform(%{"op" => "execute", "activity_id" => activity_id}, _job) do - Pleroma.ScheduledActivityWorker.perform(:execute, activity_id) + Pleroma.Daemons.ScheduledActivityDaemon.perform(:execute, activity_id) end end diff --git a/lib/pleroma/workers/subscriber_worker.ex b/lib/pleroma/workers/subscriber_worker.ex index 4fb994554..fc490e300 100644 --- a/lib/pleroma/workers/subscriber_worker.ex +++ b/lib/pleroma/workers/subscriber_worker.ex @@ -7,11 +7,6 @@ defmodule Pleroma.Workers.SubscriberWorker do alias Pleroma.Web.Federator alias Pleroma.Web.Websub - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "federator_outgoing", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing" @impl Oban.Worker diff --git a/lib/pleroma/workers/transmogrifier_worker.ex b/lib/pleroma/workers/transmogrifier_worker.ex index 6fecc2bf9..b581a2f86 100644 --- a/lib/pleroma/workers/transmogrifier_worker.ex +++ b/lib/pleroma/workers/transmogrifier_worker.ex @@ -5,11 +5,6 @@ defmodule Pleroma.Workers.TransmogrifierWorker do alias Pleroma.User - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "transmogrifier", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "transmogrifier" @impl Oban.Worker diff --git a/lib/pleroma/workers/web_pusher_worker.ex b/lib/pleroma/workers/web_pusher_worker.ex index 4c2591a5c..bea2baffb 100644 --- a/lib/pleroma/workers/web_pusher_worker.ex +++ b/lib/pleroma/workers/web_pusher_worker.ex @@ -6,11 +6,6 @@ defmodule Pleroma.Workers.WebPusherWorker do alias Pleroma.Notification alias Pleroma.Repo - # Note: `max_attempts` is intended to be overridden in `new/2` call - use Oban.Worker, - queue: "web_push", - max_attempts: 1 - use Pleroma.Workers.WorkerHelper, queue: "web_push" @impl Oban.Worker diff --git a/lib/pleroma/workers/worker_helper.ex b/lib/pleroma/workers/worker_helper.ex index b12f198d4..358efa14a 100644 --- a/lib/pleroma/workers/worker_helper.ex +++ b/lib/pleroma/workers/worker_helper.ex @@ -27,6 +27,11 @@ defmacro __using__(opts) do queue = Keyword.fetch!(opts, :queue) quote do + # Note: `max_attempts` is intended to be overridden in `new/2` call + use Oban.Worker, + queue: unquote(queue), + max_attempts: 1 + def enqueue(op, params, worker_args \\ []) do params = Map.merge(%{"op" => op}, params) queue_atom = String.to_atom(unquote(queue)) diff --git a/test/activity_expiration_worker_test.exs b/test/daemons/activity_expiration_daemon_test.exs similarity index 86% rename from test/activity_expiration_worker_test.exs rename to test/daemons/activity_expiration_daemon_test.exs index 939d912f1..31f4a70a6 100644 --- a/test/activity_expiration_worker_test.exs +++ b/test/daemons/activity_expiration_daemon_test.exs @@ -10,7 +10,7 @@ defmodule Pleroma.ActivityExpirationWorkerTest do test "deletes an activity" do activity = insert(:note_activity) expiration = insert(:expiration_in_the_past, %{activity_id: activity.id}) - Pleroma.ActivityExpirationWorker.perform(:execute, expiration.id) + Pleroma.Daemons.ActivityExpirationDaemon.perform(:execute, expiration.id) refute Repo.get(Activity, activity.id) end diff --git a/test/web/digest_email_worker_test.exs b/test/daemons/digest_email_daemon_test.exs similarity index 88% rename from test/web/digest_email_worker_test.exs rename to test/daemons/digest_email_daemon_test.exs index 5dfd920fa..3168f3b9a 100644 --- a/test/web/digest_email_worker_test.exs +++ b/test/daemons/digest_email_daemon_test.exs @@ -2,11 +2,11 @@ # Copyright © 2017-2019 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.DigestEmailWorkerTest do +defmodule Pleroma.DigestEmailDaemonTest do use Pleroma.DataCase import Pleroma.Factory - alias Pleroma.DigestEmailWorker + alias Pleroma.Daemons.DigestEmailDaemon alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.Web.CommonAPI @@ -23,7 +23,7 @@ test "it sends digest emails" do User.switch_email_notifications(user2, "digest", true) CommonAPI.post(user, %{"status" => "hey @#{user2.nickname}!"}) - DigestEmailWorker.perform() + DigestEmailDaemon.perform() ObanHelpers.perform_all() # Performing job(s) enqueued at previous step ObanHelpers.perform_all() diff --git a/test/scheduled_activity_worker_test.exs b/test/daemons/scheduled_activity_daemon_test.exs similarity index 82% rename from test/scheduled_activity_worker_test.exs rename to test/daemons/scheduled_activity_daemon_test.exs index e3ad1244e..32820b2b7 100644 --- a/test/scheduled_activity_worker_test.exs +++ b/test/daemons/scheduled_activity_daemon_test.exs @@ -2,7 +2,7 @@ # Copyright © 2017-2018 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.ScheduledActivityWorkerTest do +defmodule Pleroma.ScheduledActivityDaemonTest do use Pleroma.DataCase alias Pleroma.ScheduledActivity import Pleroma.Factory @@ -10,7 +10,7 @@ defmodule Pleroma.ScheduledActivityWorkerTest do test "creates a status from the scheduled activity" do user = insert(:user) scheduled_activity = insert(:scheduled_activity, user: user, params: %{status: "hi"}) - Pleroma.ScheduledActivityWorker.perform(:execute, scheduled_activity.id) + Pleroma.Daemons.ScheduledActivityDaemon.perform(:execute, scheduled_activity.id) refute Repo.get(ScheduledActivity, scheduled_activity.id) activity = Repo.all(Pleroma.Activity) |> Enum.find(&(&1.actor == user.ap_id)) From a4c5f71e933c905433b80c90bcd626e7da703669 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 2 Sep 2019 22:48:52 +0300 Subject: [PATCH 089/400] Return total from pagination + tests --- CHANGELOG.md | 1 + lib/pleroma/activity/search.ex | 1 + lib/pleroma/conversation/participation.ex | 1 + lib/pleroma/notification.ex | 1 + lib/pleroma/pagination.ex | 24 ++++-- lib/pleroma/user/search.ex | 1 + lib/pleroma/web/activity_pub/activity_pub.ex | 3 + .../controllers/mastodon_api_controller.ex | 2 + lib/pleroma/web/mastodon_api/mastodon_api.ex | 4 + test/pagination_test.exs | 78 +++++++++++++++++++ 10 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 test/pagination_test.exs diff --git a/CHANGELOG.md b/CHANGELOG.md index 4acb749ac..06ad303de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template +– Pagination: return `total` alongside with `items` when paginating ### Fixed - Following from Osada diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex index f847ac238..f7156c81c 100644 --- a/lib/pleroma/activity/search.ex +++ b/lib/pleroma/activity/search.ex @@ -27,6 +27,7 @@ def search(user, search_query, options \\ []) do |> maybe_restrict_local(user) |> maybe_restrict_author(author) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset) + |> Map.get(:items) |> maybe_fetch(user, search_query) end diff --git a/lib/pleroma/conversation/participation.ex b/lib/pleroma/conversation/participation.ex index ea5b9fe17..5fd8d3d41 100644 --- a/lib/pleroma/conversation/participation.ex +++ b/lib/pleroma/conversation/participation.ex @@ -67,6 +67,7 @@ def for_user(user, params \\ %{}) do preload: [conversation: [:users]] ) |> Pleroma.Pagination.fetch_paginated(params) + |> Map.get(:items) end def for_user_and_conversation(user, conversation) do diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 5d29af853..3e4ddd2ba 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -75,6 +75,7 @@ def for_user(user, opts \\ %{}) do user |> for_user_query(opts) |> Pagination.fetch_paginated(opts) + |> Map.get(:items) end @doc """ diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex index 2b869ccdc..d21ecf628 100644 --- a/lib/pleroma/pagination.ex +++ b/lib/pleroma/pagination.ex @@ -18,19 +18,29 @@ def fetch_paginated(query, params, type \\ :keyset) def fetch_paginated(query, params, :keyset) do options = cast_params(params) + total = Repo.aggregate(query, :count, :id) - query - |> paginate(options, :keyset) - |> Repo.all() - |> enforce_order(options) + %{ + total: total, + items: + query + |> paginate(options, :keyset) + |> Repo.all() + |> enforce_order(options) + } end def fetch_paginated(query, params, :offset) do options = cast_params(params) + total = Repo.aggregate(query, :count, :id) - query - |> paginate(options, :offset) - |> Repo.all() + %{ + total: total, + items: + query + |> paginate(options, :offset) + |> Repo.all() + } end def paginate(query, options, method \\ :keyset) diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex index 6fb2c2352..bc05639b5 100644 --- a/lib/pleroma/user/search.ex +++ b/lib/pleroma/user/search.ex @@ -34,6 +34,7 @@ def search(query_string, opts \\ []) do query_string |> search_query(for_user, following) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => result_limit}, :offset) + |> Map.get(:items) end) results diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index eeb826814..8f07638cd 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -556,6 +556,7 @@ def fetch_public_activities(opts \\ %{}) do q |> restrict_unlisted() |> Pagination.fetch_paginated(opts) + |> Map.get(:items) |> Enum.reverse() end @@ -953,6 +954,7 @@ def fetch_activities(recipients, opts \\ %{}) do fetch_activities_query(recipients ++ list_memberships, opts) |> Pagination.fetch_paginated(opts) + |> Map.get(:items) |> Enum.reverse() |> maybe_update_cc(list_memberships, opts["user"]) end @@ -987,6 +989,7 @@ def fetch_activities_bounded(recipients, recipients_with_public, opts \\ %{}) do fetch_activities_query([], opts) |> fetch_activities_bounded_query(recipients, recipients_with_public) |> Pagination.fetch_paginated(opts) + |> Map.get(:items) |> Enum.reverse() end diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 83e877c0e..d532ba685 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -420,6 +420,7 @@ def dm_timeline(%{assigns: %{user: user}} = conn, params) do [user.ap_id] |> ActivityPub.fetch_activities_query(params) |> Pagination.fetch_paginated(params) + |> Map.get(:items) conn |> add_link_headers(:dm_timeline, activities) @@ -1194,6 +1195,7 @@ def bookmarks(%{assigns: %{user: user}} = conn, params) do bookmarks = Bookmark.for_user_query(user.id) |> Pagination.fetch_paginated(params) + |> Map.get(:items) activities = bookmarks diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex index ac01d1ff3..cf3962944 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex @@ -45,12 +45,14 @@ def get_followers(user, params \\ %{}) do user |> User.get_followers_query() |> Pagination.fetch_paginated(params) + |> Map.get(:items) end def get_friends(user, params \\ %{}) do user |> User.get_friends_query() |> Pagination.fetch_paginated(params) + |> Map.get(:items) end def get_notifications(user, params \\ %{}) do @@ -60,12 +62,14 @@ def get_notifications(user, params \\ %{}) do |> Notification.for_user_query(options) |> restrict(:exclude_types, options) |> Pagination.fetch_paginated(params) + |> Map.get(:items) end def get_scheduled_activities(user, params \\ %{}) do user |> ScheduledActivity.for_user_query() |> Pagination.fetch_paginated(params) + |> Map.get(:items) end defp cast_params(params) do diff --git a/test/pagination_test.exs b/test/pagination_test.exs new file mode 100644 index 000000000..048ab6f3c --- /dev/null +++ b/test/pagination_test.exs @@ -0,0 +1,78 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.PaginationTest do + use Pleroma.DataCase + + import Pleroma.Factory + + alias Pleroma.Object + alias Pleroma.Pagination + + describe "keyset" do + setup do + notes = insert_list(5, :note) + + %{notes: notes} + end + + test "paginates by min_id", %{notes: notes} do + id = Enum.at(notes, 2).id |> Integer.to_string() + %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"min_id" => id}) + + assert length(paginated) == 2 + assert total == 5 + end + + test "paginates by since_id", %{notes: notes} do + id = Enum.at(notes, 2).id |> Integer.to_string() + %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"since_id" => id}) + + assert length(paginated) == 2 + assert total == 5 + end + + test "paginates by max_id", %{notes: notes} do + id = Enum.at(notes, 1).id |> Integer.to_string() + %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"max_id" => id}) + + assert length(paginated) == 1 + assert total == 5 + end + + test "paginates by min_id & limit", %{notes: notes} do + id = Enum.at(notes, 2).id |> Integer.to_string() + + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1}) + + assert length(paginated) == 1 + assert total == 5 + end + end + + describe "offset" do + setup do + notes = insert_list(5, :note) + + %{notes: notes} + end + + test "paginates by limit" do + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset) + + assert length(paginated) == 2 + assert total == 5 + end + + test "paginates by limit & offset" do + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset) + + assert length(paginated) == 1 + assert total == 5 + end + end +end From b15cfd80ef5d5bc971f78a53dfa3d37dec4499a5 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Tue, 3 Sep 2019 13:58:27 +0300 Subject: [PATCH 090/400] Return "total" optionally --- CHANGELOG.md | 2 +- lib/pleroma/activity/search.ex | 1 - lib/pleroma/conversation/participation.ex | 1 - lib/pleroma/notification.ex | 1 - lib/pleroma/pagination.ex | 38 +++++++++++-------- lib/pleroma/user/search.ex | 1 - lib/pleroma/web/activity_pub/activity_pub.ex | 3 -- .../controllers/mastodon_api_controller.ex | 2 - lib/pleroma/web/mastodon_api/mastodon_api.ex | 4 -- test/pagination_test.exs | 24 ++++++------ 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ad303de..8264688d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template -– Pagination: return `total` alongside with `items` when paginating +– Pagination: (optional) return `total` alongside with `items` when paginating ### Fixed - Following from Osada diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex index f7156c81c..f847ac238 100644 --- a/lib/pleroma/activity/search.ex +++ b/lib/pleroma/activity/search.ex @@ -27,7 +27,6 @@ def search(user, search_query, options \\ []) do |> maybe_restrict_local(user) |> maybe_restrict_author(author) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset) - |> Map.get(:items) |> maybe_fetch(user, search_query) end diff --git a/lib/pleroma/conversation/participation.ex b/lib/pleroma/conversation/participation.ex index 5fd8d3d41..ea5b9fe17 100644 --- a/lib/pleroma/conversation/participation.ex +++ b/lib/pleroma/conversation/participation.ex @@ -67,7 +67,6 @@ def for_user(user, params \\ %{}) do preload: [conversation: [:users]] ) |> Pleroma.Pagination.fetch_paginated(params) - |> Map.get(:items) end def for_user_and_conversation(user, conversation) do diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 3e4ddd2ba..5d29af853 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -75,7 +75,6 @@ def for_user(user, opts \\ %{}) do user |> for_user_query(opts) |> Pagination.fetch_paginated(opts) - |> Map.get(:items) end @doc """ diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex index d21ecf628..b55379c4a 100644 --- a/lib/pleroma/pagination.ex +++ b/lib/pleroma/pagination.ex @@ -16,31 +16,39 @@ defmodule Pleroma.Pagination do def fetch_paginated(query, params, type \\ :keyset) - def fetch_paginated(query, params, :keyset) do - options = cast_params(params) + def fetch_paginated(query, %{"total" => true} = params, :keyset) do total = Repo.aggregate(query, :count, :id) %{ total: total, - items: - query - |> paginate(options, :keyset) - |> Repo.all() - |> enforce_order(options) + items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset) + } + end + + def fetch_paginated(query, params, :keyset) do + options = cast_params(params) + + query + |> paginate(options, :keyset) + |> Repo.all() + |> enforce_order(options) + end + + def fetch_paginated(query, %{"total" => true} = params, :offset) do + total = Repo.aggregate(query, :count, :id) + + %{ + total: total, + items: fetch_paginated(query, Map.drop(params, ["total"]), :offset) } end def fetch_paginated(query, params, :offset) do options = cast_params(params) - total = Repo.aggregate(query, :count, :id) - %{ - total: total, - items: - query - |> paginate(options, :offset) - |> Repo.all() - } + query + |> paginate(options, :offset) + |> Repo.all() end def paginate(query, options, method \\ :keyset) diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex index bc05639b5..6fb2c2352 100644 --- a/lib/pleroma/user/search.ex +++ b/lib/pleroma/user/search.ex @@ -34,7 +34,6 @@ def search(query_string, opts \\ []) do query_string |> search_query(for_user, following) |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => result_limit}, :offset) - |> Map.get(:items) end) results diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 8f07638cd..eeb826814 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -556,7 +556,6 @@ def fetch_public_activities(opts \\ %{}) do q |> restrict_unlisted() |> Pagination.fetch_paginated(opts) - |> Map.get(:items) |> Enum.reverse() end @@ -954,7 +953,6 @@ def fetch_activities(recipients, opts \\ %{}) do fetch_activities_query(recipients ++ list_memberships, opts) |> Pagination.fetch_paginated(opts) - |> Map.get(:items) |> Enum.reverse() |> maybe_update_cc(list_memberships, opts["user"]) end @@ -989,7 +987,6 @@ def fetch_activities_bounded(recipients, recipients_with_public, opts \\ %{}) do fetch_activities_query([], opts) |> fetch_activities_bounded_query(recipients, recipients_with_public) |> Pagination.fetch_paginated(opts) - |> Map.get(:items) |> Enum.reverse() end diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index d532ba685..83e877c0e 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -420,7 +420,6 @@ def dm_timeline(%{assigns: %{user: user}} = conn, params) do [user.ap_id] |> ActivityPub.fetch_activities_query(params) |> Pagination.fetch_paginated(params) - |> Map.get(:items) conn |> add_link_headers(:dm_timeline, activities) @@ -1195,7 +1194,6 @@ def bookmarks(%{assigns: %{user: user}} = conn, params) do bookmarks = Bookmark.for_user_query(user.id) |> Pagination.fetch_paginated(params) - |> Map.get(:items) activities = bookmarks diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex index cf3962944..ac01d1ff3 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex @@ -45,14 +45,12 @@ def get_followers(user, params \\ %{}) do user |> User.get_followers_query() |> Pagination.fetch_paginated(params) - |> Map.get(:items) end def get_friends(user, params \\ %{}) do user |> User.get_friends_query() |> Pagination.fetch_paginated(params) - |> Map.get(:items) end def get_notifications(user, params \\ %{}) do @@ -62,14 +60,12 @@ def get_notifications(user, params \\ %{}) do |> Notification.for_user_query(options) |> restrict(:exclude_types, options) |> Pagination.fetch_paginated(params) - |> Map.get(:items) end def get_scheduled_activities(user, params \\ %{}) do user |> ScheduledActivity.for_user_query() |> Pagination.fetch_paginated(params) - |> Map.get(:items) end defp cast_params(params) do diff --git a/test/pagination_test.exs b/test/pagination_test.exs index 048ab6f3c..c0fbe7933 100644 --- a/test/pagination_test.exs +++ b/test/pagination_test.exs @@ -19,7 +19,9 @@ defmodule Pleroma.PaginationTest do test "paginates by min_id", %{notes: notes} do id = Enum.at(notes, 2).id |> Integer.to_string() - %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"min_id" => id}) + + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"min_id" => id, "total" => true}) assert length(paginated) == 2 assert total == 5 @@ -27,7 +29,9 @@ test "paginates by min_id", %{notes: notes} do test "paginates by since_id", %{notes: notes} do id = Enum.at(notes, 2).id |> Integer.to_string() - %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"since_id" => id}) + + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"since_id" => id, "total" => true}) assert length(paginated) == 2 assert total == 5 @@ -35,7 +39,9 @@ test "paginates by since_id", %{notes: notes} do test "paginates by max_id", %{notes: notes} do id = Enum.at(notes, 1).id |> Integer.to_string() - %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"max_id" => id}) + + %{total: total, items: paginated} = + Pagination.fetch_paginated(Object, %{"max_id" => id, "total" => true}) assert length(paginated) == 1 assert total == 5 @@ -44,11 +50,9 @@ test "paginates by max_id", %{notes: notes} do test "paginates by min_id & limit", %{notes: notes} do id = Enum.at(notes, 2).id |> Integer.to_string() - %{total: total, items: paginated} = - Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1}) + paginated = Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1}) assert length(paginated) == 1 - assert total == 5 end end @@ -60,19 +64,15 @@ test "paginates by min_id & limit", %{notes: notes} do end test "paginates by limit" do - %{total: total, items: paginated} = - Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset) + paginated = Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset) assert length(paginated) == 2 - assert total == 5 end test "paginates by limit & offset" do - %{total: total, items: paginated} = - Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset) + paginated = Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset) assert length(paginated) == 1 - assert total == 5 end end end From bd8b92ea5e1bb6a97b02e2335fbcaf389ded2c1e Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Mon, 5 Aug 2019 15:35:34 -0400 Subject: [PATCH 091/400] Remove dynamic config as default, add healthcheck --- config/docker.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/docker.exs b/config/docker.exs index 63ab4cdee..f9f27d141 100644 --- a/config/docker.exs +++ b/config/docker.exs @@ -10,7 +10,7 @@ notify_email: System.get_env("NOTIFY_EMAIL"), limit: 5000, registrations_open: false, - dynamic_configuration: true + healthcheck: true config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, From 4b422b54699ac55a1bc32d2b42c0d55d0b68b4fb Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Tue, 3 Sep 2019 11:44:57 -0400 Subject: [PATCH 092/400] Switch to official elixir:1.9-alpine image for build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 268ec61dc..59a352bbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rinpatch/elixir:1.9.0-rc.0-alpine as build +FROM elixir:1.9-alpine as build COPY . . From cc1d1ee4069c47d2e5e91347438b2a6c7bff86cf Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 3 Sep 2019 17:54:21 +0300 Subject: [PATCH 093/400] Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id` --- lib/pleroma/plugs/trailing_format_plug.ex | 40 ++++++++ lib/pleroma/user.ex | 8 +- lib/pleroma/web/endpoint.ex | 2 +- .../controllers/mastodon_api_controller.ex | 25 ++++- .../mastodon_api_controller_test.exs | 91 +++++++++++++++---- 5 files changed, 142 insertions(+), 24 deletions(-) create mode 100644 lib/pleroma/plugs/trailing_format_plug.ex diff --git a/lib/pleroma/plugs/trailing_format_plug.ex b/lib/pleroma/plugs/trailing_format_plug.ex new file mode 100644 index 000000000..2473e07fe --- /dev/null +++ b/lib/pleroma/plugs/trailing_format_plug.ex @@ -0,0 +1,40 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Plugs.TrailingFormatPlug do + @moduledoc "Calls TrailingFormatPlug for specific paths. Ideally we would just do this in the router, but TrailingFormatPlug needs to be called before Plug.Parsers." + + @behaviour Plug + @paths [ + "/api/statusnet", + "/api/statuses", + "/api/qvitter", + "/api/search", + "/api/account", + "/api/friends", + "/api/mutes", + "/api/media", + "/api/favorites", + "/api/blocks", + "/api/friendships", + "/api/users", + "/users", + "/nodeinfo", + "/api/help", + "/api/externalprofile", + "/notice" + ] + + def init(opts) do + TrailingFormatPlug.init(opts) + end + + for path <- @paths do + def call(%{request_path: unquote(path) <> _} = conn, opts) do + TrailingFormatPlug.call(conn, opts) + end + end + + def call(conn, _opts), do: conn +end diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 29fd6d2ea..d68015a80 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -569,8 +569,12 @@ def get_cached_by_nickname(nickname) do end) end - def get_cached_by_nickname_or_id(nickname_or_id) do - get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) + def get_cached_by_nickname_or_id(nickname_or_id, opts \\ []) do + if is_integer(nickname_or_id) or Pleroma.FlakeId.is_flake_id?(nickname_or_id) do + get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) + else + unless opts[:restrict_remote_nicknames], do: get_cached_by_nickname(nickname_or_id) + end end def get_by_nickname(nickname) do diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index c123530dc..eb805e853 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -57,7 +57,7 @@ defmodule Pleroma.Web.Endpoint do plug(Phoenix.CodeReloader) end - plug(TrailingFormatPlug) + plug(Pleroma.Plugs.TrailingFormatPlug) plug(Plug.RequestId) plug(Plug.Logger) diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 83e877c0e..c5f281976 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -290,7 +290,7 @@ def verify_app_credentials(%{assigns: %{user: _user, token: token}} = conn, _) d end def user(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do - with %User{} = user <- User.get_cached_by_nickname_or_id(nickname_or_id), + with %User{} = user <- get_user_by_nickname_or_id(for_user, nickname_or_id), true <- User.auth_active?(user) || user.id == for_user.id || User.superuser?(for_user) do account = AccountView.render("account.json", %{user: user, for: for_user}) json(conn, account) @@ -390,7 +390,7 @@ def public_timeline(%{assigns: %{user: user}} = conn, params) do end def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do - with %User{} = user <- User.get_cached_by_nickname_or_id(params["id"]) do + with %User{} = user <- get_user_by_nickname_or_id(reading_user, params["id"]) do params = params |> Map.put("tag", params["tagged"]) @@ -1697,4 +1697,25 @@ def try_render(conn, _, _) do defp present?(nil), do: false defp present?(false), do: false defp present?(_), do: true + + defp get_user_by_nickname_or_id(for_user, nickname_or_id) do + restrict_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) + + opts = + cond do + restrict_to_local == :all -> + [restrict_remote_nicknames: true] + + restrict_to_local == false -> + [] + + restrict_to_local == :unauthenticated and match?(%User{}, for_user) -> + [] + + true -> + [restrict_remote_nicknames: true] + end + + User.get_cached_by_nickname_or_id(nickname_or_id, opts) + end end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 4fd0a5aeb..427ee6f63 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1675,32 +1675,85 @@ test "/api/v1/follow_requests/:id/reject works" do end end - test "account fetching", %{conn: conn} do - user = insert(:user) + describe "account fetching" do + test "works by id" do + user = insert(:user) - conn = - conn - |> get("/api/v1/accounts/#{user.id}") + conn = + build_conn() + |> get("/api/v1/accounts/#{user.id}") - assert %{"id" => id} = json_response(conn, 200) - assert id == to_string(user.id) + assert %{"id" => id} = json_response(conn, 200) + assert id == to_string(user.id) - conn = - build_conn() - |> get("/api/v1/accounts/-1") + conn = + build_conn() + |> get("/api/v1/accounts/-1") - assert %{"error" => "Can't find user"} = json_response(conn, 404) - end + assert %{"error" => "Can't find user"} = json_response(conn, 404) + end - test "account fetching also works nickname", %{conn: conn} do - user = insert(:user) + test "works by nickname" do + user = insert(:user) - conn = - conn - |> get("/api/v1/accounts/#{user.nickname}") + conn = + build_conn() + |> get("/api/v1/accounts/#{user.nickname}") - assert %{"id" => id} = json_response(conn, 200) - assert id == user.id + assert %{"id" => id} = json_response(conn, 200) + assert id == user.id + end + + test "works by nickname for remote users" do + limit_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) + Pleroma.Config.put([:instance, :limit_to_local_content], false) + user = insert(:user, nickname: "user@example.com", local: false) + + conn = + build_conn() + |> get("/api/v1/accounts/#{user.nickname}") + + Pleroma.Config.put([:instance, :limit_to_local_content], limit_to_local) + assert %{"id" => id} = json_response(conn, 200) + assert id == user.id + end + + test "respects limit_to_local_content == :all for remote user nicknames" do + limit_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) + Pleroma.Config.put([:instance, :limit_to_local_content], :all) + + user = insert(:user, nickname: "user@example.com", local: false) + + conn = + build_conn() + |> get("/api/v1/accounts/#{user.nickname}") + + Pleroma.Config.put([:instance, :limit_to_local_content], limit_to_local) + assert json_response(conn, 404) + end + + test "respects limit_to_local_content == :unauthenticated for remote user nicknames" do + limit_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) + Pleroma.Config.put([:instance, :limit_to_local_content], :unauthenticated) + + user = insert(:user, nickname: "user@example.com", local: false) + reading_user = insert(:user) + + conn = + build_conn() + |> get("/api/v1/accounts/#{user.nickname}") + + assert json_response(conn, 404) + + conn = + build_conn() + |> assign(:user, reading_user) + |> get("/api/v1/accounts/#{user.nickname}") + + Pleroma.Config.put([:instance, :limit_to_local_content], limit_to_local) + assert %{"id" => id} = json_response(conn, 200) + assert id == user.id + end end test "mascot upload", %{conn: conn} do From c2b6c1b089a813cf8c7cbd54c0f80bee4985522c Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 4 Sep 2019 11:33:08 +0300 Subject: [PATCH 094/400] Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities --- CHANGELOG.md | 1 + docs/api/pleroma_api.md | 11 ++-- lib/pleroma/notification.ex | 21 ++++++- .../web/pleroma_api/pleroma_api_controller.ex | 25 +++++++++ lib/pleroma/web/router.ex | 7 +-- .../pleroma_api_controller_test.exs | 56 +++++++++++++++++++ test/web/twitter_api/util_controller_test.exs | 32 ----------- 7 files changed, 108 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8264688d6..40f4580f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config - **Breaking:** Configuration: `/media/` is now removed when `base_url` is configured, append `/media/` to your `base_url` config to keep the old behaviour if desired +- **Breaking:** `/api/pleroma/notifications/read` is moved to `/api/v1/pleroma/notifications/read` and now supports `max_id` and responds with Mastodon API entities. - Configuration: OpenGraph and TwitterCard providers enabled by default - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text - Federation: Return 403 errors when trying to request pages from a user's follower/following collections if they have `hide_followers`/`hide_follows` set diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md index b134b31a8..e76a35b3b 100644 --- a/docs/api/pleroma_api.md +++ b/docs/api/pleroma_api.md @@ -126,13 +126,14 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi ## `/api/pleroma/admin/`… See [Admin-API](Admin-API.md) -## `/api/pleroma/notifications/read` -### Mark a single notification as read +## `/api/pleroma/v1/notifications/read` +### Mark notifications as read * Method `POST` * Authentication: required -* Params: - * `id`: notification's id -* Response: JSON. Returns `{"status": "success"}` if the reading was successful, otherwise returns `{"error": "error_msg"}` +* Params (mutually exclusive): + * `id`: a single notification id to read + * `max_id`: read all notifications up to this id +* Response: Notification entity/Array of Notification entities. In case of `max_id`, only the first 80 notifications will be returned. ## `/api/v1/pleroma/accounts/:id/subscribe` ### Subscribe to receive notifications for all statuses posted by a user diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 5d29af853..d7e232992 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -102,15 +102,32 @@ def set_read_up_to(%{id: user_id} = _user, id) do n in Notification, where: n.user_id == ^user_id, where: n.id <= ^id, + where: n.seen == false, update: [ set: [ seen: true, updated_at: ^NaiveDateTime.utc_now() ] - ] + ], + # Ideally we would preload object and activities here + # but Ecto does not support preloads in update_all + select: n.id ) - Repo.update_all(query, []) + {_, notification_ids} = Repo.update_all(query, []) + + from(n in Notification, where: n.id in ^notification_ids) + |> join(:inner, [n], activity in assoc(n, :activity)) + |> join(:left, [n, a], object in Object, + on: + fragment( + "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", + object.data, + a.data + ) + ) + |> preload([n, a, o], activity: {a, object: o}) + |> Repo.all() end def read_one(%User{} = user, notification_id) do diff --git a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex index b6d2bf86b..f4df3b024 100644 --- a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex +++ b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex @@ -8,8 +8,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do import Pleroma.Web.ControllerHelper, only: [add_link_headers: 7] alias Pleroma.Conversation.Participation + alias Pleroma.Notification alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.MastodonAPI.ConversationView + alias Pleroma.Web.MastodonAPI.NotificationView alias Pleroma.Web.MastodonAPI.StatusView def conversation(%{assigns: %{user: user}} = conn, %{"id" => participation_id}) do @@ -70,4 +72,27 @@ def update_conversation( |> render("participation.json", %{participation: participation, for: user}) end end + + def read_notification(%{assigns: %{user: user}} = conn, %{"id" => notification_id}) do + with {:ok, notification} <- Notification.read_one(user, notification_id) do + conn + |> put_view(NotificationView) + |> render("show.json", %{notification: notification, for: user}) + else + {:error, message} -> + conn + |> put_status(:bad_request) + |> json(%{"error" => message}) + end + end + + def read_notification(%{assigns: %{user: user}} = conn, %{"max_id" => max_id}) do + with notifications <- Notification.set_read_up_to(user, max_id) do + notifications = Enum.take(notifications, 80) + + conn + |> put_view(NotificationView) + |> render("index.json", %{notifications: notifications, for: user}) + end + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 969dc66fd..44a4279f7 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -236,12 +236,6 @@ defmodule Pleroma.Web.Router do post("/blocks_import", UtilController, :blocks_import) post("/follow_import", UtilController, :follow_import) end - - scope [] do - pipe_through(:oauth_read) - - post("/notifications/read", UtilController, :notifications_read) - end end scope "/oauth", Pleroma.Web.OAuth do @@ -277,6 +271,7 @@ defmodule Pleroma.Web.Router do scope [] do pipe_through(:oauth_write) patch("/conversations/:id", PleromaAPIController, :update_conversation) + post("/notifications/read", PleromaAPIController, :read_notification) end end diff --git a/test/web/pleroma_api/pleroma_api_controller_test.exs b/test/web/pleroma_api/pleroma_api_controller_test.exs index ed6b79727..7eaeda4a0 100644 --- a/test/web/pleroma_api/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/pleroma_api_controller_test.exs @@ -6,6 +6,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do use Pleroma.Web.ConnCase alias Pleroma.Conversation.Participation + alias Pleroma.Notification alias Pleroma.Repo alias Pleroma.Web.CommonAPI @@ -91,4 +92,59 @@ test "PATCH /api/v1/pleroma/conversations/:id", %{conn: conn} do assert user in participation.recipients assert other_user in participation.recipients end + + describe "POST /api/v1/pleroma/notifications/read" do + test "it marks a single notification as read", %{conn: conn} do + user1 = insert(:user) + user2 = insert(:user) + {:ok, activity1} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) + {:ok, activity2} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) + {:ok, [notification1]} = Notification.create_notifications(activity1) + {:ok, [notification2]} = Notification.create_notifications(activity2) + + response = + conn + |> assign(:user, user1) + |> post("/api/v1/pleroma/notifications/read", %{"id" => "#{notification1.id}"}) + |> json_response(:ok) + + assert %{"pleroma" => %{"is_seen" => true}} = response + assert Repo.get(Notification, notification1.id).seen + refute Repo.get(Notification, notification2.id).seen + end + + test "it marks multiple notifications as read", %{conn: conn} do + user1 = insert(:user) + user2 = insert(:user) + {:ok, _activity1} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) + {:ok, _activity2} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) + {:ok, _activity3} = CommonAPI.post(user2, %{"status" => "HIE @#{user1.nickname}"}) + + [notification3, notification2, notification1] = Notification.for_user(user1, %{limit: 3}) + + [response1, response2] = + conn + |> assign(:user, user1) + |> post("/api/v1/pleroma/notifications/read", %{"max_id" => "#{notification2.id}"}) + |> json_response(:ok) + + assert %{"pleroma" => %{"is_seen" => true}} = response1 + assert %{"pleroma" => %{"is_seen" => true}} = response2 + assert Repo.get(Notification, notification1.id).seen + assert Repo.get(Notification, notification2.id).seen + refute Repo.get(Notification, notification3.id).seen + end + + test "it returns error when notification not found", %{conn: conn} do + user1 = insert(:user) + + response = + conn + |> assign(:user, user1) + |> post("/api/v1/pleroma/notifications/read", %{"id" => "22222222222222"}) + |> json_response(:bad_request) + + assert response == %{"error" => "Cannot get notification"} + end + end end diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs index fe4ffdb59..cf8e69d2b 100644 --- a/test/web/twitter_api/util_controller_test.exs +++ b/test/web/twitter_api/util_controller_test.exs @@ -5,7 +5,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do use Pleroma.Web.ConnCase - alias Pleroma.Notification alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.CommonAPI @@ -141,37 +140,6 @@ test "it imports blocks users from file", %{conn: conn} do end end - describe "POST /api/pleroma/notifications/read" do - test "it marks a single notification as read", %{conn: conn} do - user1 = insert(:user) - user2 = insert(:user) - {:ok, activity1} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) - {:ok, activity2} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"}) - {:ok, [notification1]} = Notification.create_notifications(activity1) - {:ok, [notification2]} = Notification.create_notifications(activity2) - - conn - |> assign(:user, user1) - |> post("/api/pleroma/notifications/read", %{"id" => "#{notification1.id}"}) - |> json_response(:ok) - - assert Repo.get(Notification, notification1.id).seen - refute Repo.get(Notification, notification2.id).seen - end - - test "it returns error when notification not found", %{conn: conn} do - user1 = insert(:user) - - response = - conn - |> assign(:user, user1) - |> post("/api/pleroma/notifications/read", %{"id" => "22222222222222"}) - |> json_response(403) - - assert response == %{"error" => "Cannot get notification"} - end - end - describe "PUT /api/pleroma/notification_settings" do test "it updates notification settings", %{conn: conn} do user = insert(:user) From 7c3838090f86fbfdbf4e45fcfbabc21c19f26924 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 4 Sep 2019 10:14:15 +0000 Subject: [PATCH 095/400] Apply suggestion to lib/pleroma/notification.ex --- lib/pleroma/notification.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index d7e232992..b7c880c51 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -116,7 +116,8 @@ def set_read_up_to(%{id: user_id} = _user, id) do {_, notification_ids} = Repo.update_all(query, []) - from(n in Notification, where: n.id in ^notification_ids) + Notification + |> where([n], n.id in ^notification_ids) |> join(:inner, [n], activity in assoc(n, :activity)) |> join(:left, [n, a], object in Object, on: From 377aa9fb90ff1c8537112f23bfc329f1ac0696b4 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 4 Sep 2019 10:37:43 +0000 Subject: [PATCH 096/400] Apply suggestion to docs/api/pleroma_api.md --- docs/api/pleroma_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md index e76a35b3b..c08ee9ecd 100644 --- a/docs/api/pleroma_api.md +++ b/docs/api/pleroma_api.md @@ -126,7 +126,7 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi ## `/api/pleroma/admin/`… See [Admin-API](Admin-API.md) -## `/api/pleroma/v1/notifications/read` +## `/api/v1/pleroma/notifications/read` ### Mark notifications as read * Method `POST` * Authentication: required From 328b2612cd957aa3ad810101a20037e4e9843bb0 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 4 Sep 2019 13:39:39 +0300 Subject: [PATCH 097/400] Clarify that read notifications are returned --- docs/api/pleroma_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md index c08ee9ecd..7d343e97a 100644 --- a/docs/api/pleroma_api.md +++ b/docs/api/pleroma_api.md @@ -133,7 +133,7 @@ See [Admin-API](Admin-API.md) * Params (mutually exclusive): * `id`: a single notification id to read * `max_id`: read all notifications up to this id -* Response: Notification entity/Array of Notification entities. In case of `max_id`, only the first 80 notifications will be returned. +* Response: Notification entity/Array of Notification entities that were read. In case of `max_id`, only the first 80 read notifications will be returned. ## `/api/v1/pleroma/accounts/:id/subscribe` ### Subscribe to receive notifications for all statuses posted by a user From 3face454671bfdf2b850daf9dcb05468eb909e95 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 4 Sep 2019 14:16:56 +0300 Subject: [PATCH 098/400] Mastodon API: Add `pleroma.thread_muted` to Status entity Needed for pleroma-fe!941 --- CHANGELOG.md | 1 + docs/api/differences_in_mastoapi_responses.md | 1 + .../web/mastodon_api/views/status_view.ex | 3 ++- .../mastodon_api/views/status_view_test.exs | 21 ++++++++++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f4580f7..a414ba5e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **Breaking:** `/api/pleroma/notifications/read` is moved to `/api/v1/pleroma/notifications/read` and now supports `max_id` and responds with Mastodon API entities. - Configuration: OpenGraph and TwitterCard providers enabled by default - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text +- Mastodon API: `pleroma.thread_muted` key in the Status entity - Federation: Return 403 errors when trying to request pages from a user's follower/following collections if they have `hide_followers`/`hide_follows` set - NodeInfo: Return `skipThreadContainment` in `metadata` for the `skip_thread_containment` option - NodeInfo: Return `mailerEnabled` in `metadata` diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index f34e3dd72..02f90f3e8 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -26,6 +26,7 @@ Has these additional fields under the `pleroma` object: - `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain` - `expires_at`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire +- `thread_muted`: true if the thread the post belongs to is muted ## Attachments diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index a4ee0b5dd..4c3c8c564 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -299,7 +299,8 @@ def render("status.json", %{activity: %{data: %{"object" => _object}} = activity content: %{"text/plain" => content_plaintext}, spoiler_text: %{"text/plain" => summary_plaintext}, expires_at: expires_at, - direct_conversation_id: direct_conversation_id + direct_conversation_id: direct_conversation_id, + thread_muted: thread_muted? } } end diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 1b6beb6d2..90451cbdc 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -150,7 +150,8 @@ test "a note activity" do content: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["content"])}, spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(object_data["summary"])}, expires_at: nil, - direct_conversation_id: nil + direct_conversation_id: nil, + thread_muted: false } } @@ -173,6 +174,24 @@ test "tells if the message is muted for some reason" do assert status.muted == true end + test "tells if the message is thread muted" do + user = insert(:user) + other_user = insert(:user) + + {:ok, user} = User.mute(user, other_user) + + {:ok, activity} = CommonAPI.post(other_user, %{"status" => "test"}) + status = StatusView.render("status.json", %{activity: activity, for: user}) + + assert status.pleroma.thread_muted == false + + {:ok, activity} = CommonAPI.add_mute(user, activity) + + status = StatusView.render("status.json", %{activity: activity, for: user}) + + assert status.pleroma.thread_muted == true + end + test "tells if the status is bookmarked" do user = insert(:user) From 8cbad5500cefbba1e0bb67604960fc331b75b498 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Wed, 4 Sep 2019 15:25:12 +0300 Subject: [PATCH 099/400] add tests for activity_pub/utils.ex --- lib/pleroma/user.ex | 1 + lib/pleroma/web/activity_pub/activity_pub.ex | 12 +- lib/pleroma/web/activity_pub/utils.ex | 298 +++++++++---------- test/web/activity_pub/utils_test.exs | 232 ++++++++++++++- 4 files changed, 371 insertions(+), 172 deletions(-) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 29fd6d2ea..424ed772f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -147,6 +147,7 @@ def get_cached_follow_state(user, target) do Cachex.fetch!(:user_cache, key, fn _ -> {:commit, follow_state(user, target)} end) end + @spec set_follow_state_cache(String.t(), String.t(), String.t()) :: {:ok | :error, boolean()} def set_follow_state_cache(user_ap_id, target_ap_id, state) do Cachex.put( :user_cache, diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index eeb826814..39b46a595 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -435,6 +435,7 @@ def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ tru end end + @spec block(User.t(), User.t(), String.t() | nil, boolean) :: {:ok, Activity.t() | nil} def block(blocker, blocked, activity_id \\ nil, local \\ true) do outgoing_blocks = Config.get([:activitypub, :outgoing_blocks]) unfollow_blocked = Config.get([:activitypub, :unfollow_blocked]) @@ -463,10 +464,11 @@ def unblock(blocker, blocked, activity_id \\ nil, local \\ true) do end end + @spec flag(map()) :: {:ok, Activity.t()} | any def flag( %{ actor: actor, - context: context, + context: _context, account: account, statuses: statuses, content: content @@ -478,14 +480,6 @@ def flag( additional = params[:additional] || %{} - params = %{ - actor: actor, - context: context, - account: account, - statuses: statuses, - content: content - } - additional = if forward do Map.merge(additional, %{"to" => [], "cc" => [account.ap_id]}) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index c9c0c3763..cf82d1a9b 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -33,50 +33,40 @@ def normalize_params(params) do Map.put(params, "actor", get_ap_id(params["actor"])) end - def determine_explicit_mentions(%{"tag" => tag} = _object) when is_list(tag) do - tag - |> Enum.filter(fn x -> is_map(x) end) - |> Enum.filter(fn x -> x["type"] == "Mention" end) - |> Enum.map(fn x -> x["href"] end) + @spec determine_explicit_mentions(map()) :: map() + def determine_explicit_mentions(%{"tag" => tag} = _) when is_list(tag) do + Enum.flat_map(tag, fn + %{"type" => "Mention", "href" => href} -> [href] + _ -> [] + end) end def determine_explicit_mentions(%{"tag" => tag} = object) when is_map(tag) do - Map.put(object, "tag", [tag]) + object + |> Map.put("tag", [tag]) |> determine_explicit_mentions() end def determine_explicit_mentions(_), do: [] + @spec recipient_in_collection(any(), any()) :: boolean() defp recipient_in_collection(ap_id, coll) when is_binary(coll), do: ap_id == coll defp recipient_in_collection(ap_id, coll) when is_list(coll), do: ap_id in coll defp recipient_in_collection(_, _), do: false + @spec recipient_in_message(User.t(), User.t(), map()) :: boolean() def recipient_in_message(%User{ap_id: ap_id} = recipient, %User{} = actor, params) do + addresses = [params["to"], params["cc"], params["bto"], params["bcc"]] + cond do - recipient_in_collection(ap_id, params["to"]) -> - true - - recipient_in_collection(ap_id, params["cc"]) -> - true - - recipient_in_collection(ap_id, params["bto"]) -> - true - - recipient_in_collection(ap_id, params["bcc"]) -> - true - + Enum.any?(addresses, &recipient_in_collection(ap_id, &1)) -> true # if the message is unaddressed at all, then assume it is directly addressed # to the recipient - !params["to"] && !params["cc"] && !params["bto"] && !params["bcc"] -> - true - + Enum.all?(addresses, &is_nil(&1)) -> true # if the message is sent from somebody the user is following, then assume it # is addressed to the recipient - User.following?(recipient, actor) -> - true - - true -> - false + User.following?(recipient, actor) -> true + true -> false end end @@ -188,53 +178,58 @@ def maybe_federate(_), do: :ok Adds an id and a published data if they aren't there, also adds it to an included object """ - def lazy_put_activity_defaults(map, fake \\ false) do - map = - unless fake do - %{data: %{"id" => context}, id: context_id} = create_context(map["context"]) + @spec lazy_put_activity_defaults(map(), boolean) :: map() + def lazy_put_activity_defaults(map, fake \\ false) - map - |> Map.put_new_lazy("id", &generate_activity_id/0) - |> Map.put_new_lazy("published", &make_date/0) - |> Map.put_new("context", context) - |> Map.put_new("context_id", context_id) - else - map - |> Map.put_new("id", "pleroma:fakeid") - |> Map.put_new_lazy("published", &make_date/0) - |> Map.put_new("context", "pleroma:fakecontext") - |> Map.put_new("context_id", -1) - end + def lazy_put_activity_defaults(map, true) do + map + |> Map.put_new("id", "pleroma:fakeid") + |> Map.put_new_lazy("published", &make_date/0) + |> Map.put_new("context", "pleroma:fakecontext") + |> Map.put_new("context_id", -1) + |> lazy_put_object_defaults(true) + end - if is_map(map["object"]) do - object = lazy_put_object_defaults(map["object"], map, fake) - %{map | "object" => object} - else + def lazy_put_activity_defaults(map, _fake) do + %{data: %{"id" => context}, id: context_id} = create_context(map["context"]) + + map + |> Map.put_new_lazy("id", &generate_activity_id/0) + |> Map.put_new_lazy("published", &make_date/0) + |> Map.put_new("context", context) + |> Map.put_new("context_id", context_id) + |> lazy_put_object_defaults(false) + end + + # Adds an id and published date if they aren't there. + # + @spec lazy_put_object_defaults(map(), boolean()) :: map() + defp lazy_put_object_defaults(%{"object" => map} = activity, true) + when is_map(map) do + object = map - end + |> Map.put_new("id", "pleroma:fake_object_id") + |> Map.put_new_lazy("published", &make_date/0) + |> Map.put_new("context", activity["context"]) + |> Map.put_new("context_id", activity["context_id"]) + |> Map.put_new("fake", true) + + %{activity | "object" => object} end - @doc """ - Adds an id and published date if they aren't there. - """ - def lazy_put_object_defaults(map, activity \\ %{}, fake) + defp lazy_put_object_defaults(%{"object" => map} = activity, _) + when is_map(map) do + object = + map + |> Map.put_new_lazy("id", &generate_object_id/0) + |> Map.put_new_lazy("published", &make_date/0) + |> Map.put_new("context", activity["context"]) + |> Map.put_new("context_id", activity["context_id"]) - def lazy_put_object_defaults(map, activity, true = _fake) do - map - |> Map.put_new_lazy("published", &make_date/0) - |> Map.put_new("id", "pleroma:fake_object_id") - |> Map.put_new("context", activity["context"]) - |> Map.put_new("fake", true) - |> Map.put_new("context_id", activity["context_id"]) + %{activity | "object" => object} end - def lazy_put_object_defaults(map, activity, _fake) do - map - |> Map.put_new_lazy("id", &generate_object_id/0) - |> Map.put_new_lazy("published", &make_date/0) - |> Map.put_new("context", activity["context"]) - |> Map.put_new("context_id", activity["context_id"]) - end + defp lazy_put_object_defaults(activity, _), do: activity @doc """ Inserts a full object if it is contained in an activity. @@ -356,23 +351,30 @@ defp fetch_likes(object) do @doc """ Updates a follow activity's state (for locked accounts). """ + @spec update_follow_state_for_all(Activity.t(), String.t()) :: {:ok, Activity} | {:error, any()} def update_follow_state_for_all( %Activity{data: %{"actor" => actor, "object" => object}} = activity, state ) do - try do - Ecto.Adapters.SQL.query!( - Repo, - "UPDATE activities SET data = jsonb_set(data, '{state}', $1) WHERE data->>'type' = 'Follow' AND data->>'actor' = $2 AND data->>'object' = $3 AND data->>'state' = 'pending'", - [state, actor, object] + query = + from(activity in Activity, + where: fragment("data->>'type' = 'Follow'"), + where: fragment("data->>'state' = 'pending'"), + where: fragment("data->>'actor' = ?", ^actor), + where: fragment("data->>'object' = ?", ^object), + update: [ + set: [ + data: fragment("jsonb_set(data, '{state}', ?)", ^state) + ] + ] ) - User.set_follow_state_cache(actor, object, state) - activity = Activity.get_by_id(activity.id) + with {_, _} <- Repo.update_all(query, []), + {_, _} <- User.set_follow_state_cache(actor, object, state), + %Activity{} = activity <- Activity.get_by_id(activity.id) do {:ok, activity} - rescue - e -> - {:error, e} + else + e -> {:error, e} end end @@ -380,9 +382,7 @@ def update_follow_state( %Activity{data: %{"actor" => actor, "object" => object}} = activity, state ) do - with new_data <- - activity.data - |> Map.put("state", state), + with new_data <- Map.put(activity.data, "state", state), changeset <- Changeset.change(activity, data: new_data), {:ok, activity} <- Repo.update(changeset), _ <- User.set_follow_state_cache(actor, object, state) do @@ -411,27 +411,17 @@ def make_follow_data( def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do query = - from( - activity in Activity, - where: - fragment( - "? ->> 'type' = 'Follow'", - activity.data - ), - where: activity.actor == ^follower_id, - # this is to use the index - where: - fragment( - "coalesce((?)->'object'->>'id', (?)->>'object') = ?", - activity.data, - activity.data, - ^followed_id - ), - order_by: [fragment("? desc nulls last", activity.id)], - limit: 1 - ) + follower_id + |> Activity.Queries.by_actor() + |> Activity.Queries.by_type("Follow") + |> Activity.Queries.by_object_id(followed_id) + |> Activity.Queries.limit(1) - Repo.one(query) + from( + activity in query, + order_by: [fragment("? desc nulls last", activity.id)] + ) + |> Repo.one() end #### Announce-related helpers @@ -439,23 +429,14 @@ def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do @doc """ Retruns an existing announce activity if the notice has already been announced """ + @spec get_existing_announce(String.t(), map()) :: Activity.t() | nil def get_existing_announce(actor, %{data: %{"id" => id}}) do - query = - from( - activity in Activity, - where: activity.actor == ^actor, - # this is to use the index - where: - fragment( - "coalesce((?)->'object'->>'id', (?)->>'object') = ?", - activity.data, - activity.data, - ^id - ), - where: fragment("(?)->>'type' = 'Announce'", activity.data) - ) - - Repo.one(query) + actor + |> Activity.Queries.by_actor() + |> Activity.Queries.by_type("Announce") + |> Activity.Queries.by_object_id(id) + |> Activity.Queries.limit(1) + |> Repo.one() end @doc """ @@ -531,31 +512,35 @@ def make_unlike_data( |> maybe_put("id", activity_id) end + @spec add_announce_to_object(Activity.t(), Object.t()) :: + {:ok, Object.t()} | {:error, Ecto.Changeset.t()} def add_announce_to_object( - %Activity{ - data: %{"actor" => actor, "cc" => [Pleroma.Constants.as_public()]} - }, + %Activity{data: %{"actor" => actor, "cc" => [Pleroma.Constants.as_public()]}}, object ) do - announcements = - if is_list(object.data["announcements"]), do: object.data["announcements"], else: [] + announcements = fetch_announcements(object) - with announcements <- [actor | announcements] |> Enum.uniq() do + with announcements <- Enum.uniq([actor | announcements]) do update_element_in_object("announcement", announcements, object) end end def add_announce_to_object(_, object), do: {:ok, object} + @spec remove_announce_from_object(Activity.t(), Object.t()) :: + {:ok, Object.t()} | {:error, Ecto.Changeset.t()} def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do - announcements = - if is_list(object.data["announcements"]), do: object.data["announcements"], else: [] - - with announcements <- announcements |> List.delete(actor) do + with announcements <- List.delete(fetch_announcements(object), actor) do update_element_in_object("announcement", announcements, object) end end + defp fetch_announcements(%{data: %{"announcements" => announcements}} = _) + when is_list(announcements), + do: announcements + + defp fetch_announcements(_), do: [] + #### Unfollow-related helpers def make_unfollow_data(follower, followed, follow_activity, activity_id) do @@ -569,29 +554,20 @@ def make_unfollow_data(follower, followed, follow_activity, activity_id) do end #### Block-related helpers + @spec fetch_latest_block(User.t(), User.t()) :: Activity.t() | nil def fetch_latest_block(%User{ap_id: blocker_id}, %User{ap_id: blocked_id}) do query = - from( - activity in Activity, - where: - fragment( - "? ->> 'type' = 'Block'", - activity.data - ), - where: activity.actor == ^blocker_id, - # this is to use the index - where: - fragment( - "coalesce((?)->'object'->>'id', (?)->>'object') = ?", - activity.data, - activity.data, - ^blocked_id - ), - order_by: [fragment("? desc nulls last", activity.id)], - limit: 1 - ) + blocker_id + |> Activity.Queries.by_actor() + |> Activity.Queries.by_type("Block") + |> Activity.Queries.by_object_id(blocked_id) + |> Activity.Queries.limit(1) - Repo.one(query) + from( + activity in query, + order_by: [fragment("? desc nulls last", activity.id)] + ) + |> Repo.one() end def make_block_data(blocker, blocked, activity_id) do @@ -631,28 +607,32 @@ def make_create_data(params, additional) do end #### Flag-related helpers - - def make_flag_data(params, additional) do - status_ap_ids = - Enum.map(params.statuses || [], fn - %Activity{} = act -> act.data["id"] - act when is_map(act) -> act["id"] - act when is_binary(act) -> act - end) - - object = [params.account.ap_id] ++ status_ap_ids - + @spec make_flag_data(map(), map()) :: map() + def make_flag_data(%{actor: actor, context: context, content: content} = params, additional) do %{ "type" => "Flag", - "actor" => params.actor.ap_id, - "content" => params.content, - "object" => object, - "context" => params.context, + "actor" => actor.ap_id, + "content" => content, + "object" => build_flag_object(params), + "context" => context, "state" => "open" } |> Map.merge(additional) end + def make_flag_data(_, _), do: %{} + + defp build_flag_object(%{account: account, statuses: statuses} = _) do + [account.ap_id] ++ + Enum.map(statuses || [], fn + %Activity{} = act -> act.data["id"] + act when is_map(act) -> act["id"] + act when is_binary(act) -> act + end) + end + + defp build_flag_object(_), do: [] + @doc """ Fetches the OrderedCollection/OrderedCollectionPage from `from`, limiting the amount of pages fetched after the first one to `pages_left` pages. diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs index eb429b2c4..b1c1d6f71 100644 --- a/test/web/activity_pub/utils_test.exs +++ b/test/web/activity_pub/utils_test.exs @@ -87,6 +87,18 @@ test "works with an object that has only IR tags" do assert Utils.determine_explicit_mentions(object) == [] end + + test "works with an object has tags as map" do + object = %{ + "tag" => %{ + "type" => "Mention", + "href" => "https://example.com/~alyssa", + "name" => "Alyssa P. Hacker" + } + } + + assert Utils.determine_explicit_mentions(object) == ["https://example.com/~alyssa"] + end end describe "make_unlike_data/3" do @@ -300,8 +312,8 @@ test "updates the state of all Follow activities with the same actor and object" {:ok, follow_activity_two} = Utils.update_follow_state_for_all(follow_activity_two, "accept") - assert Repo.get(Activity, follow_activity.id).data["state"] == "accept" - assert Repo.get(Activity, follow_activity_two.id).data["state"] == "accept" + assert refresh_record(follow_activity).data["state"] == "accept" + assert refresh_record(follow_activity_two).data["state"] == "accept" end end @@ -323,8 +335,8 @@ test "updates the state of the given follow activity" do {:ok, follow_activity_two} = Utils.update_follow_state(follow_activity_two, "reject") - assert Repo.get(Activity, follow_activity.id).data["state"] == "pending" - assert Repo.get(Activity, follow_activity_two.id).data["state"] == "reject" + assert refresh_record(follow_activity).data["state"] == "pending" + assert refresh_record(follow_activity_two).data["state"] == "reject" end end @@ -401,4 +413,216 @@ test "fetches existing like" do assert ^like_activity = Utils.get_existing_like(user.ap_id, object) end end + + describe "get_get_existing_announce/2" do + test "returns nil if announce not found" do + actor = insert(:user) + refute Utils.get_existing_announce(actor.ap_id, %{data: %{"id" => "test"}}) + end + + test "fetches existing announce" do + note_activity = insert(:note_activity) + assert object = Object.normalize(note_activity) + actor = insert(:user) + + {:ok, announce, _object} = ActivityPub.announce(actor, object) + assert Utils.get_existing_announce(actor.ap_id, object) == announce + end + end + + describe "fetch_latest_block/2" do + test "fetches last block activities" do + user1 = insert(:user) + user2 = insert(:user) + + assert {:ok, %Activity{} = _} = ActivityPub.block(user1, user2) + assert {:ok, %Activity{} = _} = ActivityPub.block(user1, user2) + assert {:ok, %Activity{} = activity} = ActivityPub.block(user1, user2) + + assert Utils.fetch_latest_block(user1, user2) == activity + end + end + + describe "recipient_in_message/3" do + test "returns true when recipient in `to`" do + recipient = insert(:user) + actor = insert(:user) + assert Utils.recipient_in_message(recipient, actor, %{"to" => recipient.ap_id}) + + assert Utils.recipient_in_message( + recipient, + actor, + %{"to" => [recipient.ap_id], "cc" => ""} + ) + end + + test "returns true when recipient in `cc`" do + recipient = insert(:user) + actor = insert(:user) + assert Utils.recipient_in_message(recipient, actor, %{"cc" => recipient.ap_id}) + + assert Utils.recipient_in_message( + recipient, + actor, + %{"cc" => [recipient.ap_id], "to" => ""} + ) + end + + test "returns true when recipient in `bto`" do + recipient = insert(:user) + actor = insert(:user) + assert Utils.recipient_in_message(recipient, actor, %{"bto" => recipient.ap_id}) + + assert Utils.recipient_in_message( + recipient, + actor, + %{"bcc" => "", "bto" => [recipient.ap_id]} + ) + end + + test "returns true when recipient in `bcc`" do + recipient = insert(:user) + actor = insert(:user) + assert Utils.recipient_in_message(recipient, actor, %{"bcc" => recipient.ap_id}) + + assert Utils.recipient_in_message( + recipient, + actor, + %{"bto" => "", "bcc" => [recipient.ap_id]} + ) + end + + test "returns true when message without addresses fields" do + recipient = insert(:user) + actor = insert(:user) + assert Utils.recipient_in_message(recipient, actor, %{"bccc" => recipient.ap_id}) + + assert Utils.recipient_in_message( + recipient, + actor, + %{"btod" => "", "bccc" => [recipient.ap_id]} + ) + end + + test "returns false" do + recipient = insert(:user) + actor = insert(:user) + refute Utils.recipient_in_message(recipient, actor, %{"to" => "ap_id"}) + end + end + + describe "lazy_put_activity_defaults/2" do + test "returns map with id and published data" do + note_activity = insert(:note_activity) + object = Object.normalize(note_activity) + res = Utils.lazy_put_activity_defaults(%{"context" => object.data["id"]}) + assert res["context"] == object.data["id"] + assert res["context_id"] == object.id + assert res["id"] + assert res["published"] + end + + test "returns map with fake id and published data" do + assert %{ + "context" => "pleroma:fakecontext", + "context_id" => -1, + "id" => "pleroma:fakeid", + "published" => _ + } = Utils.lazy_put_activity_defaults(%{}, true) + end + + test "returns activity data with object" do + note_activity = insert(:note_activity) + object = Object.normalize(note_activity) + + res = + Utils.lazy_put_activity_defaults(%{ + "context" => object.data["id"], + "object" => %{} + }) + + assert res["context"] == object.data["id"] + assert res["context_id"] == object.id + assert res["id"] + assert res["published"] + assert res["object"]["id"] + assert res["object"]["published"] + assert res["object"]["context"] == object.data["id"] + assert res["object"]["context_id"] == object.id + end + end + + describe "make_flag_data" do + test "returns empty map when params is invalid" do + assert Utils.make_flag_data(%{}, %{}) == %{} + end + + test "returns map with Flag object" do + reporter = insert(:user) + target_account = insert(:user) + {:ok, activity} = CommonAPI.post(target_account, %{"status" => "foobar"}) + context = Utils.generate_context_id() + content = "foobar" + + target_ap_id = target_account.ap_id + activity_ap_id = activity.data["id"] + + res = + Utils.make_flag_data( + %{ + actor: reporter, + context: context, + account: target_account, + statuses: [%{"id" => activity.data["id"]}], + content: content + }, + %{} + ) + + assert %{ + "type" => "Flag", + "content" => ^content, + "context" => ^context, + "object" => [^target_ap_id, ^activity_ap_id], + "state" => "open" + } = res + end + end + + describe "add_announce_to_object/2" do + test "adds actor to announcement" do + user = insert(:user) + object = insert(:note) + + activity = + insert(:note_activity, + data: %{ + "actor" => user.ap_id, + "cc" => [Pleroma.Constants.as_public()] + } + ) + + assert {:ok, updated_object} = Utils.add_announce_to_object(activity, object) + assert updated_object.data["announcements"] == [user.ap_id] + assert updated_object.data["announcement_count"] == 1 + end + end + + describe "remove_announce_from_object/2" do + test "removes actor from announcements" do + user = insert(:user) + user2 = insert(:user) + + object = + insert(:note, + data: %{"announcements" => [user.ap_id, user2.ap_id], "announcement_count" => 2} + ) + + activity = insert(:note_activity, data: %{"actor" => user.ap_id}) + + assert {:ok, updated_object} = Utils.remove_announce_from_object(activity, object) + assert updated_object.data["announcements"] == [user2.ap_id] + assert updated_object.data["announcement_count"] == 1 + end + end end From a890451187f0b1507be96ccf144b18fdb8294dd8 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Wed, 4 Sep 2019 17:42:27 +0300 Subject: [PATCH 100/400] fetch_announcements -> take_announcements --- lib/pleroma/web/activity_pub/utils.ex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index cf82d1a9b..0d87b9220 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -518,7 +518,7 @@ def add_announce_to_object( %Activity{data: %{"actor" => actor, "cc" => [Pleroma.Constants.as_public()]}}, object ) do - announcements = fetch_announcements(object) + announcements = take_announcements(object) with announcements <- Enum.uniq([actor | announcements]) do update_element_in_object("announcement", announcements, object) @@ -530,16 +530,16 @@ def add_announce_to_object(_, object), do: {:ok, object} @spec remove_announce_from_object(Activity.t(), Object.t()) :: {:ok, Object.t()} | {:error, Ecto.Changeset.t()} def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do - with announcements <- List.delete(fetch_announcements(object), actor) do + with announcements <- List.delete(take_announcements(object), actor) do update_element_in_object("announcement", announcements, object) end end - defp fetch_announcements(%{data: %{"announcements" => announcements}} = _) + defp take_announcements(%{data: %{"announcements" => announcements}} = _) when is_list(announcements), do: announcements - defp fetch_announcements(_), do: [] + defp take_announcements(_), do: [] #### Unfollow-related helpers From 2975da284b75c846a99a56ce70a91ebc3cc43f33 Mon Sep 17 00:00:00 2001 From: Sadposter Date: Wed, 4 Sep 2019 15:45:40 +0100 Subject: [PATCH 101/400] truncate remote user bio/display name --- lib/pleroma/user.ex | 16 +++++++++++++++- test/user_test.exs | 45 +++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 29fd6d2ea..87e56b5b4 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -174,11 +174,25 @@ def following_count(%User{} = user) do |> Repo.aggregate(:count, :id) end + defp truncate_if_exists(params, key, max_length) do + if Map.has_key?(params, key) do + {value, _chopped} = String.split_at(params[key], max_length) + Map.put(params, key, value) + else + params + end + end + def remote_user_creation(params) do bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000) name_limit = Pleroma.Config.get([:instance, :user_name_length], 100) - params = Map.put(params, :info, params[:info] || %{}) + params = + params + |> Map.put(:info, params[:info] || %{}) + |> truncate_if_exists(:name, name_limit) + |> truncate_if_exists(:bio, bio_limit) + info_cng = User.Info.remote_user_creation(%User.Info{}, params[:info]) changes = diff --git a/test/user_test.exs b/test/user_test.exs index 92a48f630..45f998ff8 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -570,22 +570,6 @@ test "it has required fields" do refute cs.valid? end) end - - test "it restricts some sizes" do - bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000) - name_limit = Pleroma.Config.get([:instance, :user_name_length], 100) - - [bio: bio_limit, name: name_limit] - |> Enum.each(fn {field, size} -> - string = String.pad_leading(".", size) - cs = User.remote_user_creation(Map.put(@valid_remote, field, string)) - assert cs.valid? - - string = String.pad_leading(".", size + 1) - cs = User.remote_user_creation(Map.put(@valid_remote, field, string)) - refute cs.valid? - end) - end end describe "followers and friends" do @@ -1142,6 +1126,35 @@ test "with overly long fields" do assert {:ok, %User{}} = User.insert_or_update_user(data) end + + test "with an overly long bio" do + current_max_length = Pleroma.Config.get([:instance, :user_bio_length], 5000) + user = insert(:user, nickname: "nickname@supergood.domain") + + data = %{ + ap_id: user.ap_id, + name: user.name, + nickname: user.nickname, + bio: String.duplicate("h", current_max_length + 1), + info: %{} + } + + assert {:ok, %User{}} = User.insert_or_update_user(data) + end + + test "with an overly long display name" do + current_max_length = Pleroma.Config.get([:instance, :user_name_length], 100) + user = insert(:user, nickname: "nickname@supergood.domain") + + data = %{ + ap_id: user.ap_id, + name: String.duplicate("h", current_max_length + 1), + nickname: user.nickname, + info: %{} + } + + assert {:ok, %User{}} = User.insert_or_update_user(data) + end end describe "per-user rich-text filtering" do From cb99cfcc65f57f0044117ebd12d040488343d9ef Mon Sep 17 00:00:00 2001 From: Sadposter Date: Wed, 4 Sep 2019 15:57:42 +0100 Subject: [PATCH 102/400] don't try to truncate non-strings --- lib/pleroma/user.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 87e56b5b4..e2ebce6fc 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -175,7 +175,7 @@ def following_count(%User{} = user) do end defp truncate_if_exists(params, key, max_length) do - if Map.has_key?(params, key) do + if Map.has_key?(params, key) and is_binary(params[key]) do {value, _chopped} = String.split_at(params[key], max_length) Map.put(params, key, value) else From af746fa4a814dbacd4fe4a3e58b1ee1732363d22 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Wed, 4 Sep 2019 20:08:13 +0300 Subject: [PATCH 103/400] Return total for reports --- CHANGELOG.md | 3 ++- docs/api/admin_api.md | 1 + lib/pleroma/web/admin_api/admin_api_controller.ex | 6 ++---- lib/pleroma/web/admin_api/views/report_view.ex | 3 ++- test/web/admin_api/admin_api_controller_test.exs | 8 ++++++++ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a414ba5e0..942605f28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template -– Pagination: (optional) return `total` alongside with `items` when paginating +- Pagination: (optional) return `total` alongside with `items` when paginating +- Admin API: Return `total` when querying for reports ### Fixed - Following from Osada diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index d79c342be..5a090c720 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -313,6 +313,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ```json { + "total" : 1, "reports": [ { "account": { diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 544b9d7d8..2a1cc59e5 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -442,11 +442,9 @@ def list_reports(conn, params) do params |> Map.put("type", "Flag") |> Map.put("skip_preload", true) + |> Map.put("total", true) - reports = - [] - |> ActivityPub.fetch_activities(params) - |> Enum.reverse() + reports = ActivityPub.fetch_activities([], params) conn |> put_view(ReportView) diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex index a25f3f1fe..0b8745b2e 100644 --- a/lib/pleroma/web/admin_api/views/report_view.ex +++ b/lib/pleroma/web/admin_api/views/report_view.ex @@ -12,7 +12,8 @@ defmodule Pleroma.Web.AdminAPI.ReportView do def render("index.json", %{reports: reports}) do %{ - reports: render_many(reports, __MODULE__, "show.json", as: :report) + reports: render_many(reports[:items], __MODULE__, "show.json", as: :report), + total: reports[:total] } end diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 4e2c27431..b1ddd898b 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1309,6 +1309,7 @@ test "returns empty response when no reports created", %{conn: conn} do |> json_response(:ok) assert Enum.empty?(response["reports"]) + assert response["total"] == 0 end test "returns reports", %{conn: conn} do @@ -1331,6 +1332,8 @@ test "returns reports", %{conn: conn} do assert length(response["reports"]) == 1 assert report["id"] == report_id + + assert response["total"] == 1 end test "returns reports with specified state", %{conn: conn} do @@ -1364,6 +1367,8 @@ test "returns reports with specified state", %{conn: conn} do assert length(response["reports"]) == 1 assert open_report["id"] == first_report_id + assert response["total"] == 1 + response = conn |> get("/api/pleroma/admin/reports", %{ @@ -1376,6 +1381,8 @@ test "returns reports with specified state", %{conn: conn} do assert length(response["reports"]) == 1 assert closed_report["id"] == second_report_id + assert response["total"] == 1 + response = conn |> get("/api/pleroma/admin/reports", %{ @@ -1384,6 +1391,7 @@ test "returns reports with specified state", %{conn: conn} do |> json_response(:ok) assert Enum.empty?(response["reports"]) + assert response["total"] == 0 end test "returns 403 when requested by a non-admin" do From 8306078de1abade082f932cda5b8d9297bdcdc80 Mon Sep 17 00:00:00 2001 From: Maksim Date: Wed, 4 Sep 2019 17:31:14 +0000 Subject: [PATCH 104/400] Apply suggestion to lib/pleroma/web/activity_pub/utils.ex --- lib/pleroma/web/activity_pub/utils.ex | 33 +++++++++++---------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 0d87b9220..2de02f607 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -356,26 +356,19 @@ def update_follow_state_for_all( %Activity{data: %{"actor" => actor, "object" => object}} = activity, state ) do - query = - from(activity in Activity, - where: fragment("data->>'type' = 'Follow'"), - where: fragment("data->>'state' = 'pending'"), - where: fragment("data->>'actor' = ?", ^actor), - where: fragment("data->>'object' = ?", ^object), - update: [ - set: [ - data: fragment("jsonb_set(data, '{state}', ?)", ^state) - ] - ] - ) - - with {_, _} <- Repo.update_all(query, []), - {_, _} <- User.set_follow_state_cache(actor, object, state), - %Activity{} = activity <- Activity.get_by_id(activity.id) do - {:ok, activity} - else - e -> {:error, e} - end + "Follow" + |> Activity.Queries.by_type() + |> Activity.Queries.by_actor(actor) + |> Activity.Queries.by_object_id(object["id"]) + |> where(fragment("data->>'state' = 'pending'")) + |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) + |> Repo.update_all([]) + + User.set_follow_state_cache(actor, object, state) + + activity = Activity.get_by_id(activity.id) + + {:ok, activity} end def update_follow_state( From e2011a667cdf5e67f257c9c30a02c206fb4df913 Mon Sep 17 00:00:00 2001 From: Maksim Date: Wed, 4 Sep 2019 18:35:01 +0000 Subject: [PATCH 105/400] Apply suggestion to lib/pleroma/web/activity_pub/utils.ex --- lib/pleroma/web/activity_pub/utils.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 2de02f607..011acd48e 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -359,7 +359,7 @@ def update_follow_state_for_all( "Follow" |> Activity.Queries.by_type() |> Activity.Queries.by_actor(actor) - |> Activity.Queries.by_object_id(object["id"]) + |> Activity.Queries.by_object_id(object) |> where(fragment("data->>'state' = 'pending'")) |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) |> Repo.update_all([]) From ae506ca997619f118d18703a9b0802246eb427d5 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Wed, 4 Sep 2019 21:40:53 +0300 Subject: [PATCH 106/400] fix formatting --- lib/pleroma/web/activity_pub/utils.ex | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 011acd48e..72e07b59d 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -356,19 +356,19 @@ def update_follow_state_for_all( %Activity{data: %{"actor" => actor, "object" => object}} = activity, state ) do - "Follow" - |> Activity.Queries.by_type() - |> Activity.Queries.by_actor(actor) - |> Activity.Queries.by_object_id(object) - |> where(fragment("data->>'state' = 'pending'")) - |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) - |> Repo.update_all([]) - - User.set_follow_state_cache(actor, object, state) - - activity = Activity.get_by_id(activity.id) - - {:ok, activity} + "Follow" + |> Activity.Queries.by_type() + |> Activity.Queries.by_actor(actor) + |> Activity.Queries.by_object_id(object) + |> where(fragment("data->>'state' = 'pending'")) + |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) + |> Repo.update_all([]) + + User.set_follow_state_cache(actor, object, state) + + activity = Activity.get_by_id(activity.id) + + {:ok, activity} end def update_follow_state( From 053b17f57ecd9e1c3f82118e2a5e5c3b2937969d Mon Sep 17 00:00:00 2001 From: Ashlynn Anderson Date: Wed, 4 Sep 2019 14:56:26 -0400 Subject: [PATCH 107/400] Switch to alpine:3.9 to avoid dlsym errors --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59a352bbc..c61dcfde9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\ mkdir release &&\ mix release --path release -FROM alpine:latest +FROM alpine:3.9 ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma From 558969a0fd7f64387e59a54b5733d63d3a46a031 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 5 Sep 2019 08:32:49 +0300 Subject: [PATCH 108/400] Do not crash if one notification failed to render --- CHANGELOG.md | 1 + lib/pleroma/web/mastodon_api/views/notification_view.ex | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f4580f7..80aed3491 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Federation/MediaProxy not working with instances that have wrong certificate order - Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`) - Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity +- Mastodon API: Notifications endpoint crashing if one notification failed to render - Mastodon API: follower/following counters not being nullified, when `hide_follows`/`hide_followers` is set - Mastodon API: `muted` in the Status entity, using author's account to determine if the tread was muted - Mastodon API: Add `account_id`, `type`, `offset`, and `limit` to search API (`/api/v1/search` and `/api/v2/search`) diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex index 27e9cab06..ec8eadcaa 100644 --- a/lib/pleroma/web/mastodon_api/views/notification_view.ex +++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do alias Pleroma.Web.MastodonAPI.StatusView def render("index.json", %{notifications: notifications, for: user}) do - render_many(notifications, NotificationView, "show.json", %{for: user}) + safe_render_many(notifications, NotificationView, "show.json", %{for: user}) end def render("show.json", %{ From b312ca3d528305ebc3b0c72799af535a406ce251 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 5 Sep 2019 11:58:02 +0300 Subject: [PATCH 109/400] Mastodon API Poll view: Fix handling of polls without an end date --- CHANGELOG.md | 1 + .../web/mastodon_api/views/status_view.ex | 31 +++++++++++++------ .../tesla_mock/misskey_poll_no_end_date.json | 1 + test/fixtures/tesla_mock/sjw.json | 1 + test/support/http_request_mock.ex | 12 +++++++ .../mastodon_api/views/status_view_test.exs | 8 +++++ 6 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 test/fixtures/tesla_mock/misskey_poll_no_end_date.json create mode 100644 test/fixtures/tesla_mock/sjw.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f4e7a132..fbbaf18f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - `federation_incoming_replies_max_depth` option being ignored in certain cases - Federation/MediaProxy not working with instances that have wrong certificate order - Mastodon API: Handling of search timeouts (`/api/v1/search` and `/api/v2/search`) +- Mastodon API: Misskey's endless polls being unable to render - Mastodon API: Embedded relationships not being properly rendered in the Account entity of Status entity - Mastodon API: Notifications endpoint crashing if one notification failed to render - Mastodon API: follower/following counters not being nullified, when `hide_follows`/`hide_followers` is set diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 4c3c8c564..e71083b91 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -385,16 +385,27 @@ def render("poll.json", %{object: object} = opts) do end if options do - end_time = - (object.data["closed"] || object.data["endTime"]) - |> NaiveDateTime.from_iso8601!() + {end_time, expired} = + case object.data["closed"] || object.data["endTime"] do + end_time when is_binary(end_time) -> + end_time = + (object.data["closed"] || object.data["endTime"]) + |> NaiveDateTime.from_iso8601!() - expired = - end_time - |> NaiveDateTime.compare(NaiveDateTime.utc_now()) - |> case do - :lt -> true - _ -> false + expired = + end_time + |> NaiveDateTime.compare(NaiveDateTime.utc_now()) + |> case do + :lt -> true + _ -> false + end + + end_time = Utils.to_masto_date(end_time) + + {end_time, expired} + + _ -> + {nil, false} end voted = @@ -421,7 +432,7 @@ def render("poll.json", %{object: object} = opts) do # Mastodon uses separate ids for polls, but an object can't have # more than one poll embedded so object id is fine id: to_string(object.id), - expires_at: Utils.to_masto_date(end_time), + expires_at: end_time, expired: expired, multiple: multiple, votes_count: votes_count, diff --git a/test/fixtures/tesla_mock/misskey_poll_no_end_date.json b/test/fixtures/tesla_mock/misskey_poll_no_end_date.json new file mode 100644 index 000000000..0e08de4de --- /dev/null +++ b/test/fixtures/tesla_mock/misskey_poll_no_end_date.json @@ -0,0 +1 @@ +{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"Hashtag":"as:Hashtag"}],"id":"https://skippers-bin.com/notes/7x9tmrp97i","type":"Question","attributedTo":"https://skippers-bin.com/users/7v1w1r8ce6","summary":null,"content":"

@march@marchgenso.me How are your notifications now?
リモートで結果を表示

","_misskey_content":"@march@marchgenso.me How are your notifications now?\n[リモートで結果を表示](https://skippers-bin.com/notes/7x9tmrp97i)","published":"2019-09-05T05:35:32.541Z","to":["https://www.w3.org/ns/activitystreams#Public"],"cc":["https://skippers-bin.com/users/7v1w1r8ce6/followers","https://marchgenso.me/users/march"],"inReplyTo":null,"attachment":[],"sensitive":false,"tag":[{"type":"Mention","href":"https://marchgenso.me/users/march","name":"@march@marchgenso.me"}],"_misskey_fallback_content":"

@march@marchgenso.me How are your notifications now?
リモートで結果を表示
----------------------------------------
0: Working
1: Broken af
----------------------------------------
番号を返信して投票

","endTime":null,"oneOf":[{"type":"Note","name":"Working","replies":{"type":"Collection","totalItems":0}},{"type":"Note","name":"Broken af","replies":{"type":"Collection","totalItems":1}}]} \ No newline at end of file diff --git a/test/fixtures/tesla_mock/sjw.json b/test/fixtures/tesla_mock/sjw.json new file mode 100644 index 000000000..ff64478d3 --- /dev/null +++ b/test/fixtures/tesla_mock/sjw.json @@ -0,0 +1 @@ +{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"Hashtag":"as:Hashtag"}],"type":"Person","id":"https://skippers-bin.com/users/7v1w1r8ce6","inbox":"https://skippers-bin.com/users/7v1w1r8ce6/inbox","outbox":"https://skippers-bin.com/users/7v1w1r8ce6/outbox","followers":"https://skippers-bin.com/users/7v1w1r8ce6/followers","following":"https://skippers-bin.com/users/7v1w1r8ce6/following","featured":"https://skippers-bin.com/users/7v1w1r8ce6/collections/featured","sharedInbox":"https://skippers-bin.com/inbox","endpoints":{"sharedInbox":"https://skippers-bin.com/inbox"},"url":"https://skippers-bin.com/@sjw","preferredUsername":"sjw","name":"It's ya boi sjw :verified:","summary":"

Admin of skippers-bin.com and neckbeard.xyz
For the most part I'm just a normal user. I mostly post animu, lewds, may-mays, and shitposts.

Not an alt of @sjw@neckbeard.xyz but another main.

Email/XMPP: neckbeard@rape.lol
PGP: d016 b622 75ba bcbc 5b3a fced a7d9 4824 0eb3 9c4e

","icon":{"type":"Image","url":"https://skippers-bin.com/files/webpublic-21b17f5b-3a83-4f50-8d4f-eda92066aa26","sensitive":false},"image":{"type":"Image","url":"https://skippers-bin.com/files/webpublic-1cd7f961-421e-4c31-aa03-74fb82584308","sensitive":false},"tag":[{"id":"https://skippers-bin.com/emojis/verified","type":"Emoji","name":":verified:","updated":"2019-07-12T02:16:12.088Z","icon":{"type":"Image","mediaType":"image/png","url":"https://skippers-bin.com/files/webpublic-dd10b435-6dad-4602-938b-f69ec0a19f2c"}}],"manuallyApprovesFollowers":false,"publicKey":{"id":"https://skippers-bin.com/users/7v1w1r8ce6/publickey","type":"Key","owner":"https://skippers-bin.com/users/7v1w1r8ce6","publicKeyPem":"-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAvmp71/A6Oxe1UW/44HK0juAJhrjv9gYhaoslaS9K1FB+BHfIjaE9\n9+W2SKRLnVNYNFSN4JJrSGhX5RUjAsf4tcdRDVcmHl7tp2sgOAZeZz5geULm2sJQ\nwElnGk34jT/xCfX+w/O+7DuX31sU7ZK0B2P7ulNGDQXhrzVO0RMx7HhNcsFcusno\n3kmPyyPT1l+PbM2UNWms599/3yicKtuOzMgzxNeXvuHYtAO19txyPiOeYckQOMmT\nwEVIxypgCgNQ0MNtPLPKQTwOgVbvnN7MN+h3esKeKDcPcGQySkbkjZPaVnA6xCQf\nj58c19wqdCfAS4Effo5/bxVmhLpe0l9HYpV7IMasv2LhFntmSmAxBQzhdz0oTYb1\naNqiyfZdClnzutOiKcrFppADo4rZH9Z1WlPHapahrKbF0GRPN8DjSUsoBxfY9wZs\ntlL056hT4o+EFHYrRGo7KP6X/6aQ9sSsmpE08aVpVuXdwuaoaDlW1KrJ0oOk4lZw\nUNXvjEaN3c+VQAw2CNvkAqLuwrjnw7MdcxEGodEXb6s8VvoSOaiDqT7cexSaZe0R\nliCe/3dqFXpX1UrgRiryI4yc1BrEJIGTanchmP2aUJ2R2pccFsREp23C3vMN3M5b\nHw7fvKbUQHyf6lhRoLCOSCz1xaPutaMJmpwLuJo4wPCHGg9QFBYsqxcCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n"},"isCat":true} diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 05eebbe9b..231e7c498 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -992,6 +992,18 @@ def get("http://example.com/rel_me/null", _, _, _) do {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_null.html")}} end + def get("https://skippers-bin.com/notes/7x9tmrp97i", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: File.read!("test/fixtures/tesla_mock/misskey_poll_no_end_date.json") + }} + end + + def get("https://skippers-bin.com/users/7v1w1r8ce6", _, _, _) do + {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/sjw.json")}} + end + def get(url, query, body, headers) do {:error, "Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{ diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 90451cbdc..fcdd7fbcb 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -551,6 +551,14 @@ test "detects vote status" do assert Enum.at(result[:options], 1)[:votes_count] == 1 assert Enum.at(result[:options], 2)[:votes_count] == 1 end + + test "does not crash on polls with no end date" do + object = Object.normalize("https://skippers-bin.com/notes/7x9tmrp97i") + result = StatusView.render("poll.json", %{object: object}) + + assert result[:expires_at] == nil + assert result[:expired] == false + end end test "embeds a relationship in the account" do From 26fe6f70c9cd6a37e72f4795a1a9a316ef5d95fb Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 5 Sep 2019 15:33:49 +0300 Subject: [PATCH 110/400] Move checking for restrict_local to User.get_cached_by_id_or_nickname --- lib/pleroma/user.ex | 18 ++++++++++--- .../controllers/mastodon_api_controller.ex | 25 ++----------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index d68015a80..3aa245f2a 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -570,10 +570,20 @@ def get_cached_by_nickname(nickname) do end def get_cached_by_nickname_or_id(nickname_or_id, opts \\ []) do - if is_integer(nickname_or_id) or Pleroma.FlakeId.is_flake_id?(nickname_or_id) do - get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) - else - unless opts[:restrict_remote_nicknames], do: get_cached_by_nickname(nickname_or_id) + restrict_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) + + cond do + is_integer(nickname_or_id) or Pleroma.FlakeId.is_flake_id?(nickname_or_id) -> + get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) + + restrict_to_local == false -> + get_cached_by_nickname(nickname_or_id) + + restrict_to_local == :unauthenticated and match?(%User{}, opts[:for]) -> + get_cached_by_nickname(nickname_or_id) + + true -> + nil end end diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index c5f281976..8dfad7a54 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -290,7 +290,7 @@ def verify_app_credentials(%{assigns: %{user: _user, token: token}} = conn, _) d end def user(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do - with %User{} = user <- get_user_by_nickname_or_id(for_user, nickname_or_id), + with %User{} = user <- User.get_cached_by_nickname_or_id(nickname_or_id, for: for_user), true <- User.auth_active?(user) || user.id == for_user.id || User.superuser?(for_user) do account = AccountView.render("account.json", %{user: user, for: for_user}) json(conn, account) @@ -390,7 +390,7 @@ def public_timeline(%{assigns: %{user: user}} = conn, params) do end def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do - with %User{} = user <- get_user_by_nickname_or_id(reading_user, params["id"]) do + with %User{} = user <- User.get_cached_by_nickname_or_id(params["id"], for: reading_user) do params = params |> Map.put("tag", params["tagged"]) @@ -1697,25 +1697,4 @@ def try_render(conn, _, _) do defp present?(nil), do: false defp present?(false), do: false defp present?(_), do: true - - defp get_user_by_nickname_or_id(for_user, nickname_or_id) do - restrict_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) - - opts = - cond do - restrict_to_local == :all -> - [restrict_remote_nicknames: true] - - restrict_to_local == false -> - [] - - restrict_to_local == :unauthenticated and match?(%User{}, for_user) -> - [] - - true -> - [restrict_remote_nicknames: true] - end - - User.get_cached_by_nickname_or_id(nickname_or_id, opts) - end end From 736165c082d34ef4d52367ea8315c228a1df3944 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Thu, 5 Sep 2019 16:54:34 +0300 Subject: [PATCH 111/400] Reverse reports list --- lib/pleroma/web/admin_api/views/report_view.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex index 0b8745b2e..51b95ad5e 100644 --- a/lib/pleroma/web/admin_api/views/report_view.ex +++ b/lib/pleroma/web/admin_api/views/report_view.ex @@ -12,7 +12,8 @@ defmodule Pleroma.Web.AdminAPI.ReportView do def render("index.json", %{reports: reports}) do %{ - reports: render_many(reports[:items], __MODULE__, "show.json", as: :report), + reports: + render_many(reports[:items], __MODULE__, "show.json", as: :report) |> Enum.reverse(), total: reports[:total] } end From 3523bdcf262dddc7bdf14d759538097f8838cddb Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 5 Sep 2019 22:21:20 +0300 Subject: [PATCH 112/400] Call TrailingFormatPlug for /api/pleroma/emoji Apparently Pleroma-FE still calls it with trailing '.json' --- lib/pleroma/plugs/trailing_format_plug.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/plugs/trailing_format_plug.ex b/lib/pleroma/plugs/trailing_format_plug.ex index 2473e07fe..ce366b218 100644 --- a/lib/pleroma/plugs/trailing_format_plug.ex +++ b/lib/pleroma/plugs/trailing_format_plug.ex @@ -23,7 +23,8 @@ defmodule Pleroma.Plugs.TrailingFormatPlug do "/nodeinfo", "/api/help", "/api/externalprofile", - "/notice" + "/notice", + "/api/pleroma/emoji" ] def init(opts) do From 16e6be340dc56aa03a1a9eed77843962ce97d5ca Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 6 Sep 2019 11:31:44 +0300 Subject: [PATCH 113/400] Update frontend bundle to e75ac9dd --- priv/static/index.html | 2 +- priv/static/static/config.json | 1 - ...a6198.css => app.cb3673e4b661fd9526ea.css} | Bin 1667 -> 1876 bytes .../css/app.cb3673e4b661fd9526ea.css.map | 1 + .../css/app.db80066bde2c96ea6198.css.map | 1 - priv/static/static/font/LICENSE.txt | 0 priv/static/static/font/README.txt | 0 priv/static/static/font/config.json | 26 ++++++++++++++---- .../static/static/font/css/fontello-codes.css | Bin 2430 -> 2495 bytes .../static/font/css/fontello-embedded.css | Bin 44496 -> 45517 bytes .../static/font/css/fontello-ie7-codes.css | Bin 4674 -> 4790 bytes priv/static/static/font/css/fontello-ie7.css | Bin 4925 -> 5041 bytes priv/static/static/font/css/fontello.css | Bin 4161 -> 4226 bytes priv/static/static/font/demo.html | 21 ++++++++------ priv/static/static/font/font/fontello.eot | Bin 19060 -> 19452 bytes priv/static/static/font/font/fontello.svg | 4 ++- priv/static/static/font/font/fontello.ttf | Bin 18892 -> 19284 bytes priv/static/static/font/font/fontello.woff | Bin 11452 -> 11776 bytes priv/static/static/font/font/fontello.woff2 | Bin 9724 -> 9980 bytes .../static/js/app.670c36c0acc42fadb4fe.js | Bin 856921 -> 0 bytes .../static/js/app.670c36c0acc42fadb4fe.js.map | Bin 1429874 -> 0 bytes .../static/js/app.8098503330c7dd14a415.js | Bin 0 -> 961729 bytes .../static/js/app.8098503330c7dd14a415.js.map | Bin 0 -> 1499246 bytes .../js/vendors~app.4b7be53256fba5c365c9.js | Bin 430333 -> 0 bytes .../vendors~app.4b7be53256fba5c365c9.js.map | Bin 1994198 -> 0 bytes .../js/vendors~app.4cedffe4993b111c7421.js | Bin 0 -> 465520 bytes .../vendors~app.4cedffe4993b111c7421.js.map | Bin 0 -> 2162926 bytes priv/static/sw-pleroma.js | Bin 31068 -> 31068 bytes 28 files changed, 37 insertions(+), 19 deletions(-) rename priv/static/static/css/{app.db80066bde2c96ea6198.css => app.cb3673e4b661fd9526ea.css} (84%) create mode 100644 priv/static/static/css/app.cb3673e4b661fd9526ea.css.map delete mode 100644 priv/static/static/css/app.db80066bde2c96ea6198.css.map mode change 100644 => 100755 priv/static/static/font/LICENSE.txt mode change 100644 => 100755 priv/static/static/font/README.txt mode change 100644 => 100755 priv/static/static/font/config.json mode change 100644 => 100755 priv/static/static/font/demo.html delete mode 100644 priv/static/static/js/app.670c36c0acc42fadb4fe.js delete mode 100644 priv/static/static/js/app.670c36c0acc42fadb4fe.js.map create mode 100644 priv/static/static/js/app.8098503330c7dd14a415.js create mode 100644 priv/static/static/js/app.8098503330c7dd14a415.js.map delete mode 100644 priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js delete mode 100644 priv/static/static/js/vendors~app.4b7be53256fba5c365c9.js.map create mode 100644 priv/static/static/js/vendors~app.4cedffe4993b111c7421.js create mode 100644 priv/static/static/js/vendors~app.4cedffe4993b111c7421.js.map diff --git a/priv/static/index.html b/priv/static/index.html index e58c4380b..f681f4def 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/config.json b/priv/static/static/config.json index 5cdb33a0a..c82678699 100644 --- a/priv/static/static/config.json +++ b/priv/static/static/config.json @@ -6,7 +6,6 @@ "logoMargin": ".1em", "redirectRootNoLogin": "/main/all", "redirectRootLogin": "/main/friends", - "chatDisabled": false, "showInstanceSpecificPanel": false, "collapseMessageWithSubject": false, "scopeCopy": true, diff --git a/priv/static/static/css/app.db80066bde2c96ea6198.css b/priv/static/static/css/app.cb3673e4b661fd9526ea.css similarity index 84% rename from priv/static/static/css/app.db80066bde2c96ea6198.css rename to priv/static/static/css/app.cb3673e4b661fd9526ea.css index b87bc5901df3cf2fcdc41aa54fa9b67ed4be46d3..e083f12c87016ac7ca4966945c7185fe9bb87266 100644 GIT binary patch delta 237 zcmZqXy}~!~au|e8HzPGOJ)^`* z!N{xtth+3=s3bEvF-JEsCo?_IN}(jb0Ay%xVo`c#o-UAQrJ!qCP%*iVNoDePmfI8A t&P^6(lbZaTwN5TM$=J-?IMpP{%*-$?#nRNsEHzOtxwu#_H?crV9{}2iO7{Q& delta 76 zcmV-S0JHzp4ucJo$_3PsHV%;wN0Utg2$6Q$lWGCWk!}dHZvq(tll27Klj#N(leh+c i9%N!TFfcYYVq|49V>vcuVKy;2I4)yzb1rRRa4IiU$Qu0s diff --git a/priv/static/static/css/app.cb3673e4b661fd9526ea.css.map b/priv/static/static/css/app.cb3673e4b661fd9526ea.css.map new file mode 100644 index 000000000..8cecb0901 --- /dev/null +++ b/priv/static/static/css/app.cb3673e4b661fd9526ea.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_load_more/with_load_more.scss","webpack:///./src/hocs/with_subscription/with_subscription.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;AClEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACTA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.cb3673e4b661fd9526ea.css","sourcesContent":[".tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .tabs {\n display: -ms-flexbox;\n display: flex;\n position: relative;\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n content: \"\";\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher .tabs .tab-wrapper {\n height: 28px;\n position: relative;\n display: -ms-flexbox;\n display: flex;\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n}\n.tab-switcher .tabs .tab-wrapper .tab {\n width: 100%;\n min-width: 1px;\n position: relative;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding: 6px 1em;\n padding-bottom: 99px;\n margin-bottom: -93px;\n white-space: nowrap;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tabs .tab-wrapper .tab.active {\n background: transparent;\n z-index: 5;\n}\n.tab-switcher .tabs .tab-wrapper .tab img {\n max-height: 26px;\n vertical-align: top;\n margin-top: -5px;\n}\n.tab-switcher .tabs .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: 7;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}",".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}",".with-subscription-loading {\n padding: 10px;\n text-align: center;\n}\n.with-subscription-loading .error {\n font-size: 14px;\n}"],"sourceRoot":""} \ No newline at end of file diff --git a/priv/static/static/css/app.db80066bde2c96ea6198.css.map b/priv/static/static/css/app.db80066bde2c96ea6198.css.map deleted file mode 100644 index 86f0dd18f..000000000 --- a/priv/static/static/css/app.db80066bde2c96ea6198.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///./src/hocs/with_load_more/with_load_more.scss","webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_subscription/with_subscription.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACTA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACzDA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.db80066bde2c96ea6198.css","sourcesContent":[".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}",".tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .tabs {\n display: flex;\n position: relative;\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n content: \"\";\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher .tabs .tab-wrapper {\n height: 28px;\n position: relative;\n display: flex;\n flex: 0 0 auto;\n}\n.tab-switcher .tabs .tab-wrapper .tab {\n width: 100%;\n min-width: 1px;\n position: relative;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding: 6px 1em;\n padding-bottom: 99px;\n margin-bottom: -93px;\n white-space: nowrap;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tabs .tab-wrapper .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tabs .tab-wrapper .tab.active {\n background: transparent;\n z-index: 5;\n}\n.tab-switcher .tabs .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: 7;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}",".with-subscription-loading {\n padding: 10px;\n text-align: center;\n}\n.with-subscription-loading .error {\n font-size: 14px;\n}"],"sourceRoot":""} \ No newline at end of file diff --git a/priv/static/static/font/LICENSE.txt b/priv/static/static/font/LICENSE.txt old mode 100644 new mode 100755 diff --git a/priv/static/static/font/README.txt b/priv/static/static/font/README.txt old mode 100644 new mode 100755 diff --git a/priv/static/static/font/config.json b/priv/static/static/font/config.json old mode 100644 new mode 100755 index baa2c763a..72a48a74f --- a/priv/static/static/font/config.json +++ b/priv/static/static/font/config.json @@ -150,12 +150,6 @@ "code": 61669, "src": "fontawesome" }, - { - "uid": "cd21cbfb28ad4d903cede582157f65dc", - "css": "bell", - "code": 59408, - "src": "fontawesome" - }, { "uid": "ccc2329632396dc096bb638d4b46fb98", "css": "mail-alt", @@ -277,6 +271,26 @@ "search": [ "ellipsis" ] + }, + { + "uid": "0bef873af785ead27781fdf98b3ae740", + "css": "bell-ringing-o", + "code": 59408, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M497.8 0C468.3 0 444.4 23.9 444.4 53.3 444.4 61.1 446.1 68.3 448.9 75 301.7 96.7 213.3 213.3 213.3 320 213.3 588.3 117.8 712.8 35.6 782.2 35.6 821.1 67.8 853.3 106.7 853.3H355.6C355.6 931.7 419.4 995.6 497.8 995.6S640 931.7 640 853.3H888.9C927.8 853.3 960 821.1 960 782.2 877.8 712.8 782.2 588.3 782.2 320 782.2 213.3 693.9 96.7 546.7 75 549.4 68.3 551.1 61.1 551.1 53.3 551.1 23.9 527.2 0 497.8 0ZM189.4 44.8C108.4 118.6 70.5 215.1 71.1 320.2L142.2 319.8C141.7 231.2 170.4 158.3 237.3 97.4L189.4 44.8ZM806.2 44.8L758.3 97.4C825.2 158.3 853.9 231.2 853.3 319.8L924.4 320.2C925.1 215.1 887.2 118.6 806.2 44.8ZM408.9 844.4C413.9 844.4 417.8 848.3 417.8 853.3 417.8 897.2 453.9 933.3 497.8 933.3 502.8 933.3 506.7 937.2 506.7 942.2S502.8 951.1 497.8 951.1C443.9 951.1 400 907.2 400 853.3 400 848.3 403.9 844.4 408.9 844.4Z", + "width": 1000 + }, + "search": [ + "bell-ringing-o" + ] + }, + { + "uid": "0b2b66e526028a6972d51a6f10281b4b", + "css": "zoom-in", + "code": 59420, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/priv/static/static/font/css/fontello-codes.css b/priv/static/static/font/css/fontello-codes.css index 5f84df3495556626491fe31472233845489c3945..2083f618addd3afcc4a643e0a672612cf6570c68 100755 GIT binary patch delta 57 zcmew-v|o5bIWw1TQD$B`5b5Sm+$g@ek2#Hry(&LHS2r^c$mcUmR<~BDRnXT`P=B{z K&gPe_Q<(u_n-stR delta 17 Ycmdll{7+~@IrHX5=31uBrfglz06_%?J^%m! diff --git a/priv/static/static/font/css/fontello-embedded.css b/priv/static/static/font/css/fontello-embedded.css index b4079ea061ec04518d4add376dba797e24e77aed..ad4246e6efe505aee71fb585b3895651f668684f 100755 GIT binary patch literal 45517 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 literal 44496 zcmeFZN3+B*lNff_uh=Rb)+$QkFbv6&OJy;KVb0`@nZulh$>slU%=>mN+2tS~d^78j zZ;;VIqtWPq|5A>__8-b5EB@(!{x|>hPyZ6?Ki&18{^_58p`z=?fBqjq(z;~->7Tw! z_dopefBcW|FXiv^Oa70=xcyHUfuXM#`Op9Ezd!H4{S@Wr{O5lMT3z~N`yc+f=+h$4 zi~K)~Q!#AURQ&V5`}d&bzvutF<#n(AwdH^NzxDRNRtS>+(V;)Mj^b0*+kg6};n!UE z>*rtex?NrIUt|B5fAe4dqW|BGNuF%Ue@dpQ`((-X83%aGwqpAa>$Vh0|39Y5S`hfZ z&mS+*u4sn-J?ur%H24FLlN~f|{r&vE_%M=(_$)|df?p19{r&W0dF_h!<*K&~!lL&} zvOra|5J4)U;}MF~*)KA$evvKs@YV{Q(DiKc!TLpVCiu{d_WM@M4nr?7K4SC%g8HvV ze}!0#eYY_a$Ea}s>SGP?q3K_v^siGi!wjj^_28FGfRBWLT%3S9M~wM>-9-VYimiV+ zY3;Ao$Uka!Ohk|dlHSrE@V^vVp-Y9K>oE;&90bSi7b*Te>|@Mt81K(LLU|Buex0Pl z-$yv?&-pdeK)`?fd;7mg`ma8j7FjNdzfpkvs+xZ3bol$K`mH=lIb`+>`}J=bK_uh< zN)>%(T>#-FrTfbXngdBc(CGT>GjH<52T`wLk*RP|J|dNAB1t)^qpNXkQ&g>MT2ZN@ zh^AZaxcZwPv>UZ6%M@v9J}a>`WHI4BUA0eZq(Z8)&iFPoni_BVgR)AVSS67>G`@k`$BT>Q!fp`m%edpk1Af6@;Bf=>YDOgBSsGd#^lg};B zGwGh$22JIz(uBKK`@OyR!l@r*$;?JM!WDPMZ@({;vx#_`<7-YHOdMt-i{THPdmR9u z-bj#yrE3Go3a`&<_UPCPnWN0*lavva{$?t=W7b})!uZ;{gjEG@pY~l;Fo-EB)J-y| z!pd&h#fxfN)g3Zrc1Nrn?mW~`)N_JKjacYwcgnh-xf>`Wwwm-X)h(ua;V~N6TF23% zV25w>Z!|!cEUzCnFLx}mEDX<^YZ1g#TN<@(uU~W$a{c-|UWD^Z@rU^G^A{vG%X@Xd z^(01jE>^Gg@AeKr@dwOqf9$9h!4IgM6`HZeT8ga zZT$4tg|W4xC`)bG_OsJH=LtD)*1F#eg<8})4}1}Fu>4ukw~_e^qi&l??Vs0k!m_7H z3T29j=#!_*OD0#`I3J1+@d2{cnCiHsQ+s@vhWSHT(c<)AG%=}Z5@|A9v<0&ok)2A} zv)(sU-zHuM4w|`e@7RQ%tP}5A#n!psQ#D5^!0~FzvPTr;T>h|H8!=HwJ8rb+@B%ia z;vGjSe<--5ZG?RV8Ovx>6lxDAACIi3yEt0sxeUHN*L1nR@ByVjWWLxP^&D}8!J_6& zxf4kZUs9-`cBW^i4f&+pi8gV`+soM)zuy%1=Ae(`Key-(l+G(%Lrle*w?6a-%N#^! zRPK9DY|Ddk@t(Hnv~;NI&+TQI2=+Fymk|eFb#T4cXuMQiERkf0nk8ai=9CoHP6b2q zbQFOomq`qt8s16)-MnqpO}S3iq!fM_k97~b`Vx>MjmR%{zlr*VwC*v{5-Gmu!hLxY z>s>-G1hU^UpC#DhZXLk%CDWzbnDv~3eZE~ro-T|XK%iE3knb>F2aJe4^Yk)83iPLC zeUn^=nO0tpCoLN-$MTb<1NuR*vUB*HC_Y(UkA$9=ugi;$U1>y3xx^?r_V?K#x$QcI zne=`oraag~M!fiDr|=BM`Rm*47p=XdH445be4la6d3bfBfK${MJy#}{JL;2!w`6qD zOMI41AUMb_Hd}b8(wv@<@oI+C+Y+^QDFJ?kfzJl7XvMge*bfm;ij*y8eeUp_N5dQO zUf=y$`hp#?u$4NpAHB8tN+o8HN5?cKR7_^px2SWyx$8k-q1sO{2fNv6)v*Pa6(%sF zipjbWcwI~u?26=Nx^4$qVKUBNr=q##4Rt9le~kMv5O$EwMS~qhMhBYHhfz`)n~>hI za`R@Nv;8GEp&1(yj&!T zJbheu0c;p^?Ai)RR+7j>(ZhIIpAmy+c!^2{U;HSvGsi96&A}c;UUBAOqS8xxS*GxH0*t z#*ClPocDM|m}Y)FLGLb;Fa$h(?VhB;D_>1JF%o5BLAADXrax5AhWI=L4faEKa3n-W z@QCq5FU?h{=t4bl$4{y|MyV5!)%=$Gr_4;0^69Vj2K4k1 zYJQWWXZ|4`>(nG?<~PdfwOM~Xc9i+rz9tZ=Q}5en5!IB!`&$~9ZUr9J-}g}nvW6vrhLh_^6l0vXF#-CzgiJP zv7qbf#rUFq<1E>6Ug`GS9mimU`4(+kU#ldQ^u{_vbF&+1W|L_0S5^7;;=a;a>HoQW-^7h(?bq*;#>7%9ewCD8|c>d)sDT((OhlB!zdhatx*6!-N z*q!}o@9wMSPW>yo9m3*epmGR=v?ytUxr4d~#zT6Mqtks3JG=!>0=8Mw{UDg!t?K^W zy1nl^cWG)K6+`#qHV+zNJcUINM5M0=p45@giQP2zE0J(Um*`IcjO;rVf+2mpoHb#G*YY z=ZTVysUoXQ6BEwc98)Q@7Sw~l`3^s?#+PI08QEo;k`2Qut!chxJ~cWg>%!ylWJR>< zTk64>k}ye39E`7KB%$YFJtS3^Y`v9Cq%zf)<4^$~kECmYt(ZY-L@`g~TVH5I#Zm|Z zibGxx0fTYk%bD<5gYnbQntI)ib$c{X=_x;+Td}vg8X5hIm+NdmxP;mVXu0`HKT8P0i&{uy zx7WRS=1q zrZS`n_28~;CGFU;O6~E$`%Fvuu81+j4$~()O!~7j3s>S~2XBqk%?VO9jSPQ&U*9f+ zrk|Vs>w~NHeQ7ydJwd2w}voZ5YX%Ic$e8t0#*(@QoWJekX!A zXwT)aaIOQM;(Ve)O*L`W33?_rm47M=CGi*DMo3d-O^l>~{w7#_w#gDfi|u{bgMbk@ za25o_$V@qMG3)oszP$=Zs)VG3QOe+6Fg#6zPiC($)kcxrpv(xJ;GQ%}M0rjn!F2CkJttUa zTo_)Ik=R>kG|g1nMwt34+e%Q1l&GQ+A0H8!7mhj%vNN;=@Y}03)5ydA*dn4=Im*VG z%Fc42iAr)PU=*qY{u-HUpb(X=`{4m<-kg0>KlpI{NUXG0oTo~7J(Z8}eQsX%py%Ui z8AtZmhgZ=!2{m&=26Ie{?i8rk`E3#0qv*o&hgIl_#7m{ThuB5*p%)&}Wtr#HmuM2* zfDpRmx$x+8=6E&1BWPo7e;*@k2gy`>MZP*0Q2xK427 zC4>nt$Tt5VYbuG|Cd_{7&POpUg!eLCj%dg>bUriTNH5LulHkiedmB5s^t&nt(r-^W zxupCZ1>~1fTTvqOW+gRk)lTf)E^`$J$!iwLA@%R-Qy~JyovTHe)c3tgJFVKeMMs?f z&0>VK8kfj;>gx66GL#Q?#6+rT5PF=EF*@pqBHublE8&ZZ58>#S2)5$);-KX%I@)x4HTn7~cI*)=5hl>iohM&x<4AXMN&%Kw z+<5QOT7(NWz*ugOb5uIy2}y3#69ygmYXGfJor19rYMc(wE+og3t;Iv~we0@w?-EnP z>#@G#i>2~wdru2h zvWNJ3#Ls17grkDs>a`Gnm)LWQ`^LuIWNNs>3nkq*c?LyM?r+6D;pa;;N@zwK>L@W1 z-udO*ra&;ZAeIWvy=O|S9oHTzAbVmFSN~7C!@tg5?pt{S`=6 z@drjFHVhkzW;`WjU?3_qLiF{<=B$7pw1?#jM=+0+d8 zeTgn^2j3Dz>DG-)0_3D6vMO_vJW=NP{x&cF8Ruv?ZAsCU%`C0-2@U9Crul$)SHa~M z$xu{u>iU}76u0VMm!BHfEM$L;*C(z@3+k?Vjf>EOvVnS`xt{Z5uV+p?j=1LER!)i1 znm5*`V28JI+e0t5L_jglivcJ1hxGc+MDQG684|fBOpYiVR5v6Eo55em-WStsS&(YJ zs?au3^l9JSYafjXFebRUw4`yb2Ri8Ino{rgv(PRU?^nM!d_qa~$Evvd`(Z8PeWdu< z%g<4vzu62}nD`ayNnNm9h(lHv(t3Zj5B1wONaG8DfN_2)zf0&W^3F!39I*(f)H&16 z>DVD3oD`VN9!e0aV@ceDQ&>8#klmeB+}|k=UFVe9CERmpe-sq3nuVA zK(vd{i-RQfeO2O*6u;`m1>#?pirA5I&?`q-VGZCrW9Q6v&;dt~v9S6oxCiC&aWy_Jg<49M7l?QH`* zG5R63F#SRVpp#F1h;#b^dDx}in*fg@Y~QJ)!a%Bf?f45iQc{LvYV;5%QmsB!G} zNAS7EY+5Qe6M*n>F6bOqJv1t~u795^l31{7MMV z_>~(forg$RiI^{xFW=`?Os(*1-rv=sVQOz?Q|hjQk1KnkoMy2~j?4s`GZBX;>3heh zT|YTX`C7`|3QMRak@H&|XjY5xt?}IWfjk;Ea$(%HI2k&xceg z_MXQY>LX+Gm+qY8=DoqucSJBi5BY_joROC+_M-_N0==bKyi!f2g=Z6}{?R!jI1*%=-`@QF$g}ls1l30_H_dBz z;huFs)H=zSZpP>xV_kI5$9z%yeecW?X04XFHT^(mrh=1_kFW^o;7TQ5qQ-K$*u97iGYy;%&8j@B|_fX>2>40k9R#>Uy zs+Rm#5e-@G6bN(u(d~*eR>;y%MTTm_&yBa5>mPmzxeU1gM+7DKn6b0+vQ|;#7q_>J z@|0cw60eJzfv?RPee+7q`W?Vzsa~n;$+wfKlc1vUMJxa+^~-PPH<;ok{@5)yVY)t z>-HVQb=B6a~`Z-{jLjM3qN2 zE;*Rz=c;*zW!$MM#Cbwaf{$JOYM=APe!S6?#p%nEbt2A|+C6sPD>vnp=tz(7OU!kd z4bI5>?)jOgKIo_Ds`@@M4h9w@a`Ffh;MJzWYNKB8{6O+R4KjxJT;9@zn5&bJ4!;Ak z+^+{tfio}K^oQLM`euf(LXgoF=rNqUsFGE6furL4`yJxG-l<`|ZU^?CFEq0Z6o08@ zC7YCb^D0bQWP0S#<1nCkQ4xvH-MnL14ZVM=pV){>t*S9L(UBH~YRtlO>?aTb`_ zd?ohDOmWOOciX(jcl=V`%jaf;PX$ynFl!<%6f{EdPDZt!p7PclgcTF-0r0?nQgLd# z9anHSD>x`K#AlA&L$=WIdDdtjz0?qs9luF2xMa^o@lWE&#$a7mvrpp))O}ZLvono~EBbR? zo}u2CA8io@$=o{rdiDLcOU)zdtZ7ti?0ltfM5~8mnaYcYL4RYETV=(V3XB6P9>hr;( zj+#L}jujuKy?I2>BLMV_gkj0`T>``LVHmcW0V1hYrs~%MS7+hfSd4wXO^pCC1mM;h zIr(HMPE?h52JAIXO3Xvw>K$*XDHfV&F|l<%>rczx^!XWMUNw5B8O3jpX|l&ZUe%H; zN8-cBIC7Vt4=CU=G;t1LuR6zN>48|t#-3Y%dJUwV+aPgUumuf`2agUZBt^ACZ&S7o z=P{2O4`N-wVQrtFeqK_V^(zYd4A1sJYw10c2o%vnJ2^|+39E9slaHgR*!k~3j~2hW zVYpmTUCTX5(Tkh#wkUMsd}F3&?@mP;U*St4Zr^?Rrg;LsqAuTKCPqUhNL`0{*i!V{ zBLixV=a8A3J4O2eACg{>RYLfs`ZaHWkeV^@-Scaf&rW<3*^HNr-o^rI4n}&Im)B7@ zfhL;n%F1H;q+F@P%*&G>fgNH^s;HY8yh~&im={PYv92B9^C4DvuBZAyKF{$X=kq#x zrvE&*lWCTVaGW+}I%t$p*{HAJ#T{yeIXp@{86BbsZMQgIPd_u{H&cNWbZZd7Jm5c&;wlf?Y6pvs)uC19@5N9HzAKpEaN*+kw=5$+GYB=})1gB%DNq>LgZ zOxmb{QyDwofdV)3NrVQ<5Fn36Xo+K{@7;0I)mUa0oxEqM2-Nu(4ngDWG@-9zw#(b* zIz8eM^*)p&1^3f)S@-psa3NBmc0}Avl&H5^*@yPxp>s^H>IL*ZKnhcZSx|Meu~pR2HQnOjEg=efzd!xe_})O= zNfo7P+(u*oy3HNfIVK1kh3)i)QSAO2Tk&}YZ4K>i2@Tx_5lu@_@R_5s)Bv@rzjMYj zd6wN-JZ+%c*z?A$fV3Luw}5q=B$C;E=TUIfypOB;~Yuf|xGJ7Cx6u91~;51)H@O$1Db7zJh0$HX3x2)4`1jAq-_?Gl4+ z0gy2T?)+k)S$8=U4klmt%cS(&fZkz`o{R;3<)zdxAwqVZ+{Av+6`Ds(8I z6}-e@Tq(|@_0Ur|zjawb>i`JRa#bSwB21=8T_NQ8o*o>zDE;EdZlk}#mGE*tFIcpf z$G2J3Xr~CbnP=(jI;E_Y%R9hmU~y(W1ymOGE0ekCd`JFu6g@MSSuX;cjM~>b-wvB8 z|AGx+fBU)c%=8MH-r~|JADnQncwnqg6~2}IUi)=MtP%2sQv=hKY)WxNgxbx)Ds;tO z;-;6OsV2)nRF=)p7{i8}e0{QIzV0s!WUpJ{&ETLGr1|x#sRg=y6mwB5_6204Rt`=# z2ocW>BX0~x!>_UIB?-u`PL+KFzZ^a}-(*@8I*@W|3wev5@$0O>IMbz2dhdaJDxs%< z%q{|0MtH;nPM&iX^czCt%7)i@G$RDsbXe$#R@AE^n~1s!=z(ekBk`V`R&=af_)L#A zXZl>SkFDn0NTJf0#DIFU5WckRc<<-(=!|dhoB-7ndx>8=Q-I~~RuJ5y2TG)2gn(GW zPdd89u)E2%G(R6ut`$IEwUf{eWGtNSG}W9w0U0jDr3CthbNBtF@reD~5gD`-qU^mujBX1>c3{SHC?m5l4{2@e0t5m;MxZ1&y|1cax=9G57N zyTSc6<5aW|pOgRwQfSAn6bZrIR-BQ10~63X0_VP1!X55WS*5Bk(#lW{J^HXAJ(QnO zXjJ*OQIv}2+(Qt{UxZ)Pk{Z8(?|}|lnMQXM~PEy6DbrMzEEFr zt%Y90cNxtuH6Qx(49Qd{;8^ju^#wg{Y{;wpo4Dv|qY(#0Q6Io*7awWn?i+}BpWA2O zP)BtSqaw0w_5hQu>n>8)=_O)dcDnaBpgi6~FS@fAHNt4Gw;>|^K1Oipfl(j2%m9hRNWh9t)-ffj{-Sh19E~(nNgIn@yv6Dn z`-Lu%oDWPkRsPNx~ktt2z9h#F+zjXp^yZj~3WGCfpn$;cHi?IJF3q8^?5p$>2Gs-mt&0 z4s7^l9>#8rEyTV>^(4#kZ$pLM$%*aCOTXQ9w}5$GCRrJA(aIU9{NP6 z^kOqs8x`p04J@s5pZO9(Ee2x*ciBE8BZq94BSxtgycZt^M!4kk;p3#841xo)R09Z? zXicHn%_$`y%-^S#j^4t3?@7)s1t&=w0Q?(z{u)g*FzwjGFI=84J#@2x8`5H9d%%nV zqsQt+H8*(^8dbgzJcm>CTlU~QuE#f?eX4}4Z27+K;Ur&%=R@$P0<4?Xw2+B$Lkz^+ z<|{cB_6v!?^6GV2u(<_KC~e6saE*aREI;P@wZ5VI+f(&4Q7-}=1FOcI38Nu&tu~$osID2S9LTGFfS2gsT0iwkXc38Z1p`9Ys zcis7vWeQ!;y9&^53j?rQ)S7SPP|5B(w2()RP%h*<|T^lYX zN%%Bi8u5uf%g-0A<0f6>8E!0VRGxH>kL7sf*hIlQ9KSU?aW`NsrdVJ2jYa60^9RhA zGTRBsbdxTyxQ3}%1e)?nEaRpOaFJP_XizOIbCPr&-s2($P0K%czcWXxJhcwanSe3Y znRwUoXwh<-1@9P}2~Wf!UR3}E6tj`E(ilRSOQn%lN+RN9Uqvh{J4I=wkESxlaq>P< z1cZ!45d?2iJ8~B`2C{prW142Y7p6d(gP}{*p-?4oC9uUdA8h>&uJ*W6=7h^eb6>c2 z0{h^!O$y|KEwcj(T_F>cgpccBekTKv-4TefhM7=lsDH-PWf~}UK|{VZLvmXei`pjq z_5;I<4DaC(k193>Q>Lt;>Y_dh<^V9rA7xfHPv5T@G7(SJW6I1&aLQ48-K--~&lJ`g(ItZVON3=A=Sm^cGJ2WnHo*vfQ}I@xbRig_2{JR6IlFSU8`DKRKJj^(4V zegop6_UoL#g^{Kv@O3SnVrL-wXi3{A!icdtp|YC_}0uNC3qCKX<^K;zXpbCltv}XArT53Ma zZS>kF7RWf0cSk3W4UQL}lWK?uF+;1hZEm3xqWsi!U{byNQ?dppKI)$mYcJbk=hPaTOPF>R?|IulTuf)C5D{--CL4ybnxa znCZuGBpy-^x{@K(_`Y>aRiTDVuj6Y+h97*~*GBM;8Wz9=7VrGbIiAw~2F)W3_kbXD zfN(A=9}HBR*dUZocon>&)FC8&Vv!sp(RX2I^`s+U8w{Ja zEQef270fPDjhpw)2s~lK9ej@8F(}68( z5O68_^UnYtUy=Ot&uQpGP*E7#;rjx1;5?XvH?7idU0^mKfD(1+$T$$u@a)M(HrT!@ z$_ilJfx&oRJ=y%WUs0OR^_*Ma&aiv5DhqU&HZz50^VUGeOJ6g2M0q{@0LCy4j|W? zk!hZ&fMq=p7L#;VF-Ro8tNP-kNZaTK&PB8i6m%DNTjo;J0WVdyTT8%#>2T0m2Wo!W zvudDi@hX3)BU$L_V61cC=|o50;~)NTswDwt|L52Cdt@*Uz&TF(`K7Tli~U9Z#uI5Z z;6K#TUcE#1=a?0-#WLfwa#|d#cqKbPV6UZ;&2hr!I(?@)W3DkLI0=H)7KMj0P(hhD zv=~kMR2oI9p}7GpU6B1FTIK`DW2|qcWy_O!mt)`np(?Th`!Wjf6r9jQ-UX+7$JV$7 zcBc& z2u&gW@cz}-u}fWeXpuzzpQcfkRP zLHKwSQ*E-+c8}GizWVThaASQWt)guY?cPb!#e{k;ki}uA<%8v2|c$BgH^R5IQJ~=VRn>xeK z!~0V9d#9KQyeW9`GLr-It3?B5(D(kOmvrZWVFb@f9HlB_U{6AKq2pY0f`q3nktsm1 z1xyccB^nVjYSLFc3VcTxEZSnO{?*--&q+N#2&y{x#IPb@p4@015PoKQ%zbwq=ni4B zNRTS`6f%deC-G1hu;0IY;Cuvp3+C+DhSunl&-#uLql$*wJ?3-b1)-b1?W6h*oW2u{ zmIuwMNLaO%b#?=SU6zfX_RXdPQ+k{WjXH9B+tH4`d!l1U#*R{OpGTiy+DlT4E7M>6 zM2Od9y5Cp0X5tG6K5_9ZoR;kDLeuWul*F|F9F<;?G+gAnC!WEn^+RnvSGI6*Q;jBR zKLhdcFZ7TC%Ds%0$LOOq5dyc&n&c7kEkKk7${H zUa|*s*of|1A68YupPMNMZ0l&+2R7nrWXP}EXE8`sQ7oEzYi7y1=+_&974S{`0+c{(NmgnEY$0=z#y4 ze>^>Y*+Hb^{pN%f|7ASiGzSK?qFI}dHQ?rJq@wUhD?0h#IZ*$K{I?F(e_>%wf*d#@ z|HkuQe6X$G5d9?r9}W<2{lnAvA5lElTOvsO&5AR0vBnJ=a+8%!<(Fye<%mwQb!T0E`oE92IdrCUVS`E?xsxgdz)c4gll)))|J7*y+{(4zBndPf(aiA! zsioQK#}*tkXVJ!wJpe%3^p80?z$Agy1DXhdK`9MpEuoo}mVoCwVC87(0F%q|v|Q0Z zcWBXyMfWuDFM0!iaGD+I_wmPgFreuF|NMV50)H0_06hJ#Bg_Ik2J7Ju@BZ2ZvuRXd z$^jn!tp_mWMg{Nyg#Su`DvS!?I|%;~3XsXDKp}1fg}?*WjZp!70pY*$fX*3}_!s^w zpZ&rBB|!RLc@Sw-pb>5ajerMSk6={FU-+*)SXV{`Pz0p^l?No#r~v+f@L&1A{)0|& z<3AQZxQ@W60JQ_*zw&^cH7bCoApBPzkbI*8*DZkXul%pmMg?+mBLD(~|KPX(!oTtW zuR*%=7ygz1-O*rF?qB$?Jji5J0BCLmK!fx@_yI`-;lJ{K@CSe4zw&?ZgMAL9|CI-k zfOGhT#lP}@@PjP?g#XI_!Jqtv|H}WtpZp8~;c?Sa-Df zyD5S@n!oY@ev|#dfBb{`gGNp6H{QqfYY(hX5C%E91C#_|0Kds~zwq-f9l&pL_b*KS z+6U_xgrQ#;{?*R{_)Tzjp}CX)3j@$h{+E7&{Q{%|_)X!5U#Im~ABZ%CAO4(R&_OzY zAJD^J_-`Ksbb&UdU;F1j+6VBP@(;f2559jO!LL5}RjD35KET}-z`=o8fnJ@KKmtp9 zfd8-n96iPSa5}E7OkgaYv8zR~Et9sQk9zPD^O1Mji5}*`4@zUfv>RR0!DD(Om$V&u z+`)$eXoGtkmddd0!~g?Z{;>GB)A9_X@$6wuZwsU`8VBs>C;A1L?Z4k0aN{xEU;bZS zkPrO+%L~ezYW2%Y{h=aER@`W5$ZsFyEkGB+$k;8z=@#f;1%~CfRN4#-d!(dC1!!d^ zrUxLgM-H|_035Ki0iXeRLBUD`RGa1*aMuD@^E}-iFO${4xk0`Zw~hE}6o4mTr?Zhk z*Epj$*+Z#tR;qYZKRu860HN?F8g$nJH;!lp?XC>q7BNsm0M4WfZG$|((daLaqkWWy z0(Jb26?@fIA<%Lp0)s1or5&I@%0xb@g#A{96K7;5{c>E?G?$EW1s=$1q=+)*aX_#y z(4q-+hc;A=1-p-q0&F4ZTCR8?pyU3V-=95(JQ!bH0w)$)^5}%Gs5e7vVCl*X*wO(BQue>G6Qf*UGLEq`04Kl^ zTk{1PXo>!TCp{PwjK8wK|B9QTT1|m#K_XB${MKk7S1@;iVGMU~ zRRyFy8b^f?VI3+@^HMEa5||6X#PH#1QJP?RBV1=8koo`m1@IlVX@ciK|A6M9rIiQW zN=)l<6;Qm7_0XGu;RbNoNR`kSObcwqn#TOD*w^BQfnGz?~+XDR{UIap~&B+*v9u@(l||hvV4~$HBVC8SUf& zF5?VX|9|r-)RxFxnlHP5INklm>|bew-mHx7@ISiI>s*9^JOQ8;1y~dI-}+d`H)~=O zaKm9ipMO{i@R|p=5dfzxRaSs*YN0(|Vf>b-15XBHRI#Kc|Ki~V|BGj<3NYNjL#NUh zx?c@2ml8*Vx(*8rk6;S*`bL0}D^iV_KuZDB9|B%IK-@zIajCFHQgV1YTm8y-EK8fv zS_4w>$Io%_Rhc8b0EGGRX&nAz;zC-;X`i#wANlcsp$E8)$gvKY0aui;Zzlue9Dy#` zVE^`bCIEZM-#toTHG|;>d>g~`D`5Qq&sgceTtwqiP!DL22OAyKZh z0KNDl9$-KBd2qGUA5FlSA1>OD?;-mPxTOa0^q>U&zczPf%dKnMdA>hSp`4U!+m_cB zDN)^Vx#Bs|5$q(81Sv306$w%x*lH1!K+5H+#K(@EzVB~*k-R{X>pW8SE94s!l*GNy z(vDNfMOKv-2?Dbp?LWqxKoPSrd~I4PXrYjO%MNNauY}#Md|Rywo_c>SZ)(;P_G(cK z+AQq`+g&_!b+e;`aDc2SH4?{jb##g>g~vq3M8aFveG*L6G!FHS`Cs34O0_zFzOJVE zmD{+TPs&zj=qT&n+uuF;mz-ncx-UDb=ubN8X;fdTVe{;1J+4ptXYKCg*Ll5uH=3=T zU^(n}AGULzl@TGw?Xzdq8mgVoh5jlO7%Y2(uH!(D!L^k@({{iPR_HM|vK6DG_rg4L zzl|-_TY(>A?Dgjz$UIvTZC@hoJY-L~Z_PS0IyKagsu%gsX9HG|*bn9U&a4ZzG zHw}n3Ix9bgZqe1qu8r#W%NBH7%SG<;xsOV%SLlCV$f4S6SZWzv`f(4seuQ4JMdI_j z+}XS66n7enZ9*F{MT4DHb+x{?yr_ykBB40(?P7RLSqsc`F&OtRTDALC=Oy?{t#y=?~^VU~?g#UaZ&90$skd0^fd^H+AZ?Cg_$1HYBu=K)a*UiA7yO zfQ}%(C-taxXkR&fdmD*8HnpdbWj$Uq=Vnfs8xq-)yK_8w0S5-il9o&`^Ge^CF3}Cx zAlOixffhd0Nt#CvtPb`y`ZcZ{>}zQEZgaNu*-p7RjgYYqB#)!B)~b_m#>kE_c>S{_ zd!uu2Z0#!b2bDF>wu!Fu$#;w%rO(c;&nEd@MV-gsLFzHkI49V93R08)^s(q2G zr*pxKcE&E+#pn`v51lV|sY?cl3Mv|&JU723vDWYx_Rt0W6<(D!n<#>!t*Lw;l?L;+ zuiZ%BxO&oXqNca7PiyHE2~+XdTN9W}6TH5P)ourzZ zXQrBytEL`WoVwJ|cA^Z9rLLszYf}Fc_s*LIk*N#YfF17CRpS)C%AUHK)1{BgP<{5S z%J7W3%t|S?rJtQvv~^?Sk6~P4_vY$Fxjlk6r4agp^+Y6ATDHO#NmT3x_zH>Wcx)w|rTokae7MgFY&``71evDVeV znVfMx74*`?=C~D^WG$Rh?Qw6j9~s&X?Z*zZJx#XvNzLl9bK~yi`s#G~{Mu)W{W@6t zXFc-Jkad=-FX1l|`_~JiW#=`n$w|{_L{X||aS*(SJ^?p)RMw5U&o%1lMvZdKp?o)L zl>eMen@7j$gp`&K*jBi+;%Mi@*~ z)1GSEf$!Rh*kJf4OEB!9SvNeE>%__ppM`xU-BqQq)7}am+jEi}9-d>ZKm|V2?1yT(A@hHIc{N%*b?!)qcOF-} z^Z5L7!`8$}pDknEc~)+9Lv$LpTDRHP?b60Yhtkt2S#W{wFa3p^c`{M&d~MDzfrW-uR~ zj*R;DJh^k3M=~Uh{OyRZiti|&*!A*^b;q{;vqiIbF88+fu6s)~@Aw(p!FO%vg%2yA zWv+ix2Ay(Q1wlba{8c{Ne#_!y%6)K-ZM{$zoF`zlr9b+u@0ZSTpNU2twXfQv(+EB@ zV|=+zURKz_$BM6SQ-oT^3_wxf;shhleu@wxILbM8=K!27;{V}@l zC;f3zVMTv@XvO%DMh}X95!?V9(VD$nBMawsYf(byy%;^H25gR#J|y+s*>-kX&e4mD zQr#jSjM#Ub`-eV@n3jL&<9X>#AG^qk-@pV285a6@9}3=u{q!+MqK{pCC(*~~Rj`-q zNam%gwqq;Lm>1?C_c)id7F*0w{qg#NIf_LmOJA**_qjpR*~rU#N0rwS92w&Js;f|p zD{L3#R_i*$Cw0BfwYtL~0{chLnzihK_0jJ@V_EQcfYe0DVe|kxVStMO=0h)VHWTcZ z`JAIi)l}+esGruMEW&Oy?_l4F;fCSFhX_=ZBOe2FR)p#u;Oji+HH1fC&C%(C8944h z><5vN__Px15uAkr^dEa`A;F)wKIM+c-^Oo@!L(0*0~=#c?8x`=V0U_IK?8~JF)rlt zpxN&&Xfl8F$=&13u^D=^CbCqs4-%X5qGkCa-!7VIIIT^^$MW$xeB3+1F*0~rY{}5r zpZHl9qBprN-Q$-a!`SQ%eyJbJyo+6W#yHP>34adSKaVYO$>nc>f6p>!}K4jMA%cbi!%*DjC;j zB+hX{U$vd=dz_}x?R7eiS_}SX`O~mr$u36c%8O`MsP|y6gZs$x#A2s>4J@FIT&7U$ zx7t?L-e3xWbFe#HF+-Swd?q_DvFbeCUT>Ve(G_?2`R=NdpQ!E z9miYn+kPPZ&-F`Cy-+K3Jqrz}aHH6w_?%l6Rl8A(M1Xa=E}{h6!SE{dah}*+g}v1e zbX#}^o&G8mM=YQ&bD|P&q6P`%@1eLeJxSa$c9D+I=jski&=8r#>fEjhOUNyuf8muX z-h2j>QH4#Eeo34Pn2A&^#tQd!Rd~Q!zys`de(Pt-+sJNAGj08CCS1a)^^~ zpF~_)>vnm;@eZmcvWio^k$=P`k})(L;~K;svdXhm)3dyco7iW{1w(W6D4DZH;(G=) z>QbtlfK`CYs8;iR%_Mxqu2#+~u@NGc2Jh42&*qV<^8xj6-d7O$w1G()k{pLj3*2YX zpV;uKr=$(Mf<)%CSBC`4%mt8blX|fK$w7Oo2kie)PxD9h;NHB|V}rZmLm=em7tX?Gd>^p^49@LZYwcRT=O^(wzTB)u ze51LqSmFaR#?WAg@HgKjF4V^#6#PoQi|@C>rZhfaGmWaq)tSL*(zq|}3TE!kn*Ej) z?+?#@m~B*Y*cLDs0wDba#Le73%<#5pD}n~yfpZ&)3#0^bGE8MZ|^tbLv@X<`MnV^IuK; z>|E}H;evfNnJ@fnvAxpRtdFs!?P%%mD8EBTF;@CXzp#Y_=biGsiw`~vS1oXP?Cb&$ zOPLE|E1HMOfl_!qyK0M0#{j?JhnxtLi0`j3!welM( z&ZsPhc^p^x40o9ooC0Z5b~zD+sV@9jVu~6@G1=a0D=P z4mQVw0fUhGrEM^G`WdWUOFMPy;x@LO%rAbe%{XM9k)gZyPFmIxJ1WRS!SZ|FT z3~l>hi?l5|j{ZRB5;IYG1v5ofO^4BSOc5~YnQY%VI10qm=pR41eRo>;GNKTi?Z;I z4+g?y2NG8TTaorD!$RXD3GZR&E3lyhjWK831M8Nt=00bG2|+U!oq(-YSaXR{QZMl` zXhg7n=H!O86*`nTZ3+%X^}s@T2pPq}NF(B%NH{c8UfE=Md(c^|b z;p3M|%k9bYMt-21s6*^yXuwLEg7L8KF>3{Ogp8p*+9rob>TlLwF1OkbDD~FXABRV^?A$0tmr7o2hgSZ<#iagoiK5u$s*CKRB=X~ABM9;-=}&~df4aKQLA*}-vX5A+m4?2 z_Z%`(#xUttFraWI&mM^9+`p>wT=2K4vYTpvAoF%+zOjoKzp7QSujXQ3@hTH&Ozfc+ z_7!%B$TYDkB-b!#GoTPU?n#UbGZ8svVwp`DBX$+z1Y@HNli-5;6LZFI6kh3K3R>;B zQWHJInwZ!n_!BX&AK_QEU9*Jl5v+?7`G^6C-zK=0#3qSF8f=r;4;TQp3v)Khh=b(t z;JP|eF*JkT$j4XO$dtS~$N>9B04^l9F9qXujM4}b24$yGrm{X;)}g3p*2-~D*Ud8r|NXPk>9U$gti>5F|Mt% zvkQs$VY^5k07+=pRvf1HwPfw!0iU>~$U?`$=Y}_GLKq#wz2uYO6z!1h?T}cGBYyRS z=g6@j#-E6dDc9aMtnAnn+3^uGA2z^!=jw45T9I3CKKZ*2!J+c5+J2YWv~if``?={~ z0+wsf@$E=13&uiWr*}L0nm9NPL5X(B@fp)koWS|PCu1bo;@AqYLu^WDk@zH}nTuiF zbRq)v&^Easj`tuw8Zv+wEon|B_s1poM{tsc!CF4bV{(}MP8+8LcB8T7&yVExgGi8UQoXl%GHSbt4!E^W0KAUO#VR31LE6l3N+}67c9xXM`X6g`M zs0PFr+!}^W>#BO14w131chlyMJTW&6Aje+N=FkE*XG)z;vU0#{PKPEI*wiJb22EB- zAtTO*z5wGrCCXr8f^BRN>h)E0nw+iKr`M^J)?M~(l{tch855BTzhFL2Y`r>Yj4=0iS_x@cN^x`^w8z;0>$o-uSAQ_uQx{ z5GDGQ{EId6Rq~{Pd!lQJ6N-K!-R^)@dgSb3!vnv-^PZ|PC#Yl5WezihEXYf?V2bEu z=3n*^#3q`Aod}XJhrf9?AzmYPgOO)qV>p)RC$^68?uup`KlfG6X)(D@xxvHUbQG}^ zll#PGIMGGq)8u5eh@2+Z#u5LTTm#8z65Z~Ie!`vwyOTdXCWdjn!v;+v{3f5%_K8*W zl8b6*Z8fI6{iI#`TA!9K`pUgHMITwo3=zMszXZfX9(Z=`h=YnBHDZ0m&l`c?GgsuYfN#Uk;C(OnCD;dn7bYd_gUA8UFyvyD#WcXu(%`AZu0)5@Z%vS&{9>ht$-T7eE!`x?e!>)1otSLMwOuTm)y z_tKm3==L$Fi!SFMp;+0sahid%l9@#7nZxc-jV}f7bRDo{kz4ck80!)mFgCe5FNwax z9&S3|VDJwCbiwz9$VA{U0qDDy4oytK*pb*mVzi{Sq@7?{|T zf=BEE$@MW9hvX)-X5_z3$wiq)lBW4rUGNBaiQ=f5xL>y0LC9F!&_Gzmf_sQcr*|!z!)}w;3u}juLMpzKEHnov z$6(4`-3?#E@?aJ^Q@7P6H#2#ud_4EWhTEs{U|rjd=0scs15vF(U|()V9Fd9ttR156 zVdrLdKT9~Zv}re!X3d@2GfQROy%R0#_vpOCGvruQ?t*z&z2eKYqo9%}yajOQk$<7? zm)qw=d@Zxa%szW|&(3}ODrpTQ{}(P}3ySewkudQN_`!MeAFv@rHX}>KCJ_u4|4j(p znPYz4paQsWWX-`Z>JNZjOPc(7z}Y6T3+EAkRq}3Ac%<5t+%1tOk`qS0134vNTqYk; zuquEm_m*o;Tx#ZFi6jm*cP95>cZdTG&&v$2ngR ze|bi3#d7Xmj?R)WvPn~i*5@h>mK}F{J-%4nMmvht={79 zH6+i&p2A-84;{`w`-=6Jd@S-OZUfz9pNZokGc4xgS+D{>5R9e$?#rPA;aPk%)nhHd zo4}mlU)DqL43nQlwM{l1VgDw%XJT=J(FcPf1=#lpvN$o0a10CzspGbUd( z;xH<7D*K^>vq~P6FDF6nk&g!+aCUiNa!%4fm$2o)lmPg6&Eb^S(Y#!R5)~p_(Fi@qW|PmB0p)6JqMhalK^%#C|!g;Ae~d z5()Uup`b60bOZ5NTaOp(U{TQ#@R=tzv{`t@AhbZ= z`$+>6`H&}NlWkz(Ka&?}<|e4&qhT(CyWulQ8FWKaWV*AvyX^DgVB-IzTqx#sVo zUCsM1`(02S__JC*Cr=B!a_ak4)mrdYr-v{NHg_}O0nrsE-(jt?HRsf;TjkZ1fXbqK zYKi1JkmB{8cP)O6$uT(a4&{Gh_g5uWY3%+$@;IPBgGU*gU-S_HWHaw#?;|_a-RpYp zPdQF_iebV&CH#1!dyqd>Ty}U4o8cATx8S!^#Xg53mL|5pu?-6Qzay~}$&;SOIpUHfuhZ|5BKUYXzP(AMFVv-I0{XU{d>H>#Yd zL+ldMA0LWObP#?70nXUjulMssn`d-_(Pi|@*@a{8B<~x>Y$4LyAvtV&{1y*8L*kUk8@U&rYFn^avpiIidH4tn#pEO-Pj=*|BZ4gT==f~j2s(6T#7ad@itqGpf7B$mlN^1? z!^bzOqMwUB8{qtsPf8j_tH===-CnifD^BX+)bi$nSiHRt?p$8#(W8sJEbf85Tz!LS zlZNZ2?1n#|gz8B@nOsVfAN5R*2z@pGz~3JMG!FU25{D6+)y!KDJs|tANVJ!jlkkMl zK6$rg4&;?Mguyf=j~2Q&YmZ$;E^dMIKo64VN{#}4ViFcM$I+ex!8YD-bzcuQ($^~E zGPr!Z^1xd!ksmjSD_Fe2>$x6X7SA2<`1f+3U7InA|Nd@Y0z|A;ZO$$N;d?L%u}elmJm_Ls0HSJo1}ihP&65cD{ovS*Q)1$&rN_BNQDw~8h9 z75bdNrtCd&@IS>j0q^pwLMO8w`(3ditL^sCMH&?L;uW6}DPcD??5rBOetmWo%scaB z(VO{SNe>sf7<#X3&f4+o#2evB4)+Oe2K6Zpo8X(s2ka&WcQ>k+^v2XH`wrTXZroq- zY8A<0u5gHYVUISg=DJD)V&iz`K919DaIq=7BP!b29RC?mG z*aH%GF?-~!5_oU3fiVwm7UMILs+fd)@1f(7Sves%+1rwHIuY0?1BQw5ElJK2tl-UF zXejmq=O9%9xxm%RsgEG+li*8<)20nxbkUqaz~HF(?2p7u z2INS>H*{Sz(QDi~V0mJXAIrrqIMY<{ydztF1zx;FWcrDK(%8B6}$%05XNoSqnB(qtgMnz-FCtqcfknZO1udPIry{e9c-mIj@x0juY*+G0W*Do34HyLUCb>-`)@Hhq?`KQS z>5guecaN1QDEok;{-icrPstU}I1e&xus^HQ)wkG{dhl?SCnUaZt53Dh>f6a)KiQA7 zxfwSI?^K;jyE>a%tyz+KC%3Ha}ZmxXX2e-TU@dOF-cl}Aa7G5tBa zE$Y8tpK)liX|K#{fDY}0e{<}RU~8s+XDmfeXLA3E`iu5V``F!5zx2n{U-ZwEKWguz z{*V4@@-g53b$D?OIWu~ss(UiC@ty9WhMaQ@2DwLZ{ba=kRZ< z9&yUdx^b0oP7p>?EZ22jq$N)j|2nEg{7B}d_y;}k@9kRhaBXoPiks9^RW`Krb}jNi zCgE@mQJ6!G-me4jBRSON?Y``%WB=FNHBi|`c_J^0`bD&;8ta1{i*n~j_9544|LvOW zFcnb#?V3|Av9Ug`bMANO-{C&};UI&fYjeE8(RIT8KJxAGJg`+?Jse%aUCvut8srfjh7$44VJghW3QKuyxacZq4qlL-#+`c^V~eD2P^rRdsCj9`(EwR z=WU>a*IH@pMaf`Qdl_}KH#)y84f?!*kEmh1y#0z-Qfe%xrEyhVHF&Me$NkIMh&*M| z?Or6Si34Ev%A2b}j)6%s5Ua43)Vg}Ws@uM30WvP;{H{|~HJ_C8)iBU2DK|>=R1u`* zKFLI(9ALE;yq{AyO+G$LOawZTy?@VAKMqDF&!Z=viGR!Q+i%~;f+BB&ewF2Uc3soY zZ`Grh(jNUN$@3#QNQ>(pssGZ?IM+|beHo9V8VRfZ?RtnWQ~pqn_Dp>U1p4nYPkeH| z=a{rCnHR>%eS9PK?n*mm97v(GXA8fhjl=b z@Z61TS@=eIV&k%27&zwNhddT}_;dfZ#$J|uRBSac9BiV5oJ0KAAVWtv>_s*?y#aQL zb`o-Q!8qN(AvY}swk03Ez1Cjt#Q3!m|Kj{zBAtOmXPdgFoCR?+U1MLE+54670=G`C z8v!|OYA}oXm$N~i&BzZr8=bpzU2T;>XzTGsdm5+Z#ppqoCc$_=cxYb?`n{4q=RKI6 z^2=ZudGUDc`O3N>?*L!ByG(6zWhH9J-q4)7aZJ{3q zPXn*_Vy%Qfr=>>!HXrmWwUO6bj;%wvi(Y>CohTW+r`put+UWk6PwME`_Tz`v+UiUF zJ@|9+GQt-b@#;_7oDWyMS2k;MaP^|3S9&p8ww^|+MIS1>IlU&=lx?k}hZ^nIrg74H zjXjQn&x_BN;;n`K%T1%-tBlp|M^G}n*_X1nsFV*YM!->tl`YU^Tn%_<7F}1 z=zPJBfF0$^ypFuLCDVU9eo)2p%i7auc{?+5Yt^hVFALVr%*8w5fkB{0Mb&)spC_9- z@CQA`%OHs>4mi0Ulp`ZERP}mOx8EU=^cwbDxQ$E=y8T6(xAb#fcNfVZwd%cInya)o zeI}p9QhFA#L)PO}cX$K?{%pV0*^B-Q&b8G*01%ZRV>sGo%Flc+NV295GETMVZ+v2C zPjKnwL(Jr5EP}WhV!WkaD=a>AE-yxt$K%HluhQFU&iiX+*Hef41Kao4NxD(GevOgc>0`hS+I_O(ymL92 zHktK1Jm=_cpB<$2U1sLS$I4(#i+<;vGW%SYnww0P#Azi#%5N#Z?b&_Dn3Y9DgZFMl z%OPz``xa%^tVv9Aml<0Fj|Xrav<*54T|6C657>dDqjNH#im~~PhUBMfn{D4;88w<+ z+mYi_&pi9a+SkEilXi#pJK0R`v+fJBliie4UkokaP0IW$=!?iy1S&C-b^nnUs4 zYBaz(=KXx&xenKN(6AO%fL8(A9r2(s_^4wRES9+)w(5+n)3>bL?zAjf4||^{87D`W z`Q!Dw%C65>nv+X zbiLmfI+M1xWX|GzvU7_u0*4No*+>g26H1|DgzvBozxj*1OJ4NLFn)^|4f6x7$xgT@iFYcGPKR5R| z3kUj-lC^!Wey#WLb}IB! zr7g}LmA(+wbvS2;zE}=z`4bt7FKfRu_c@2!af9~2m9?JP06>X zKj}>R7$MhX*JZGfKi|46o<*i>bP9WfZIPfLsG_%-+Vqv33AV3^52TUpEf!W_WX@D{ z-0aY=S$j!&kx@h@enT!mALxrWy=`Gf%;6myFE%o!ct!k#6 zjqnHeFU|c8dJVl^3yZSMW!SeW3Fl?X99hTr#BSjldH?oo#9V}nj+F0vm$*f~^4R&Z z2cVv!YxPj{x`}zXC3mTEaa?xlR@{JG*!tx^nuQiasIT8!}HJ3aq~H|GWw#`VNDz}&naUv zeCXv?*xWG28{ewT?iz1>*Vx9y7%cSk{{tRtU;hj(3;ph`ddmA6;1@gc0^~c9);@>C zAQXdhXJoEjvA4cW-(o+qK2w%#dpFP@_UyX*ek{N z;(5#bUOaEUhsE>7_u~2DyLn!n%JZRl-Z9^M=K13Ho_YT8dr`lV=X*u{<~y(UmHrgp zi~5W2#q-GK^Soa?Z@xbi&llf|=Zo(}f6nCjhoV2`JDF_MuZr(Qe~Rz$duyM4@Ql}F zz2i-08$Osb=NHJ!8>w$_&^4|7bAI1pu03>$ogCA~isvgle=W}sS*JT_;$C>sV_kSQ zvrEEXUwQ7bzWd}qGxD)Z0`6HJJhCTY6u#obiY=*GB>GP~eQY%qU80xX zQ)a)!MSYV#5rq=LDgTU1)XWdd#&z{D*5KP1Yd> z<+|9|mQP#u04JfAcs_dfN>1h=*FvRU3!9nnhtmeeSq!qA{iH$u6~OOoiu|9A@NEoe z{-bwQY&Xx7EwA(b?stCw7k~VVv)?_jrknM0axxvp^Ix6trmT}RJK0QD!->FT7PuEy)v*U9%MDo@#M=>x|=M%Y=+x({j1XNocz%*PEP(%8v61$j3?&u#5BzHGF|L{b@H9u zoh%mX?|z?WPfoH;{Hv4a&EmJe`~Legxo7^92foiHR<_+QCck3JXm|1cYd%Sn>Gt^N?1|}@A665dqVzb;o)$v}ovs$? zYVu{YSjTgzfY+;TnZbB%CT=AUuukb#?&axtJN?y3d9swN<#3ZQ+nb`T@6U^0P5I#> zO(+^eACrwd3q`D-hH<*3#qV!^U)E82!O!k`bCL}oq0f^q&|o&%o;(eq#qEh1TXrC# zc(^*yP_o!RO`(YKB$HZ-d3YIa(&6eyLpB}RZic)Wo7s6EyDV(c@?*L?89i^e>s59# zH8b{mvVbSsJl)dmlMx({QNfex?TMMD;<>jeDC$wGltoY1tHXHd+wy6$%8K8<9Og*~ z`i+XSJ*>0cq;XL*v%p)-*Dn*{C82)dCAi59?=Z`Y$s?mXOmfk#aGjZ!Nx`x-OZT_K z(PF|%8RmsShMDjsG)D*0SHnSO-V5^K7Y1`)`mN(73Ez2JrsKjsnLIvD;_Z89&CJ4{ z<8@Bqr``MCCK(NXyL^8AdsO-MU+Mdc-!YZ{@h`qN1WuRZ$>Ko%Cx66jK_s$t-~Fx0 zO{w(V@1Oj!(8YKE^DqDIchY20>iKE09*#dNRX!^9_l`xyqSE~*yyO(KRPP*l8z_q&kDsyh5qqTAtUjAc5LILlKPED*Mzb@79e!5i0JofL8OQoMq!!dXLhod4ns`XRuDj###e>^G` zV~cISj6M~njyL_|UW9jCD zvwrxKW6pXj_hq>FwCo3a{qQHp?1laN{7HN9#{&HD>tpf8tN9i`)7IpJEr0m+UmlI` zU~d16W_m15J_z}TU;me*!XgKLrqRa_Zu{Za|Lv%pFwK|j>oW$~w{`Dh>G5b{fBip> z%5El47}eiWp^xPwnefA(9?Jv~K1R}g-rMrUQHy_i+#-WapR)AZZ2nlTd`Pb!{_NOF z5JUJ&oNnU9XQM1vKFIEeKRZ_5+v)Rilzl-ye@Z{)tK-7|`Dltp>1rK6FNT}Xx_rE# Ze}256&)H=2AkxjByph9y^Eb9hENoTz`MJ88lMgccGZ`jNX5bC4FE}l2j~C* diff --git a/priv/static/static/font/css/fontello-ie7.css b/priv/static/static/font/css/fontello-ie7.css index 77c23c0e21943daf1fbd5cf85a0c633b5c3880b6..1ef174bf8c2c3eabce44cb45bb4a4138c52aca37 100755 GIT binary patch delta 50 zcmdn1wo!eAkxjBT*%?S`6K%z7WS(A{9N74Jdglm^5lbzBAZ)ycCrBg Dv delta 21 dcmdm}zE^F-BKFCJjDDMcu}@~%{GDeP8vth22`K;o diff --git a/priv/static/static/font/css/fontello.css b/priv/static/static/font/css/fontello.css index 93def62db233b3885a5d1180a46002a6cc6ecf2e..84fd6802c0989fa4808fa0efd6bbadb06e0cab1a 100755 GIT binary patch delta 143 zcmX@8(4;uQlikF?%)r>#aAJTeoLPeqJ!1wFoy^H-0%yB0TEN*d%(9yoFqSgH1UAbs z%dvCm7G>t81Ceh2WI=9;%|TqLOl(#8`MJ88lLfdXd6U(x6>1gqwG`CfEts=;4bN0& E0O*7z7ytkO delta 107 zcmZotJg6|ilik?Zz{K3hbYg%ioLPeqJ!1wFoy^H-0%yB0TEN*d%(9yoFqSgH1UAbs V%dt icon-up-open0xe80f
-
icon-bell0xe810
+
icon-bell-ringing-o0xe810
icon-lock0xe811
icon-globe0xe812
icon-brush0xe813
@@ -340,27 +340,30 @@ body {
icon-chart-bar0xe81b
+
icon-zoom-in0xe81c
icon-spin30xe832
icon-spin40xe834
icon-link-ext0xf08e
-
icon-link-ext-alt0xf08f
+
icon-link-ext-alt0xf08f
icon-menu0xf0c9
icon-mail-alt0xf0e0
icon-comment-empty0xf0e5
-
icon-bell-alt0xf0f3
+
icon-bell-alt0xf0f3
icon-plus-squared0xf0fe
icon-reply0xf112
icon-lock-open-alt0xf13e
-
icon-ellipsis0xf141
+
icon-ellipsis0xf141
icon-play-circled0xf144
icon-thumbs-up-alt0xf164
icon-binoculars0xf1e5
+
+
icon-user-plus0xf234
diff --git a/priv/static/static/font/font/fontello.eot b/priv/static/static/font/font/fontello.eot index 6f9cb4a29dff60d98242a41f57538003a9d8e2d7..d08692e84134f5c16e188e97c841e691f820e15a 100755 GIT binary patch delta 1452 zcmZ`(ZAe>J7=GXTb#7u3V{&t2Kk}ibiAGax5)+NFOR;7taTRXas zEU>XZrL(IMIv8UuY@-ZT>_p~Z(86F)=%Bv_gZU!QkNrJbh$N8$kB zKAW4)T)FvuPHF-wuzdaAo_K2QG zW@vyt5Oe_TGWnjF%>3og^QGU&Zz6v!oju(<*<^8$-Ts)mS2L5BbNHU|3xHS``R=*N z%+$kATs7pM0pNbjWiQU(SgQUOppz27=eY}0xhKiS?*RH97H{JB4IV(!0Xl)-wVH_a zr1XFQoAjU-++=a<`-@k(S;t8z-{b#%7cKml7@%0v%6XncGZ@N|xpLy=E3opeFpP!$ z0P6&xIjjdYfRmWgD+62r8w(of)39+(1JIN<9%!JXVB=Q}P)Gbk19*u4)Bp#FcQk+( z;17$2KJbxoSOe4(CpAC=G1agP@Do%0%78{<`al^#bJ?UM%b@uzNne=?0zl~!f1e*E zQ5ZU55WY!NMZ%l_4ikq0ml{CCm-?6Y4vi!lL=>pX0%mwbi3)WNBu4F=i~xonV2m39 zjx%z-`}&tXB=G*902pwL8<(*_Lg?L>@KFc>vh+R**>ZHuQeY_yjN{meehhY2LR-wOP#IN54)~8nITgDRzmO(55hnDQX8QP7EH#)=)6g>h*bB!_@gA zL?Xqug~HKDA$ov0k%b~YF9ubcqK1O1BGuK>yAj+}-D0XO6pQ(f`yJcfU8>$t;q%N!R`X*?hu?S9 z>pkl8JCbAh)yS;JS7DOfsw)ub>3X><(iRAZ19M$N-Kpo*qEOQ;%3`cu5LbRzKQ$Nl zQmJ&Fzr`!GUz(sBZYB1*sySY;T960cC~*kKkYNyYOicAJ*HGXu{kXZw)C{ zn^Nah>gp;)M(l>ov864F2a7Xpm-w5dQt_9zsiaq)Gh8q%8^gx8 zjccYml`WNDnl0w}s`{!O%YwDZdd0e-OemYStF|q5P+hZ|?XTFks_*ZiBX#%uIk@sp xdj(HHuf$Js*j#)Z&sUmWn@Xnx7iQFx4BKX#Lb-7KdGCBG5nX>vM84pQ4wlEF1IwAxpbL9Vnk0R zncSitEUX9dp~9MP`4AOBP}D;dMMMOJLJ!mIshIudEupA;`0zd7bMNizNMG6?@z#I^kW^U3IlvE&sDnNmgW_-r34)H@-%}9*a ze-G6n?2UE{dY0@=l%&TUJtOX7gKL2q0$HRU4XgrU=QWT`N;gVCyCL>O19Xen2Msz0 zVxKgSOZrs0@JMKd9+{}etXB`l!L}6Ixxh9zP8xSKdtFIP$G~(!Y9T{=qNzH8wLui+ zX2`O>0h~+CkR*fTvo}uWP{jR5gdhG-W^g%_N1>wsg*YTG?OWbY^x3^@{{B{mD9B>l z@e`0if^<5E*gON&>Ztyl_e=G-((vM$S|^W-YFf(nmfO}AC7&Ce+?drG-t - + @@ -62,6 +62,8 @@ + + diff --git a/priv/static/static/font/font/fontello.ttf b/priv/static/static/font/font/fontello.ttf index 8a771e529acaa1311334bc7cb01b0c4bcb0e7856..6f5a81d7670e06dbc3cac29ea406c81af010f651 100755 GIT binary patch delta 1431 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 ZtJ$`2I4O$UR041oq4Awo5(*I?&v z2Pov?>n`iaG;qKte z&1UOD!8*ew!ryBf3%+TWG%CdvUfjDWsWTQ%>6lG#{9RSr+=KRcg;uyY?Hg%F+PM zX=lj=%S9kTa)B7M4iPM)LAoIYf5PE$g89eGMmpa|93CPhjI?((d3!A;%Hs-qw}9rZr}N00%4{~E330qzu7 znJNh=Q6eTbV-Nm)%gzA8|Kr+cK}evOo4y5_DbPYO%ajx|A6DoJ9j8vFY~^wZrM8>P zms{g@5DJA$0yski49*)E)0{GV(CTge``tY=XU?v)0uz%S=owYlGOqzud)Gj*BWFM% zeBdC)=m#lq_A39BdET6_(#BHDf)XXaL|`b;r)9{w*jM}YCJ1btaDj1?bTww`Za?xECXu1?-$|mWrEW^|5sr`0MPV|9LlhR}`CEBuPG7LCQz_mzN`s};I z+N#BvNVmcyi~@-o?t5Us+R}?CY6(JR2fimHXj*lOTqfN;0{UkG%|I~fASFG1mrb8# zJ_fXXt3m-#ZEaOEWd6I)QOLibuL1l%KmYU>hzf|T%w=2jEk1XE>VcPX*y=fu36}u- z`;&oGA(e#Q^Qp^|wMH5aXt6&`Q2%yN{{bAusO%q4sq%2fJbsJuc=dex1?$Cv7wQ+f z7q%DUf4OG_;B(r(QduS$_d1<}?A0~1*WUh*r&gVM4H`9R)}ockVsp4WzCfra(l;

+W&s!!ds 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 G6&MMca|N6L literal 9724 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

    625As^gh5%tk)*$D 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