activity: drop recipients_to/recipients_cc fields
authorWilliam Pitcock <nenolod@dereferenced.org>
Wed, 29 Aug 2018 18:38:30 +0000 (18:38 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Wed, 29 Aug 2018 18:41:02 +0000 (18:41 +0000)
lib/pleroma/activity.ex
lib/pleroma/web/activity_pub/activity_pub.ex

index 4f1f8292dc13408d99b7f5cf2c52195118e8e1a2..bed96861f893043f8651401fb6cc268aa91c2d5a 100644 (file)
@@ -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()
index 116dbcf1ef50578f047f337dab354ca629f96cc9..e6c2dc9cff4a0d021f4bad5cd1892b27d79760cc 100644 (file)
@@ -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)