Add actor column to activities.

This commit is contained in:
Roger Braun 2017-11-09 10:41:19 +01:00
parent 41b8a76e96
commit f1d27a5fbb
5 changed files with 32 additions and 5 deletions

View file

@ -6,6 +6,7 @@ defmodule Pleroma.Activity do
schema "activities" do schema "activities" do
field :data, :map field :data, :map
field :local, :boolean, default: true field :local, :boolean, default: true
field :actor, :string
has_many :notifications, Notification has_many :notifications, Notification
timestamps() timestamps()

View file

@ -9,7 +9,7 @@ def insert(map, local \\ true) when is_map(map) do
with nil <- Activity.get_by_ap_id(map["id"]), with nil <- Activity.get_by_ap_id(map["id"]),
map <- lazy_put_activity_defaults(map), map <- lazy_put_activity_defaults(map),
:ok <- insert_full_object(map) do :ok <- insert_full_object(map) do
{:ok, activity} = Repo.insert(%Activity{data: map, local: local}) {:ok, activity} = Repo.insert(%Activity{data: map, local: local, actor: map["actor"]})
Notification.create_notifications(activity) Notification.create_notifications(activity)
{:ok, activity} {:ok, activity}
else else
@ -137,7 +137,7 @@ defp restrict_max(query, _), do: query
defp restrict_actor(query, %{"actor_id" => actor_id}) do defp restrict_actor(query, %{"actor_id" => actor_id}) do
from activity in query, from activity in query,
where: fragment("?->>'actor' = ?", activity.data, ^actor_id) where: activity.actor == ^actor_id
end end
defp restrict_actor(query, _), do: query defp restrict_actor(query, _), do: query
@ -168,14 +168,14 @@ defp restrict_recent(query, _) do
defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
blocks = info["blocks"] || [] blocks = info["blocks"] || []
from activity in query, from activity in query,
where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks) where: fragment("not (? = ANY(?))", activity.actor, ^blocks)
end end
defp restrict_blocked(query, _), do: query defp restrict_blocked(query, _), do: query
def fetch_activities(recipients, opts \\ %{}) do def fetch_activities(recipients, opts \\ %{}) do
base_query = from activity in Activity, base_query = from activity in Activity,
limit: 20, limit: 20,
order_by: [desc: :id] order_by: [fragment("? desc nulls last", activity.id)]
base_query base_query
|> restrict_recipients(recipients) |> restrict_recipients(recipients)

View file

@ -0,0 +1,24 @@
defmodule Pleroma.Repo.Migrations.AddActorToActivity do
use Ecto.Migration
@disable_ddl_transaction true
def up do
alter table(:activities) do
add :actor, :string
end
execute """
update activities set actor = data->>'actor';
"""
create index(:activities, [:actor, "id DESC NULLS LAST"], concurrently: true)
end
def down do
drop index(:activities, [:actor, "id DESC NULLS LAST"])
alter table(:activities) do
remove :actor
end
end
end

View file

@ -51,7 +51,8 @@ def note_activity_factory do
} }
%Pleroma.Activity{ %Pleroma.Activity{
data: data data: data,
actor: data["actor"]
} }
end end

View file

@ -52,6 +52,7 @@ test "adds an id to a given object if it lacks one and inserts it to the object
test "removes doubled 'to' recipients" do test "removes doubled 'to' recipients" do
{:ok, activity} = ActivityPub.create(["user1", "user1", "user2"], %User{ap_id: "1"}, "", %{}) {:ok, activity} = ActivityPub.create(["user1", "user1", "user2"], %User{ap_id: "1"}, "", %{})
assert activity.data["to"] == ["user1", "user2"] assert activity.data["to"] == ["user1", "user2"]
assert activity.actor == "1"
end end
end end