projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/database-compaction
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index e6507e5ca011b342b8a656c6ce20e1476332eaaa..99cc9c077cb131472711e3e26a98ad880e0709ee 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-10,6
+10,7
@@
defmodule Pleroma.Activity do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Repo
+ import Ecto.Changeset
import Ecto.Query
@type t :: %__MODULE__{}
import Ecto.Query
@type t :: %__MODULE__{}
@@
-79,6
+80,13
@@
defmodule Pleroma.Activity do
)
end
)
end
+ def change(struct, params \\ %{}) do
+ struct
+ |> cast(params, [:data])
+ |> validate_required([:data])
+ |> unique_constraint(:ap_id, name: :activities_unique_apid_index)
+ end
+
def get_by_ap_id_with_object(ap_id) do
Repo.one(
from(
def get_by_ap_id_with_object(ap_id) do
Repo.one(
from(
@@
-202,15
+210,19
@@
defmodule Pleroma.Activity do
|> Repo.one()
end
|> Repo.one()
end
- def normalize(obj) when is_map(obj), do: get_by_ap_id_with_object(obj["id"])
- def normalize(ap_id) when is_binary(ap_id), do: get_by_ap_id_with_object(ap_id)
- def normalize(_), do: nil
+ defp get_in_reply_to_activity_from_object(%Object{data: %{"inReplyTo" => ap_id}}) do
+ get_create_by_object_ap_id_with_object(ap_id)
+ end
+
+ defp get_in_reply_to_activity_from_object(_), do: nil
- def get_in_reply_to_activity(%Activity{data: %{"object" =>
%{"inReplyTo" => ap_id}
}}) do
- get_
create_by_object_ap_id(ap_id
)
+ def get_in_reply_to_activity(%Activity{data: %{"object" =>
object
}}) do
+ get_
in_reply_to_activity_from_object(Object.normalize(object)
)
end
end
- def get_in_reply_to_activity(_), do: nil
+ def normalize(obj) when is_map(obj), do: get_by_ap_id_with_object(obj["id"])
+ def normalize(ap_id) when is_binary(ap_id), do: get_by_ap_id_with_object(ap_id)
+ def normalize(_), do: nil
def delete_by_ap_id(id) when is_binary(id) do
by_object_ap_id(id)
def delete_by_ap_id(id) when is_binary(id) do
by_object_ap_id(id)