Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
1  2 
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs

diff --combined lib/pleroma/user.ex
index 383c4599207c727c38d6a81d03d802b686751ee8,fcb1d5143942bc7738aff01ca8ecf70ca7166181..d6bc02d0420437334bd9396a43a956be23535396
@@@ -7,7 -7,6 +7,7 @@@ defmodule Pleroma.User d
  
    import Ecto.Changeset
    import Ecto.Query
 +  import Ecto, only: [assoc: 2]
  
    alias Comeonin.Pbkdf2
    alias Ecto.Multi
@@@ -22,8 -21,6 +22,8 @@@
    alias Pleroma.Repo
    alias Pleroma.RepoStreamer
    alias Pleroma.User
 +  alias Pleroma.UserBlock
 +  alias Pleroma.UserMute
    alias Pleroma.Web
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Utils
@@@ -77,6 -74,7 +77,6 @@@
      field(:password_reset_pending, :boolean, default: false)
      field(:confirmation_token, :string, default: nil)
      field(:default_scope, :string, default: "public")
 -    field(:blocks, {:array, :string}, default: [])
      field(:domain_blocks, {:array, :string}, default: [])
      field(:mutes, {:array, :string}, default: [])
      field(:muted_reblogs, {:array, :string}, default: [])
      has_many(:registrations, Registration)
      has_many(:deliveries, Delivery)
  
 +    has_many(:blocker_blocks, UserBlock, foreign_key: :blocker_id)
 +    has_many(:blockee_blocks, UserBlock, foreign_key: :blockee_id)
 +    has_many(:blocked_users, through: [:blocker_blocks, :blockee])
 +    has_many(:blocker_users, through: [:blockee_blocks, :blocker])
 +
 +    has_many(:muter_mutes, UserMute, foreign_key: :muter_id)
 +    has_many(:mutee_mutes, UserMute, foreign_key: :mutee_id)
 +    has_many(:muted_users, through: [:muter_mutes, :mutee])
 +    has_many(:muter_users, through: [:mutee_mutes, :muter])
 +
      field(:info, :map, default: %{})
  
 +    # `:blocks` is deprecated (replaced with `blocked_users` relation)
 +    field(:blocks, {:array, :string}, default: [])
 +
      timestamps()
    end
  
+   @doc "Returns if the user should be allowed to authenticate"
+   def auth_active?(%User{deactivated: true}), do: false
    def auth_active?(%User{confirmation_pending: true}),
      do: !Pleroma.Config.get([:instance, :account_activation_required])
  
    end
  
    @spec mute(User.t(), User.t(), boolean()) :: {:ok, User.t()} | {:error, String.t()}
 -  def mute(muter, %User{ap_id: ap_id}, notifications? \\ true) do
 -    add_to_mutes(muter, ap_id, notifications?)
 +  def mute(muter, %User{} = mutee, notifications? \\ true) do
 +    add_to_mutes(muter, mutee, notifications?)
    end
  
 -  def unmute(muter, %{ap_id: ap_id}) do
 -    remove_from_mutes(muter, ap_id)
 +  def unmute(muter, %User{} = mutee) do
 +    remove_from_mutes(muter, mutee)
    end
  
    def subscribe(subscriber, %{ap_id: ap_id}) do
      end
    end
  
 -  def block(blocker, %User{ap_id: ap_id} = blocked) do
 +  def block(blocker, %User{} = blocked) do
      # sever any follow relationships to prevent leaks per activitypub (Pleroma issue #213)
      blocker =
        if following?(blocker, blocked) do
  
      {:ok, blocker} = update_follower_count(blocker)
      {:ok, blocker, _} = Participation.mark_all_as_read(blocker, blocked)
 -    add_to_block(blocker, ap_id)
 +    add_to_block(blocker, blocked)
    end
  
    # helper to handle the block given only an actor's AP id
      block(blocker, get_cached_by_ap_id(ap_id))
    end
  
 +  def unblock(blocker, %User{} = blocked) do
 +    remove_from_block(blocker, blocked)
 +  end
 +
 +  # helper to handle the block given only an actor's AP id
    def unblock(blocker, %{ap_id: ap_id}) do
 -    remove_from_block(blocker, ap_id)
 +    unblock(blocker, get_cached_by_ap_id(ap_id))
    end
  
    def mutes?(nil, _), do: false
 -  def mutes?(user, %{ap_id: ap_id}), do: Enum.member?(user.mutes, ap_id)
 +  def mutes?(%User{} = user, %User{} = target), do: mutes_user?(user, target)
 +
 +  def mutes_user?(%User{} = user, %User{} = target) do
 +    UserMute.exists?(user, target)
 +  end
  
    @spec muted_notifications?(User.t() | nil, User.t() | map()) :: boolean()
    def muted_notifications?(nil, _), do: false
    def muted_notifications?(user, %{ap_id: ap_id}),
      do: Enum.member?(user.muted_notifications, ap_id)
  
 +  def blocks?(nil, _), do: false
 +
    def blocks?(%User{} = user, %User{} = target) do
 -    blocks_ap_id?(user, target) || blocks_domain?(user, target)
 +    blocks_user?(user, target) || blocks_domain?(user, target)
    end
  
 -  def blocks?(nil, _), do: false
 -
 -  def blocks_ap_id?(%User{} = user, %User{} = target) do
 -    Enum.member?(user.blocks, target.ap_id)
 +  def blocks_user?(%User{} = user, %User{} = target) do
 +    UserBlock.exists?(user, target)
    end
  
 -  def blocks_ap_id?(_, _), do: false
 +  def blocks_user?(_, _), do: false
  
    def blocks_domain?(%User{} = user, %User{} = target) do
      domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.domain_blocks)
  
    @spec muted_users(User.t()) :: [User.t()]
    def muted_users(user) do
 -    User.Query.build(%{ap_id: user.mutes, deactivated: false})
 +    user
 +    |> assoc(:muted_users)
 +    |> restrict_deactivated()
 +    |> Repo.all()
 +  end
 +
 +  def muted_ap_ids(user) do
 +    user
 +    |> assoc(:muted_users)
 +    |> select([u], u.ap_id)
      |> Repo.all()
    end
  
    @spec blocked_users(User.t()) :: [User.t()]
    def blocked_users(user) do
 -    User.Query.build(%{ap_id: user.blocks, deactivated: false})
 +    user
 +    |> assoc(:blocked_users)
 +    |> restrict_deactivated()
      |> Repo.all()
    end
  
 +  def blocked_ap_ids(user) do
 +    user
 +    |> assoc(:blocked_users)
 +    |> select([u], u.ap_id)
 +    |> Repo.all()
 +  end
 +
 +  defp related_ap_ids_sql(join_table, source_column, target_column) do
 +    "(SELECT array_agg(u.ap_id) FROM users as u " <>
 +      "INNER JOIN #{join_table} AS join_table " <>
 +      "ON join_table.#{source_column} = $1 " <>
 +      "WHERE u.id = join_table.#{target_column})"
 +  end
 +
 +  @related_ap_ids_sql_params %{
 +    blocked_users: ["user_blocks", "blocker_id", "blockee_id"],
 +    muted_users: ["user_mutes", "muter_id", "mutee_id"]
 +  }
 +
 +  def related_ap_ids(user, relations) when is_list(relations) do
 +    query =
 +      relations
 +      |> Enum.map(fn r -> @related_ap_ids_sql_params[r] end)
 +      |> Enum.filter(& &1)
 +      |> Enum.map(fn [join_table, source_column, target_column] ->
 +        related_ap_ids_sql(join_table, source_column, target_column)
 +      end)
 +      |> Enum.join(", ")
 +
 +    with {:ok, %{rows: [ap_ids_arrays]}} <-
 +           Repo.query("SELECT #{query}", [FlakeId.from_string(user.id)]) do
 +      ap_ids_arrays = Enum.map(ap_ids_arrays, &(&1 || []))
 +      {:ok, ap_ids_arrays}
 +    end
 +  end
 +
    @spec subscribers(User.t()) :: [User.t()]
    def subscribers(user) do
      User.Query.build(%{ap_id: user.subscribers, deactivated: false})
        blocked_identifiers,
        fn blocked_identifier ->
          with {:ok, %User{} = blocked} <- get_or_fetch(blocked_identifier),
 -             {:ok, blocker} <- block(blocker, blocked),
 +             {:ok, _user_block} <- block(blocker, blocked),
               {:ok, _} <- ActivityPub.block(blocker, blocked) do
            blocked
          else
      set_domain_blocks(user, List.delete(user.domain_blocks, domain_blocked))
    end
  
 -  defp set_blocks(user, blocks) do
 -    params = %{blocks: blocks}
 -
 -    user
 -    |> cast(params, [:blocks])
 -    |> validate_required([:blocks])
 -    |> update_and_set_cache()
 -  end
 -
 -  def add_to_block(user, blocked) do
 -    set_blocks(user, Enum.uniq([blocked | user.blocks]))
 +  @spec add_to_block(User.t(), User.t()) :: {:ok, UserBlock.t()} | {:error, Ecto.Changeset.t()}
 +  defp add_to_block(%User{} = user, %User{} = blocked) do
 +    UserBlock.create(user, blocked)
    end
  
 -  def remove_from_block(user, blocked) do
 -    set_blocks(user, List.delete(user.blocks, blocked))
 +  @spec add_to_block(User.t(), User.t()) ::
 +          {:ok, UserBlock.t()} | {:ok, nil} | {:error, Ecto.Changeset.t()}
 +  defp remove_from_block(%User{} = user, %User{} = blocked) do
 +    UserBlock.delete(user, blocked)
    end
  
 -  defp set_mutes(user, mutes) do
 -    params = %{mutes: mutes}
 -
 -    user
 -    |> cast(params, [:mutes])
 -    |> validate_required([:mutes])
 -    |> update_and_set_cache()
 -  end
 -
 -  def add_to_mutes(user, muted, notifications?) do
 -    with {:ok, user} <- set_mutes(user, Enum.uniq([muted | user.mutes])) do
 -      set_notification_mutes(
 -        user,
 -        Enum.uniq([muted | user.muted_notifications]),
 -        notifications?
 -      )
 +  defp add_to_mutes(%User{} = user, %User{ap_id: ap_id} = muted_user, notifications?) do
 +    with {:ok, user_mute} <- UserMute.create(user, muted_user),
 +         {:ok, _user} <-
 +           set_notification_mutes(
 +             user,
 +             Enum.uniq([ap_id | user.muted_notifications]),
 +             notifications?
 +           ) do
 +      {:ok, user_mute}
      end
    end
  
 -  def remove_from_mutes(user, muted) do
 -    with {:ok, user} <- set_mutes(user, List.delete(user.mutes, muted)) do
 -      set_notification_mutes(
 -        user,
 -        List.delete(user.muted_notifications, muted),
 -        true
 -      )
 +  defp remove_from_mutes(user, %User{ap_id: ap_id} = muted_user) do
 +    with {:ok, user_mute} <- UserMute.delete(user, muted_user),
 +         {:ok, _user} <-
 +           set_notification_mutes(
 +             user,
 +             List.delete(user.muted_notifications, ap_id),
 +             true
 +           ) do
 +      {:ok, user_mute}
      end
    end
  
index cba2abfc37314db5b664cdc6597036c69e7138c1,d0c014e9dba96052e96e9719db35b33f7a9a924e..7a4a4791ea48191f1b7477f21ece1e5f84401189
@@@ -322,6 -322,32 +322,32 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      end
    end
  
+   def react_with_emoji(user, object, emoji, options \\ []) do
+     with local <- Keyword.get(options, :local, true),
+          activity_id <- Keyword.get(options, :activity_id, nil),
+          Pleroma.Emoji.is_unicode_emoji?(emoji),
+          reaction_data <- make_emoji_reaction_data(user, object, emoji, activity_id),
+          {:ok, activity} <- insert(reaction_data, local),
+          {:ok, object} <- add_emoji_reaction_to_object(activity, object),
+          :ok <- maybe_federate(activity) do
+       {:ok, activity, object}
+     end
+   end
+   def unreact_with_emoji(user, reaction_id, options \\ []) do
+     with local <- Keyword.get(options, :local, true),
+          activity_id <- Keyword.get(options, :activity_id, nil),
+          user_ap_id <- user.ap_id,
+          %Activity{actor: ^user_ap_id} = reaction_activity <- Activity.get_by_ap_id(reaction_id),
+          object <- Object.normalize(reaction_activity),
+          unreact_data <- make_undo_data(user, reaction_activity, activity_id),
+          {:ok, activity} <- insert(unreact_data, local),
+          {:ok, object} <- remove_emoji_reaction_from_object(reaction_activity, object),
+          :ok <- maybe_federate(activity) do
+       {:ok, activity, object}
+     end
+   end
    # TODO: This is weird, maybe we shouldn't check here if we can make the activity.
    def like(
          %User{ap_id: ap_id} = user,
    defp restrict_muted(query, %{"with_muted" => val}) when val in [true, "true", "1"], do: query
  
    defp restrict_muted(query, %{"muting_user" => %User{} = user} = opts) do
 -    mutes = user.mutes
 +    mutes = opts["muted_ap_ids"] || User.muted_ap_ids(user)
  
      query =
        from([activity] in query,
  
    defp restrict_muted(query, _), do: query
  
 -  defp restrict_blocked(query, %{"blocking_user" => %User{} = user}) do
 -    blocks = user.blocks || []
 +  defp restrict_blocked(query, %{"blocking_user" => %User{} = user} = opts) do
 +    blocked_ap_ids = opts["blocked_ap_ids"] || User.blocked_ap_ids(user)
      domain_blocks = user.domain_blocks || []
  
      query =
  
      from(
        [activity, object: o] in query,
 -      where: fragment("not (? = ANY(?))", activity.actor, ^blocks),
 -      where: fragment("not (? && ?)", activity.recipients, ^blocks),
 +      where: fragment("not (? = ANY(?))", activity.actor, ^blocked_ap_ids),
 +      where: fragment("not (? && ?)", activity.recipients, ^blocked_ap_ids),
        where:
          fragment(
            "not (?->>'type' = 'Announce' and ?->'to' \\?| ?)",
            activity.data,
            activity.data,
 -          ^blocks
 +          ^blocked_ap_ids
          ),
        where: fragment("not (split_part(?, '/', 3) = ANY(?))", activity.actor, ^domain_blocks),
        where: fragment("not (split_part(?->>'actor', '/', 3) = ANY(?))", o.data, ^domain_blocks)
index e37d3bb0760e642fe127330ecccd4fc41f7ccaae,5b01b964b8a52fb85aa05a60de590df627a9f87a..750f5c69055a868ce4717378e442b1ffeca0218f
@@@ -66,9 -66,9 +66,9 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
    @relations [:follow, :unfollow]
    @needs_account ~W(followers following lists follow unfollow mute unmute block unblock)a
  
-   plug(RateLimiter, {:relations_id_action, params: ["id", "uri"]} when action in @relations)
-   plug(RateLimiter, :relations_actions when action in @relations)
-   plug(RateLimiter, :app_account_creation when action == :create)
+   plug(RateLimiter, [name: :relations_id_action, params: ["id", "uri"]] when action in @relations)
+   plug(RateLimiter, [name: :relations_actions] when action in @relations)
+   plug(RateLimiter, [name: :app_account_creation] when action == :create)
    plug(:assign_account_by_id when action in @needs_account)
  
    action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
    def mute(%{assigns: %{user: muter, account: muted}} = conn, params) do
      notifications? = params |> Map.get("notifications", true) |> truthy_param?()
  
 -    with {:ok, muter} <- User.mute(muter, muted, notifications?) do
 +    with {:ok, _user_mute} <- User.mute(muter, muted, notifications?) do
 +      # TODO: remove `muter` refresh once `muted_notifications` field is deprecated
 +      muter = User.get_cached_by_id(muter.id)
        render(conn, "relationship.json", user: muter, target: muted)
      else
        {:error, message} -> json_response(conn, :forbidden, %{error: message})
  
    @doc "POST /api/v1/accounts/:id/unmute"
    def unmute(%{assigns: %{user: muter, account: muted}} = conn, _params) do
 -    with {:ok, muter} <- User.unmute(muter, muted) do
 +    with {:ok, _user_mute} <- User.unmute(muter, muted) do
 +      # TODO: remove `muter` refresh once `muted_notifications` field is deprecated
 +      muter = User.get_cached_by_id(muter.id)
        render(conn, "relationship.json", user: muter, target: muted)
      else
        {:error, message} -> json_response(conn, :forbidden, %{error: message})
  
    @doc "POST /api/v1/accounts/:id/block"
    def block(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do
 -    with {:ok, blocker} <- User.block(blocker, blocked),
 +    with {:ok, _user_block} <- User.block(blocker, blocked),
           {:ok, _activity} <- ActivityPub.block(blocker, blocked) do
        render(conn, "relationship.json", user: blocker, target: blocked)
      else
  
    @doc "POST /api/v1/accounts/:id/unblock"
    def unblock(%{assigns: %{user: blocker, account: blocked}} = conn, _params) do
 -    with {:ok, blocker} <- User.unblock(blocker, blocked),
 +    with {:ok, _user_block} <- User.unblock(blocker, blocked),
           {:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do
        render(conn, "relationship.json", user: blocker, target: blocked)
      else
diff --combined test/user_test.exs
index 15b4f67f69b8d55c0770577905adc737be32669c,8fdb6b25fc2f2bba9916d8bfdc32c4924fb00bf4..9e3c4b984b9c52cc70020d262d2be459f44b9993
@@@ -100,7 -100,7 +100,7 @@@ defmodule Pleroma.UserTest d
      CommonAPI.follow(follower, followed)
      assert [_activity] = User.get_follow_requests(followed)
  
 -    {:ok, _follower} = User.block(followed, follower)
 +    {:ok, _user_block} = User.block(followed, follower)
      assert [] = User.get_follow_requests(followed)
    end
  
      not_followed = insert(:user)
      reverse_blocked = insert(:user)
  
 -    {:ok, user} = User.block(user, blocked)
 -    {:ok, reverse_blocked} = User.block(reverse_blocked, user)
 +    {:ok, _user_block} = User.block(user, blocked)
 +    {:ok, _user_block} = User.block(reverse_blocked, user)
  
      {:ok, user} = User.follow(user, followed_zero)
  
      blocker = insert(:user)
      blockee = insert(:user)
  
 -    {:ok, blocker} = User.block(blocker, blockee)
 +    {:ok, _user_block} = User.block(blocker, blockee)
  
      {:error, _} = User.follow(blockee, blocker)
    end
      blocker = insert(:user)
      blocked = insert(:user)
  
 -    {:ok, blocker} = User.block(blocker, blocked)
 +    {:ok, _user_block} = User.block(blocker, blocked)
  
      {:error, _} = User.subscribe(blocked, blocker)
    end
        refute User.mutes?(user, muted_user)
        refute User.muted_notifications?(user, muted_user)
  
 -      {:ok, user} = User.mute(user, muted_user)
 +      {:ok, _user_mute} = User.mute(user, muted_user)
 +
 +      # Refreshing to reflect embedded ap id relation fields (remove once removed)
 +      user = refresh_record(user)
  
        assert User.mutes?(user, muted_user)
        assert User.muted_notifications?(user, muted_user)
        user = insert(:user)
        muted_user = insert(:user)
  
 -      {:ok, user} = User.mute(user, muted_user)
 -      {:ok, user} = User.unmute(user, muted_user)
 +      {:ok, _user_mute} = User.mute(user, muted_user)
 +      {:ok, _user_mute} = User.unmute(user, muted_user)
  
        refute User.mutes?(user, muted_user)
        refute User.muted_notifications?(user, muted_user)
        refute User.mutes?(user, muted_user)
        refute User.muted_notifications?(user, muted_user)
  
 -      {:ok, user} = User.mute(user, muted_user, false)
 +      {:ok, _user_mute} = User.mute(user, muted_user, false)
  
        assert User.mutes?(user, muted_user)
        refute User.muted_notifications?(user, muted_user)
  
        refute User.blocks?(user, blocked_user)
  
 -      {:ok, user} = User.block(user, blocked_user)
 +      {:ok, _user_block} = User.block(user, blocked_user)
  
        assert User.blocks?(user, blocked_user)
      end
        user = insert(:user)
        blocked_user = insert(:user)
  
 -      {:ok, user} = User.block(user, blocked_user)
 -      {:ok, user} = User.unblock(user, blocked_user)
 +      {:ok, _user_block} = User.block(user, blocked_user)
 +      {:ok, _user_block} = User.unblock(user, blocked_user)
  
        refute User.blocks?(user, blocked_user)
      end
        assert User.following?(blocker, blocked)
        assert User.following?(blocked, blocker)
  
 -      {:ok, blocker} = User.block(blocker, blocked)
 +      {:ok, _user_block} = User.block(blocker, blocked)
        blocked = User.get_cached_by_id(blocked.id)
  
        assert User.blocks?(blocker, blocked)
        assert User.following?(blocker, blocked)
        refute User.following?(blocked, blocker)
  
 -      {:ok, blocker} = User.block(blocker, blocked)
 +      {:ok, _user_block} = User.block(blocker, blocked)
        blocked = User.get_cached_by_id(blocked.id)
  
        assert User.blocks?(blocker, blocked)
        refute User.following?(blocker, blocked)
        assert User.following?(blocked, blocker)
  
 -      {:ok, blocker} = User.block(blocker, blocked)
 +      {:ok, _user_block} = User.block(blocker, blocked)
        blocked = User.get_cached_by_id(blocked.id)
  
        assert User.blocks?(blocker, blocked)
        assert User.subscribed_to?(blocked, blocker)
        refute User.subscribed_to?(blocker, blocked)
  
 -      {:ok, blocker} = User.block(blocker, blocked)
 +      {:ok, _user_block} = User.block(blocker, blocked)
  
        assert User.blocks?(blocker, blocked)
        refute User.subscribed_to?(blocker, blocked)
      refute User.auth_active?(local_user)
      assert User.auth_active?(confirmed_user)
      assert User.auth_active?(remote_user)
+     # also shows unactive for deactivated users
+     deactivated_but_confirmed =
+       insert(:user, local: true, confirmation_pending: false, deactivated: true)
+     refute User.auth_active?(deactivated_but_confirmed)
    end
  
    describe "superuser?/1" do
      {:ok, _follower2} = User.follow(follower2, user)
      {:ok, _follower3} = User.follow(follower3, user)
  
 -    {:ok, user} = User.block(user, follower)
 +    {:ok, _user_block} = User.block(user, follower)
 +    user = refresh_record(user)
  
      assert User.user_info(user).follower_count == 2
    end
index de84726918965bc709056e1cabe1a94707e70105,d437ad456c78a8d1c85e739748fbd321605d6021..4e23219663250b66bdcfa64ba351f117d234df39
@@@ -484,7 -484,7 +484,7 @@@ defmodule Pleroma.Web.ActivityPub.Activ
        activity_five = insert(:note_activity)
        user = insert(:user)
  
 -      {:ok, user} = User.block(user, %{ap_id: activity_five.data["actor"]})
 +      {:ok, _user_block} = User.block(user, %{ap_id: activity_five.data["actor"]})
  
        activities = ActivityPub.fetch_activities_for_context("2hu", %{"blocking_user" => user})
        assert activities == [activity_two, activity]
      activity_three = insert(:note_activity)
      user = insert(:user)
      booster = insert(:user)
 -    {:ok, user} = User.block(user, %{ap_id: activity_one.data["actor"]})
 +    {:ok, _user_block} = User.block(user, %{ap_id: activity_one.data["actor"]})
  
      activities =
        ActivityPub.fetch_activities([], %{"blocking_user" => user, "skip_preload" => true})
      assert Enum.member?(activities, activity_three)
      refute Enum.member?(activities, activity_one)
  
 -    {:ok, user} = User.unblock(user, %{ap_id: activity_one.data["actor"]})
 +    {:ok, _user_block} = User.unblock(user, %{ap_id: activity_one.data["actor"]})
  
      activities =
        ActivityPub.fetch_activities([], %{"blocking_user" => user, "skip_preload" => true})
      assert Enum.member?(activities, activity_three)
      assert Enum.member?(activities, activity_one)
  
 -    {:ok, user} = User.block(user, %{ap_id: activity_three.data["actor"]})
 +    {:ok, _user_block} = User.block(user, %{ap_id: activity_three.data["actor"]})
      {:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(activity_three.id, booster)
      %Activity{} = boost_activity = Activity.get_create_by_object_ap_id(id)
      activity_three = Activity.get_by_id(activity_three.id)
      blockee = insert(:user)
      friend = insert(:user)
  
 -    {:ok, blocker} = User.block(blocker, blockee)
 +    {:ok, _user_block} = User.block(blocker, blockee)
  
      {:ok, activity_one} = CommonAPI.post(friend, %{"status" => "hey!"})
  
      blockee = insert(:user)
      friend = insert(:user)
  
 -    {:ok, blocker} = User.block(blocker, blockee)
 +    {:ok, _user_block} = User.block(blocker, blockee)
  
      {:ok, activity_one} = CommonAPI.post(friend, %{"status" => "hey!"})
  
      activity_three = insert(:note_activity)
      user = insert(:user)
      booster = insert(:user)
 -    {:ok, user} = User.mute(user, %User{ap_id: activity_one.data["actor"]})
 +
 +    activity_one_actor = User.get_by_ap_id(activity_one.data["actor"])
 +    {:ok, _user_mute} = User.mute(user, activity_one_actor)
  
      activities =
        ActivityPub.fetch_activities([], %{"muting_user" => user, "skip_preload" => true})
      assert Enum.member?(activities, activity_three)
      assert Enum.member?(activities, activity_one)
  
 -    {:ok, user} = User.unmute(user, %User{ap_id: activity_one.data["actor"]})
 +    {:ok, _user_mute} = User.unmute(user, activity_one_actor)
  
      activities =
        ActivityPub.fetch_activities([], %{"muting_user" => user, "skip_preload" => true})
      assert Enum.member?(activities, activity_three)
      assert Enum.member?(activities, activity_one)
  
 -    {:ok, user} = User.mute(user, %User{ap_id: activity_three.data["actor"]})
 +    activity_three_actor = User.get_by_ap_id(activity_three.data["actor"])
 +    {:ok, _user_mute} = User.mute(user, activity_three_actor)
      {:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(activity_three.id, booster)
      %Activity{} = boost_activity = Activity.get_create_by_object_ap_id(id)
      activity_three = Activity.get_by_id(activity_three.id)
      end
    end
  
+   describe "react to an object" do
+     test_with_mock "sends an activity to federation", Pleroma.Web.Federator, [:passthrough], [] do
+       Pleroma.Config.put([:instance, :federating], true)
+       user = insert(:user)
+       reactor = insert(:user)
+       {:ok, activity} = CommonAPI.post(user, %{"status" => "YASSSS queen slay"})
+       assert object = Object.normalize(activity)
+       {:ok, reaction_activity, _object} = ActivityPub.react_with_emoji(reactor, object, "🔥")
+       assert called(Pleroma.Web.Federator.publish(reaction_activity))
+     end
+     test "adds an emoji reaction activity to the db" do
+       user = insert(:user)
+       reactor = insert(:user)
+       {:ok, activity} = CommonAPI.post(user, %{"status" => "YASSSS queen slay"})
+       assert object = Object.normalize(activity)
+       {:ok, reaction_activity, object} = ActivityPub.react_with_emoji(reactor, object, "🔥")
+       assert reaction_activity
+       assert reaction_activity.data["actor"] == reactor.ap_id
+       assert reaction_activity.data["type"] == "EmojiReaction"
+       assert reaction_activity.data["content"] == "🔥"
+       assert reaction_activity.data["object"] == object.data["id"]
+       assert reaction_activity.data["to"] == [User.ap_followers(reactor), activity.data["actor"]]
+       assert reaction_activity.data["context"] == object.data["context"]
+       assert object.data["reaction_count"] == 1
+       assert object.data["reactions"]["🔥"] == [reactor.ap_id]
+     end
+   end
+   describe "unreacting to an object" do
+     test_with_mock "sends an activity to federation", Pleroma.Web.Federator, [:passthrough], [] do
+       Pleroma.Config.put([:instance, :federating], true)
+       user = insert(:user)
+       reactor = insert(:user)
+       {:ok, activity} = CommonAPI.post(user, %{"status" => "YASSSS queen slay"})
+       assert object = Object.normalize(activity)
+       {:ok, reaction_activity, _object} = ActivityPub.react_with_emoji(reactor, object, "🔥")
+       assert called(Pleroma.Web.Federator.publish(reaction_activity))
+       {:ok, unreaction_activity, _object} =
+         ActivityPub.unreact_with_emoji(reactor, reaction_activity.data["id"])
+       assert called(Pleroma.Web.Federator.publish(unreaction_activity))
+     end
+     test "adds an undo activity to the db" do
+       user = insert(:user)
+       reactor = insert(:user)
+       {:ok, activity} = CommonAPI.post(user, %{"status" => "YASSSS queen slay"})
+       assert object = Object.normalize(activity)
+       {:ok, reaction_activity, _object} = ActivityPub.react_with_emoji(reactor, object, "🔥")
+       {:ok, unreaction_activity, _object} =
+         ActivityPub.unreact_with_emoji(reactor, reaction_activity.data["id"])
+       assert unreaction_activity.actor == reactor.ap_id
+       assert unreaction_activity.data["object"] == reaction_activity.data["id"]
+       object = Object.get_by_ap_id(object.data["id"])
+       assert object.data["reaction_count"] == 0
+       assert object.data["reactions"] == %{}
+     end
+   end
    describe "like an object" do
      test_with_mock "sends an activity to federation", Pleroma.Web.Federator, [:passthrough], [] do
        Pleroma.Config.put([:instance, :federating], true)