aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-09-25 16:26:47 +0300
committerrinpatch <rinpatch@sdf.org>2019-09-26 03:46:17 +0300
commit9d32f38b39aebf441ca6f910a388c75cf2695b1c (patch)
tree6dbf36ab7789f8b106e73532c52e878359f44819
parent22a16a3e811841bba64eb1281e5277f9a009acee (diff)
downloadpleroma-9d32f38b39aebf441ca6f910a388c75cf2695b1c.tar.gz
Remove useless with clause
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub_controller.ex34
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 5a3a4d5d1..80f3b4e0c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -312,23 +312,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
%{"nickname" => nickname, "page" => page?} = params
)
when page? in [true, "true"] do
- with activities <-
- (if params["max_id"] do
- ActivityPub.fetch_activities([user.ap_id | user.following], %{
- "max_id" => params["max_id"],
- "limit" => 10
- })
- else
- ActivityPub.fetch_activities([user.ap_id | user.following], %{"limit" => 10})
- end) do
- conn
- |> put_resp_content_type("application/activity+json")
- |> put_view(UserView)
- |> render("activity_collection_page.json", %{
- activities: activities,
- iri: "#{user.ap_id}/inbox"
- })
- end
+ activities =
+ if params["max_id"] do
+ ActivityPub.fetch_activities([user.ap_id | user.following], %{
+ "max_id" => params["max_id"],
+ "limit" => 10
+ })
+ else
+ ActivityPub.fetch_activities([user.ap_id | user.following], %{"limit" => 10})
+ end
+
+ conn
+ |> put_resp_content_type("application/activity+json")
+ |> put_view(UserView)
+ |> render("activity_collection_page.json", %{
+ activities: activities,
+ iri: "#{user.ap_id}/inbox"
+ })
end
def read_inbox(%{assigns: %{user: %{nickname: nickname} = user}} = conn, %{