limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'fix/normalize-activities' into 'develop'

Browse source 
Normalize acitvities instead of objects inside them

See merge request pleroma/pleroma!1085
This commit is contained in:
kaniini 2019-04-23 02:43:26 +00:00
commit aa9d378985
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/gopher/server.ex
View file

@ -76,7 +76,7 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
|> Enum.map(fn activity -> |> Enum.map(fn activity ->
user = User.get_cached_by_ap_id(activity.data["actor"]) user = User.get_cached_by_ap_id(activity.data["actor"])
object = Object.normalize(activity.data["object"]) object = Object.normalize(activity)
like_count = object["like_count"] || 0 like_count = object["like_count"] || 0
announcement_count = object["announcement_count"] || 0 announcement_count = object["announcement_count"] || 0

2
lib/pleroma/object/fetcher.ex
View file

@ -39,7 +39,7 @@ defmodule Pleroma.Object.Fetcher do
Logger.info("Couldn't get object via AP, trying out OStatus fetching...") Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.normalize(activity.data["object"], false)} {:ok, [activity | _]} -> {:ok, Object.normalize(activity, false)}
e -> e e -> e
end end
end end

2
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -168,7 +168,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
public = "https://www.w3.org/ns/activitystreams#Public" public = "https://www.w3.org/ns/activitystreams#Public"
if activity.data["type"] in ["Create", "Announce", "Delete"] do if activity.data["type"] in ["Create", "Announce", "Delete"] do
object = Object.normalize(activity.data["object"]) object = Object.normalize(activity)
Pleroma.Web.Streamer.stream("user", activity) Pleroma.Web.Streamer.stream("user", activity)
Pleroma.Web.Streamer.stream("list", activity) Pleroma.Web.Streamer.stream("list", activity)

2
lib/pleroma/web/common_api/utils.ex
View file

@ -226,7 +226,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
} }
if in_reply_to do if in_reply_to do
in_reply_to_object = Object.normalize(in_reply_to.data["object"]) in_reply_to_object = Object.normalize(in_reply_to)
object object
|> Map.put("inReplyTo", in_reply_to_object.data["id"]) |> Map.put("inReplyTo", in_reply_to_object.data["id"])

4
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -31,7 +31,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|> Activity.create_by_object_ap_id() |> Activity.create_by_object_ap_id()
|> Repo.all() |> Repo.all()
|> Enum.reduce(%{}, fn activity, acc -> |> Enum.reduce(%{}, fn activity, acc ->
object = Object.normalize(activity.data["object"]) object = Object.normalize(activity)
Map.put(acc, object.data["id"], activity) Map.put(acc, object.data["id"], activity)
end) end)
end end
@ -316,7 +316,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
end end
def get_reply_to(activity, %{replied_to_activities: replied_to_activities}) do def get_reply_to(activity, %{replied_to_activities: replied_to_activities}) do
object = Object.normalize(activity.data["object"]) object = Object.normalize(activity)
with nil <- replied_to_activities[object.data["inReplyTo"]] do with nil <- replied_to_activities[object.data["inReplyTo"]] do
# If user didn't participate in the thread # If user didn't participate in the thread

2
lib/pleroma/web/ostatus/activity_representer.ex
View file

@ -84,7 +84,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
def to_simple_form(%{data: %{"type" => "Create"}} = activity, user, with_author) do def to_simple_form(%{data: %{"type" => "Create"}} = activity, user, with_author) do
h = fn str -> [to_charlist(str)] end h = fn str -> [to_charlist(str)] end
object = Object.normalize(activity.data["object"]) object = Object.normalize(activity)
updated_at = object.data["published"] updated_at = object.data["published"]
inserted_at = object.data["published"] inserted_at = object.data["published"]