moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch_announcements -> take_announcements

This commit is contained in:
Maksim Pechnikov 2019-09-04 17:42:27 +03:00
parent 8cbad5500c
commit a890451187
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/utils.ex
View File

@ -518,7 +518,7 @@ def add_announce_to_object(
%Activity{data: %{"actor" => actor, "cc" => [Pleroma.Constants.as_public()]}}, %Activity{data: %{"actor" => actor, "cc" => [Pleroma.Constants.as_public()]}},
object object
) do ) do
announcements = fetch_announcements(object) announcements = take_announcements(object)
with announcements <- Enum.uniq([actor | announcements]) do with announcements <- Enum.uniq([actor | announcements]) do
update_element_in_object("announcement", announcements, object) update_element_in_object("announcement", announcements, object)
@ -530,16 +530,16 @@ def add_announce_to_object(_, object), do: {:ok, object}
@spec remove_announce_from_object(Activity.t(), Object.t()) :: @spec remove_announce_from_object(Activity.t(), Object.t()) ::
{:ok, Object.t()} | {:error, Ecto.Changeset.t()} {:ok, Object.t()} | {:error, Ecto.Changeset.t()}
def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do
with announcements <- List.delete(fetch_announcements(object), actor) do with announcements <- List.delete(take_announcements(object), actor) do
update_element_in_object("announcement", announcements, object) update_element_in_object("announcement", announcements, object)
end end
end end
defp fetch_announcements(%{data: %{"announcements" => announcements}} = _) defp take_announcements(%{data: %{"announcements" => announcements}} = _)
when is_list(announcements), when is_list(announcements),
do: announcements do: announcements
defp fetch_announcements(_), do: [] defp take_announcements(_), do: []
#### Unfollow-related helpers #### Unfollow-related helpers