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/expire-mutes
[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 3ab0457375a333a554ebe644abf458372ec7c872..92fc1e4227ca289ac76bdeecff72a2d05819e813 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-154,8
+154,8
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:remote_limit_pass, _} ->
{:error, :remote_limit}
{:remote_limit_pass, _} ->
{:error, :remote_limit}
- {:reject,
reason}
->
- {:error,
reason
}
+ {:reject,
_} = e
->
+ {:error,
e
}
end
end
end
end
@@
-767,7
+767,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
defp restrict_replies(query, %{
end
defp restrict_replies(query, %{
- reply_filtering_user: user,
+ reply_filtering_user:
%User{} =
user,
reply_visibility: "self"
}) do
from(
reply_visibility: "self"
}) do
from(
@@
-783,7
+783,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
defp restrict_replies(query, %{
end
defp restrict_replies(query, %{
- reply_filtering_user: user,
+ reply_filtering_user:
%User{} =
user,
reply_visibility: "following"
}) do
from(
reply_visibility: "following"
}) do
from(