diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-06-18 21:20:44 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-06-27 13:08:05 +0000 |
| commit | 6f4ca7ddf7f70b219ef1223f6343707ff6910f90 (patch) | |
| tree | 9db618b7f7fae4acdb7518ffd5a0154f2ccd3603 /lib | |
| parent | 5b240c3b187260498cbebbd540872975fb30bafe (diff) | |
| download | pleroma-6f4ca7ddf7f70b219ef1223f6343707ff6910f90.tar.gz | |
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/activity_representer.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus_controller.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index 4179d86c9..5d831459b 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -246,7 +246,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] mentions = (activity.recipients || []) |> get_mentions - follow_activity = Activity.get_by_ap_id(follow_activity["id"]) + follow_activity = Activity.normalize(follow_activity) [ {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index 2f72fdb16..00bffbd5d 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -107,7 +107,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do def activity(conn, %{"uuid" => uuid}) do with id <- o_status_url(conn, :activity, uuid), - {_, %Activity{} = activity} <- {:activity, Activity.get_by_ap_id(id)}, + {_, %Activity{} = activity} <- {:activity, Activity.normalize(id)}, {_, true} <- {:public?, ActivityPub.is_public?(activity)}, %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do case get_format(conn) do |