projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hide-relation-for-friendica' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index f25314ff611bcda168134014bdb32519107ad636..f32d0417596e1dac0c5a7ae5608fbf96a58d1b13 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-1233,13
+1233,13
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
end
end
- defp collection_private(
data
) do
- if is_map(
data["first"]
) and
-
data["first"]
["type"] in ["CollectionPage", "OrderedCollectionPage"] do
+ defp collection_private(
%{"first" => first}
) do
+ if is_map(
first
) and
+
first
["type"] in ["CollectionPage", "OrderedCollectionPage"] do
{:ok, false}
else
with {:ok, %{"type" => type}} when type in ["CollectionPage", "OrderedCollectionPage"] <-
{:ok, false}
else
with {:ok, %{"type" => type}} when type in ["CollectionPage", "OrderedCollectionPage"] <-
- Fetcher.fetch_and_contain_remote_object_from_id(
data["first"]
) do
+ Fetcher.fetch_and_contain_remote_object_from_id(
first
) do
{:ok, false}
else
{:error, {:ok, %{status: code}}} when code in [401, 403] ->
{:ok, false}
else
{:error, {:ok, %{status: code}}} when code in [401, 403] ->
@@
-1254,6
+1254,8
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
end
end
+ defp collection_private(_data), do: {:ok, true}
+
def user_data_from_user_object(data) do
with {:ok, data} <- MRF.filter(data),
{:ok, data} <- object_to_user_data(data) do
def user_data_from_user_object(data) do
with {:ok, data} <- MRF.filter(data),
{:ok, data} <- object_to_user_data(data) do