mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 00:26:30 +00:00
Fix activity_representer to work with User.get_or_fetch returning tuple.
This commit is contained in:
parent
0cf04e1088
commit
1d8950798c
2 changed files with 7 additions and 10 deletions
|
@ -9,20 +9,19 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
|
|||
alias Pleroma.Web.ActivityPub.Visibility
|
||||
alias Pleroma.Web.Router.Helpers
|
||||
|
||||
def prepare_activity(%User{} = user, %Object{} = object, activity_id) do
|
||||
def prepare_activity(%User{} = user, %Activity{} = activity) do
|
||||
object = Object.normalize(activity.data["object"])
|
||||
|
||||
%{}
|
||||
|> set_user(user)
|
||||
|> set_object(object)
|
||||
|> set_title(object)
|
||||
|> set_content(object)
|
||||
|> set_link(activity_id)
|
||||
|> set_link(activity.id)
|
||||
|> set_published(object)
|
||||
|> set_attachments(object)
|
||||
end
|
||||
|
||||
def prepare_activity(%User{} = user, %Activity{} = activity),
|
||||
do: prepare_activity(user, Object.normalize(activity.data["object"]), activity.id)
|
||||
|
||||
defp set_user(data, %User{} = user), do: Map.put(data, :user, user)
|
||||
|
||||
defp set_object(data, %Object{} = object), do: Map.put(data, :object, object)
|
||||
|
@ -52,10 +51,8 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
|
|||
def represent(activity_id) do
|
||||
with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id(activity_id),
|
||||
true <- Visibility.is_public?(activity),
|
||||
%Object{} = object <- Object.normalize(activity.data["object"]),
|
||||
%User{} = user <- User.get_or_fetch(activity.data["actor"]),
|
||||
data <- prepare_activity(user, object, activity_id) do
|
||||
{:ok, data}
|
||||
{:ok, %User{} = user} <- User.get_or_fetch(activity.data["actor"]) do
|
||||
{:ok, prepare_activity(user, activity)}
|
||||
else
|
||||
e ->
|
||||
{:error, e}
|
||||
|
|
Loading…
Reference in a new issue