summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-27 03:51:24 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-27 03:51:24 +0000
commiteb9aa7aa1095de150d036839c78c402019efb4b1 (patch)
tree37c808da6ae7007d203e0de6c917d093a4d6abae /lib
parentc4fbb56984d8f86df948cfd9b0f7c081d688c365 (diff)
parentb736312123bd11e8ba87b8b39245c0f441ebd7fb (diff)
downloadpleroma-eb9aa7aa1095de150d036839c78c402019efb4b1.tar.gz
pleroma-eb9aa7aa1095de150d036839c78c402019efb4b1.zip
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/notification.ex1
-rw-r--r--lib/pleroma/subscription_notification.ex260
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/subscription_notification_controller.ex71
-rw-r--r--lib/pleroma/web/pleroma_api/pleroma_api.ex40
-rw-r--r--lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex61
-rw-r--r--lib/pleroma/web/push/impl.ex3
-rw-r--r--lib/pleroma/web/router.ex8
8 files changed, 444 insertions, 2 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index d94ae5971..d19924289 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -230,7 +230,6 @@ defmodule Pleroma.Notification do
[]
|> Utils.maybe_notify_to_recipients(activity)
|> Utils.maybe_notify_mentioned_recipients(activity)
- |> Utils.maybe_notify_subscribers(activity)
|> Enum.uniq()
User.get_users_from_set(recipients, local_only)
diff --git a/lib/pleroma/subscription_notification.ex b/lib/pleroma/subscription_notification.ex
new file mode 100644
index 000000000..1349d988c
--- /dev/null
+++ b/lib/pleroma/subscription_notification.ex
@@ -0,0 +1,260 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.SubscriptionNotification do
+ use Ecto.Schema
+
+ alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.Pagination
+ alias Pleroma.Repo
+ alias Pleroma.SubscriptionNotification
+ alias Pleroma.User
+ alias Pleroma.Web.CommonAPI.Utils
+ alias Pleroma.Web.Push
+ alias Pleroma.Web.Streamer
+
+ import Ecto.Query
+ import Ecto.Changeset
+
+ @type t :: %__MODULE__{}
+
+ schema "subscription_notifications" do
+ belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
+ belongs_to(:activity, Activity, type: FlakeId.Ecto.CompatType)
+
+ timestamps()
+ end
+
+ def changeset(%SubscriptionNotification{} = notification, attrs) do
+ cast(notification, attrs, [])
+ end
+
+ def for_user_query(user, opts \\ []) do
+ query =
+ SubscriptionNotification
+ |> where(user_id: ^user.id)
+ |> where(
+ [n, a],
+ fragment(
+ "? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
+ a.actor
+ )
+ )
+ |> 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})
+
+ if opts[:with_muted] do
+ query
+ else
+ query
+ |> where([n, a], a.actor not in ^user.info.muted_notifications)
+ |> where([n, a], a.actor not in ^user.info.blocks)
+ |> where(
+ [n, a],
+ fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.info.domain_blocks
+ )
+ |> join(:left, [n, a], tm in Pleroma.ThreadMute,
+ on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
+ )
+ |> where([n, a, o, tm], is_nil(tm.user_id))
+ end
+ end
+
+ def for_user(user, opts \\ %{}) do
+ user
+ |> for_user_query(opts)
+ |> Pagination.fetch_paginated(opts)
+ end
+
+ @doc """
+ Returns notifications for user received since given date.
+
+ ## Examples
+
+ iex> Pleroma.SubscriptionNotification.for_user_since(%Pleroma.User{}, ~N[2019-04-13 11:22:33])
+ [%Pleroma.SubscriptionNotification{}, %Pleroma.SubscriptionNotification{}]
+
+ iex> Pleroma.SubscriptionNotification.for_user_since(%Pleroma.User{}, ~N[2019-04-15 11:22:33])
+ []
+ """
+ @spec for_user_since(Pleroma.User.t(), NaiveDateTime.t()) :: [t()]
+ def for_user_since(user, date) do
+ user
+ |> for_user_query()
+ |> where([n], n.updated_at > ^date)
+ |> Repo.all()
+ end
+
+ def clear_up_to(%{id: user_id} = _user, id) do
+ from(
+ n in SubscriptionNotification,
+ where: n.user_id == ^user_id,
+ where: n.id <= ^id
+ )
+ |> Repo.delete_all([])
+ end
+
+ def get(%{id: user_id} = _user, id) do
+ query =
+ from(
+ n in SubscriptionNotification,
+ where: n.id == ^id,
+ join: activity in assoc(n, :activity),
+ preload: [activity: activity]
+ )
+
+ case Repo.one(query) do
+ %{user_id: ^user_id} = notification ->
+ {:ok, notification}
+
+ _ ->
+ {:error, "Cannot get notification"}
+ end
+ end
+
+ def clear(user) do
+ from(n in SubscriptionNotification, where: n.user_id == ^user.id)
+ |> Repo.delete_all()
+ end
+
+ def destroy_multiple(%{id: user_id} = _user, ids) do
+ from(n in SubscriptionNotification,
+ where: n.id in ^ids,
+ where: n.user_id == ^user_id
+ )
+ |> Repo.delete_all()
+ end
+
+ def dismiss(%{id: user_id} = _user, id) do
+ case Repo.get(SubscriptionNotification, id) do
+ %{user_id: ^user_id} = notification ->
+ Repo.delete(notification)
+
+ _ ->
+ {:error, "Cannot dismiss notification"}
+ end
+ end
+
+ def create_notifications(%Activity{data: %{"to" => _, "type" => "Create"}} = activity) do
+ case Object.normalize(activity) do
+ %{data: %{"type" => "Answer"}} ->
+ {:ok, []}
+
+ _ ->
+ users = get_notified_from_activity(activity)
+ notifications = Enum.map(users, fn user -> create_notification(activity, user) end)
+ {:ok, notifications}
+ end
+ end
+
+ def create_notifications(%Activity{data: %{"to" => _, "type" => type}} = activity)
+ when type in ["Like", "Announce", "Follow"] do
+ notifications =
+ activity
+ |> get_notified_from_activity()
+ |> Enum.map(&create_notification(activity, &1))
+
+ {:ok, notifications}
+ end
+
+ def create_notifications(_), do: {:ok, []}
+
+ # TODO move to sql, too.
+ def create_notification(%Activity{} = activity, %User{} = user) do
+ unless skip?(activity, user) do
+ notification = %SubscriptionNotification{user_id: user.id, activity: activity}
+ {:ok, notification} = Repo.insert(notification)
+ Streamer.stream("user", notification)
+ Streamer.stream("user:subscription_notification", notification)
+ Push.send(notification)
+ notification
+ end
+ end
+
+ def get_notified_from_activity(activity, local_only \\ true)
+
+ def get_notified_from_activity(
+ %Activity{data: %{"to" => _, "type" => type} = _data} = activity,
+ local_only
+ )
+ when type in ["Create", "Like", "Announce", "Follow"] do
+ []
+ |> Utils.maybe_notify_subscribers(activity)
+ |> Enum.uniq()
+ |> User.get_users_from_set(local_only)
+ end
+
+ def get_notified_from_activity(_, _local_only), do: []
+
+ @spec skip?(Activity.t(), User.t()) :: boolean()
+ def skip?(activity, user) do
+ [
+ :self,
+ :followers,
+ :follows,
+ :non_followers,
+ :non_follows,
+ :recently_followed
+ ]
+ |> Enum.any?(&skip?(&1, activity, user))
+ end
+
+ @spec skip?(atom(), Activity.t(), User.t()) :: boolean()
+ def skip?(:self, activity, user) do
+ activity.data["actor"] == user.ap_id
+ end
+
+ def skip?(
+ :followers,
+ %{data: %{"actor" => actor}},
+ %{info: %{notification_settings: %{"followers" => false}}} = user
+ ) do
+ actor
+ |> User.get_cached_by_ap_id()
+ |> User.following?(user)
+ end
+
+ def skip?(
+ :non_followers,
+ activity,
+ %{info: %{notification_settings: %{"non_followers" => false}}} = user
+ ) do
+ actor = activity.data["actor"]
+ follower = User.get_cached_by_ap_id(actor)
+ !User.following?(follower, user)
+ end
+
+ def skip?(:follows, activity, %{info: %{notification_settings: %{"follows" => false}}} = user) do
+ actor = activity.data["actor"]
+ followed = User.get_cached_by_ap_id(actor)
+ User.following?(user, followed)
+ end
+
+ def skip?(
+ :non_follows,
+ activity,
+ %{info: %{notification_settings: %{"non_follows" => false}}} = user
+ ) do
+ actor = activity.data["actor"]
+ followed = User.get_cached_by_ap_id(actor)
+ !User.following?(user, followed)
+ end
+
+ def skip?(:recently_followed, %{data: %{"type" => "Follow", "actor" => actor}}, user) do
+ user
+ |> SubscriptionNotification.for_user()
+ |> Enum.any?(&match?(%{activity: %{data: %{"type" => "Follow", "actor" => ^actor}}}, &1))
+ end
+
+ def skip?(_, _, _), do: false
+end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8d0a57623..7e83e27e5 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -13,6 +13,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
alias Pleroma.Object.Fetcher
alias Pleroma.Pagination
alias Pleroma.Repo
+ alias Pleroma.SubscriptionNotification
alias Pleroma.Upload
alias Pleroma.User
alias Pleroma.Web.ActivityPub.MRF
@@ -151,6 +152,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
BackgroundWorker.enqueue("fetch_data_for_activity", %{"activity_id" => activity.id})
Notification.create_notifications(activity)
+ SubscriptionNotification.create_notifications(activity)
participations =
activity
diff --git a/lib/pleroma/web/pleroma_api/controllers/subscription_notification_controller.ex b/lib/pleroma/web/pleroma_api/controllers/subscription_notification_controller.ex
new file mode 100644
index 000000000..37c2222de
--- /dev/null
+++ b/lib/pleroma/web/pleroma_api/controllers/subscription_notification_controller.ex
@@ -0,0 +1,71 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationController do
+ use Pleroma.Web, :controller
+
+ import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
+
+ alias Pleroma.Activity
+ alias Pleroma.SubscriptionNotification
+ alias Pleroma.User
+ alias Pleroma.Web.PleromaAPI.PleromaAPI
+
+ def index(%{assigns: %{user: user}} = conn, params) do
+ notifications =
+ user
+ |> PleromaAPI.get_subscription_notifications(params)
+ |> Enum.map(&build_notification_data/1)
+
+ conn
+ |> add_link_headers(notifications)
+ |> render("index.json", %{notifications: notifications, for: user})
+ end
+
+ def show(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do
+ with {:ok, notification} <- SubscriptionNotification.get(user, id) do
+ render(conn, "show.json", %{
+ subscription_notification: build_notification_data(notification),
+ for: user
+ })
+ else
+ {:error, reason} ->
+ conn
+ |> put_status(:forbidden)
+ |> json(%{"error" => reason})
+ end
+ end
+
+ def clear(%{assigns: %{user: user}} = conn, _params) do
+ SubscriptionNotification.clear(user)
+ json(conn, %{})
+ end
+
+ def dismiss(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do
+ with {:ok, _notif} <- SubscriptionNotification.dismiss(user, id) do
+ json(conn, %{})
+ else
+ {:error, reason} ->
+ conn
+ |> put_status(:forbidden)
+ |> json(%{"error" => reason})
+ end
+ end
+
+ def destroy_multiple(
+ %{assigns: %{user: user}} = conn,
+ %{"ids" => ids} = _params
+ ) do
+ SubscriptionNotification.destroy_multiple(user, ids)
+ json(conn, %{})
+ end
+
+ defp build_notification_data(%{activity: %{data: data}} = notification) do
+ %{
+ notification: notification,
+ actor: User.get_cached_by_ap_id(data["actor"]),
+ parent_activity: Activity.get_create_by_object_ap_id(data["object"])
+ }
+ end
+end
diff --git a/lib/pleroma/web/pleroma_api/pleroma_api.ex b/lib/pleroma/web/pleroma_api/pleroma_api.ex
new file mode 100644
index 000000000..480964845
--- /dev/null
+++ b/lib/pleroma/web/pleroma_api/pleroma_api.ex
@@ -0,0 +1,40 @@
+defmodule Pleroma.Web.PleromaAPI.PleromaAPI do
+ import Ecto.Query
+ import Ecto.Changeset
+
+ alias Pleroma.Activity
+ alias Pleroma.Pagination
+ alias Pleroma.SubscriptionNotification
+
+ def get_subscription_notifications(user, params \\ %{}) do
+ options = cast_params(params)
+
+ user
+ |> SubscriptionNotification.for_user_query(options)
+ |> restrict(:exclude_types, options)
+ |> Pagination.fetch_paginated(params)
+ end
+
+ defp cast_params(params) do
+ param_types = %{
+ exclude_types: {:array, :string},
+ reblogs: :boolean,
+ with_muted: :boolean
+ }
+
+ changeset = cast({%{}, param_types}, params, Map.keys(param_types))
+ changeset.changes
+ end
+
+ defp restrict(query, :exclude_types, %{exclude_types: mastodon_types = [_ | _]}) do
+ ap_types =
+ mastodon_types
+ |> Enum.map(&Activity.from_mastodon_notification_type/1)
+ |> Enum.filter(& &1)
+
+ query
+ |> where([q, a], not fragment("? @> ARRAY[?->>'type']::varchar[]", ^ap_types, a.data))
+ end
+
+ defp restrict(query, _, _), do: query
+end
diff --git a/lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex b/lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex
new file mode 100644
index 000000000..0eccbcbb9
--- /dev/null
+++ b/lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex
@@ -0,0 +1,61 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationView do
+ use Pleroma.Web, :view
+
+ alias Pleroma.Activity
+ alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.MastodonAPI.AccountView
+ alias Pleroma.Web.MastodonAPI.StatusView
+ alias Pleroma.Web.PleromaAPI.SubscriptionNotificationView
+
+ def render("index.json", %{notifications: notifications, for: user}) do
+ safe_render_many(notifications, SubscriptionNotificationView, "show.json", %{for: user})
+ end
+
+ def render("show.json", %{
+ subscription_notification: %{
+ notification: %{activity: activity} = notification,
+ actor: actor,
+ parent_activity: parent_activity
+ },
+ for: user
+ }) do
+ mastodon_type = Activity.mastodon_notification_type(activity)
+
+ response = %{
+ id: to_string(notification.id),
+ type: mastodon_type,
+ created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at),
+ account: AccountView.render("account.json", %{user: actor, for: user})
+ }
+
+ case mastodon_type do
+ "mention" ->
+ response
+ |> Map.merge(%{
+ status: StatusView.render("status.json", %{activity: activity, for: user})
+ })
+
+ "favourite" ->
+ response
+ |> Map.merge(%{
+ status: StatusView.render("status.json", %{activity: parent_activity, for: user})
+ })
+
+ "reblog" ->
+ response
+ |> Map.merge(%{
+ status: StatusView.render("status.json", %{activity: parent_activity, for: user})
+ })
+
+ "follow" ->
+ response
+
+ _ ->
+ nil
+ end
+ end
+end
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
index 35d3ff07c..7ea5607fa 100644
--- a/lib/pleroma/web/push/impl.ex
+++ b/lib/pleroma/web/push/impl.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.Web.Push.Impl do
alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.Repo
+ alias Pleroma.SubscriptionNotification
alias Pleroma.User
alias Pleroma.Web.Metadata.Utils
alias Pleroma.Web.Push.Subscription
@@ -19,7 +20,7 @@ defmodule Pleroma.Web.Push.Impl do
@types ["Create", "Follow", "Announce", "Like"]
@doc "Performs sending notifications for user subscriptions"
- @spec perform(Notification.t()) :: list(any) | :error
+ @spec perform(Notification.t() | SubscriptionNotification.t()) :: list(any) | :error
def perform(
%{
activity: %{data: %{"type" => activity_type}, id: activity_id} = activity,
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 2575481ff..5b744e898 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -293,6 +293,14 @@ defmodule Pleroma.Web.Router do
pipe_through(:oauth_read)
get("/conversations/:id/statuses", PleromaAPIController, :conversation_statuses)
get("/conversations/:id", PleromaAPIController, :conversation)
+
+ scope "/subscription_notifications" do
+ post("/clear", SubscriptionNotificationController, :clear)
+ post("/dismiss", SubscriptionNotificationController, :dismiss)
+ delete("/destroy_multiple", SubscriptionNotificationController, :destroy_multiple)
+ get("/", SubscriptionNotificationController, :index)
+ get("/:id", SubscriptionNotificationController, :show)
+ end
end
scope [] do