hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move tag fixup to object_validator

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2021-04-01 13:49:04 +02:00
commit ef36f7fa5c
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/activity_pub/pipeline.ex
View file

@ -44,7 +44,6 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
def do_common_pipeline(message, meta) do
with {_, {:ok, message, meta}} <- {:validate, @object_validator.validate(message, meta)},
{_, {:ok, message, meta}} <- {:fixup, validation_fixups(message, meta)},
{_, {:ok, message, meta}} <- {:mrf, @mrf.pipeline_filter(message, meta)},
{_, {:ok, message, meta}} <- {:persist, @activity_pub.persist(message, meta)},
{_, {:ok, message, meta}} <- {:side_effects, @side_effects.handle(message, meta)},
@ -56,19 +55,6 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
end
end
defp validation_fixups(message, meta) do
# Insert copy of hashtags as strings for the non-hashtag table indexing
message =
if message["tag"] do
tag = Object.hashtags(%Object{data: message}) ++ (message["tag"] || [])
Map.put(message, "tag", tag)
else
message
end
{:ok, message, meta}
end
defp maybe_federate(%Object{}, _), do: {:ok, :not_federated}
defp maybe_federate(%Activity{} = activity, meta) do