diff options
author | rinpatch <rinpatch@sdf.org> | 2019-09-25 16:26:47 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-09-27 00:31:00 +0300 |
commit | 821fb2a5841ba68593390939470aec5d8a9ad6d5 (patch) | |
tree | 59127d345488a87c17d80bd75d23949c0773ac02 | |
parent | 700d0a56a1a12a29b416862cf5309e4f1099515c (diff) | |
download | pleroma-821fb2a5841ba68593390939470aec5d8a9ad6d5.tar.gz |
Remove useless with clause
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub_controller.ex | 34 |
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 636848a38..9d0e4c7ef 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -248,23 +248,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, %{ |