commit: 29b5e30c465ccb29465156d66eba02e6c0ef846f
parent: 038139d64158f3362385c89964c6b9b1dc08b6b1
Author: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 29 Aug 2018 18:38:30 +0000
activity: drop recipients_to/recipients_cc fields
Diffstat:
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
@@ -8,8 +8,6 @@ defmodule Pleroma.Activity do
field(:local, :boolean, default: true)
field(:actor, :string)
field(:recipients, {:array, :string})
- field(:recipients_to, {:array, :string})
- field(:recipients_cc, {:array, :string})
has_many(:notifications, Notification, on_delete: :delete_all)
timestamps()
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -60,16 +60,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
:ok <- check_actor_is_active(map["actor"]),
{:ok, map} <- MRF.filter(map),
:ok <- insert_full_object(map) do
- {recipients, recipients_to, recipients_cc} = get_recipients(map)
+ {recipients, _, _} = get_recipients(map)
{:ok, activity} =
Repo.insert(%Activity{
data: map,
local: local,
actor: map["actor"],
- recipients: recipients,
- recipients_to: recipients_to,
- recipients_cc: recipients_cc
+ recipients: recipients
})
Notification.create_notifications(activity)