diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 59 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 4 |
2 files changed, 40 insertions, 23 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 10efa2c9d..b9ba72b0d 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -19,28 +19,43 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do Repo.insert(%Activity{data: map}) end - def like(%User{ap_id: ap_id}, object = %Object{data: %{ "id" => id}}) do - data = %{ - "type" => "Like", - "actor" => ap_id, - "object" => id - } - - {:ok, activity} = insert(data) - like_count = (object.data["like_count"] || 0) + 1 - new_data = object.data |> Map.put("like_count", like_count) - changeset = Ecto.Changeset.change(object, data: new_data) - {:ok, object} = Repo.update(changeset) - - # Update activities that already had this. Could be done in a seperate process. - relevant_activities = Activity.all_by_object_ap_id(id) - Enum.map(relevant_activities, fn (activity) -> - new_activity_data = activity.data |> Map.put("object", new_data) - changeset = Ecto.Changeset.change(activity, data: new_activity_data) - Repo.update(changeset) - end) - - {:ok, activity, object} + def like(%User{ap_id: ap_id} = user, %Object{data: %{ "id" => id}} = object) do + cond do + # There's already a like here, so return the original activity. + ap_id in (object.data["likes"] || []) -> + query = from activity in Activity, + where: fragment("? @> ?", activity.data, ^%{actor: ap_id, object: id}) + + activity = Repo.one(query) + {:ok, activity, object} + true -> + data = %{ + "type" => "Like", + "actor" => ap_id, + "object" => id, + "to" => [User.ap_followers(user)] + } + + {:ok, activity} = insert(data) + + likes = [ap_id | (object.data["likes"] || [])] |> Enum.uniq + + new_data = object.data + |> Map.put("like_count", length(likes)) + |> Map.put("likes", likes) + + changeset = Ecto.Changeset.change(object, data: new_data) + {:ok, object} = Repo.update(changeset) + + # Update activities that already had this. Could be done in a seperate process. + relevant_activities = Activity.all_by_object_ap_id(id) + Enum.map(relevant_activities, fn (activity) -> + new_activity_data = activity.data |> Map.put("object", new_data) + changeset = Ecto.Changeset.change(activity, data: new_activity_data) + Repo.update(changeset) + end) + {:ok, activity, object} + end end def generate_activity_id do diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index ed8655905..e69a63e1d 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -45,6 +45,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do created_at = get_in(activity.data, ["object", "published"]) |> date_to_asctime like_count = get_in(activity.data, ["object", "like_count"]) || 0 + favorited = opts[:for] && opts[:for].ap_id in (activity.data["object"]["likes"] || []) mentions = opts[:mentioned] || [] @@ -66,7 +67,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"], "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts), "attentions" => attentions, - "fave_num" => like_count + "fave_num" => like_count, + "favorited" => !!favorited } end |