From fa0c279139f384f6c97bce217be4131b255f00b1 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Fri, 14 Apr 2017 15:07:24 +0200 Subject: [PATCH] Favorite changes. - Add 'likes' to activity, collection of ids of people who liked it. - show if you favorited something or not. - Don't allow double favorites - Address favorites to the followers of the liked activity's author. --- TODO.txt | 7 --- lib/pleroma/web/activity_pub/activity_pub.ex | 53 ++++++++++++------- .../representers/activity_representer.ex | 4 +- test/web/activity_pub/activity_pub_test.exs | 10 +++- .../activity_representer_test.exs | 10 +++- 5 files changed, 54 insertions(+), 30 deletions(-) diff --git a/TODO.txt b/TODO.txt index 78cb92e2c..42501a637 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,8 +1 @@ - Add cache for user fetching / representing. (mostly in TwitterAPI.activity_to_status) - -Favorites: -- Add 'likes' to activity, collection of ids of people who liked it. -- show if you favorited something or not. -- Don't allow double favorites -- Address favorites to the followers of the liked activity's author. - 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 - } + 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}) - {: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) + activity = Repo.one(query) + {:ok, activity, object} + true -> + data = %{ + "type" => "Like", + "actor" => ap_id, + "object" => id, + "to" => [User.ap_followers(user)] + } - # 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} = insert(data) - {:ok, activity, object} + 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 diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 2bdd439b0..570120484 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -1,7 +1,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do use Pleroma.DataCase alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.{Activity, Object} + alias Pleroma.{Activity, Object, User} alias Pleroma.Builders.ActivityBuilder import Pleroma.Factory @@ -124,7 +124,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do assert like_activity.data["actor"] == user.ap_id assert like_activity.data["type"] == "Like" assert like_activity.data["object"] == object.data["id"] + assert like_activity.data["to"] == [User.ap_followers(user)] assert object.data["like_count"] == 1 + assert object.data["likes"] == [user.ap_id] + + # Just return the original activity if the user already liked it. + {:ok, same_like_activity, object} = ActivityPub.like(user, object) + + assert like_activity == same_like_activity + assert object.data["likes"] == [user.ap_id] [note_activity] = Activity.all_by_object_ap_id(object.data["id"]) assert note_activity.data["object"]["like_count"] == 1 diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 5673c1f0d..d1f9e00c8 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -11,11 +11,16 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do note_activity = insert(:note_activity) object = Object.get_by_ap_id(note_activity.data["object"]["id"]) - {:ok, like_activity, object} = ActivityPub.like(user, object) + {:ok, like_activity, _object} = ActivityPub.like(user, object) status = ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity}) assert status["id"] == like_activity.id assert status["in_reply_to_status_id"] == note_activity.id + + note_activity = Activity.get_by_ap_id(note_activity.data["id"]) + activity_actor = Repo.get_by(User, ap_id: note_activity.data["actor"]) + liked_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user}) + assert liked_status["favorited"] == true end test "an activity" do @@ -84,7 +89,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "attentions" => [ UserRepresenter.to_map(mentioned_user, %{for: follower}) ], - "fave_num" => 5 + "fave_num" => 5, + "favorited" => false } assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status