diff options
Diffstat (limited to 'lib')
15 files changed, 519 insertions, 23 deletions
| diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index 9ae6a5600..99608b8a5 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -32,6 +32,18 @@ defmodule Pleroma.Object.Containment do      get_actor(%{"actor" => actor})    end +  def get_object(%{"object" => id}) when is_binary(id) do +    id +  end + +  def get_object(%{"object" => %{"id" => id}}) when is_binary(id) do +    id +  end + +  def get_object(_) do +    nil +  end +    # TODO: We explicitly allow 'tag' URIs through, due to references to legacy OStatus    # objects being present in the test suite environment.  Once these objects are    # removed, please also remove this. diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index d9f74b6a4..d9f30e629 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -126,6 +126,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do    def increase_poll_votes_if_vote(_create_data), do: :noop    @spec insert(map(), boolean(), boolean(), boolean()) :: {:ok, Activity.t()} | {:error, any()} +  # TODO rewrite in with style +  @spec persist(map(), keyword()) :: {:ok, Activity.t() | Object.t()} +  def persist(object, meta) do +    local = Keyword.fetch!(meta, :local) +    {recipients, _, _} = get_recipients(object) + +    {:ok, activity} = +      Repo.insert(%Activity{ +        data: object, +        local: local, +        recipients: recipients, +        actor: object["actor"] +      }) + +    {:ok, activity, meta} +  end +    def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when is_map(map) do      with nil <- Activity.normalize(map),           map <- lazy_put_activity_defaults(map, fake), @@ -133,6 +150,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do           {_, true} <- {:remote_limit_error, check_remote_limit(map)},           {:ok, map} <- MRF.filter(map),           {recipients, _, _} = get_recipients(map), +         # ???           {:fake, false, map, recipients} <- {:fake, fake, map, recipients},           {:containment, :ok} <- {:containment, Containment.contain_child(map)},           {:ok, map, object} <- insert_full_object(map) do diff --git a/lib/pleroma/web/activity_pub/builder.ex b/lib/pleroma/web/activity_pub/builder.ex new file mode 100644 index 000000000..429a510b8 --- /dev/null +++ b/lib/pleroma/web/activity_pub/builder.ex @@ -0,0 +1,43 @@ +defmodule Pleroma.Web.ActivityPub.Builder do +  @moduledoc """ +  This module builds the objects. Meant to be used for creating local objects. + +  This module encodes our addressing policies and general shape of our objects. +  """ + +  alias Pleroma.Object +  alias Pleroma.User +  alias Pleroma.Web.ActivityPub.Utils +  alias Pleroma.Web.ActivityPub.Visibility + +  @spec like(User.t(), Object.t()) :: {:ok, map(), keyword()} +  def like(actor, object) do +    object_actor = User.get_cached_by_ap_id(object.data["actor"]) + +    # Address the actor of the object, and our actor's follower collection if the post is public. +    to = +      if Visibility.is_public?(object) do +        [actor.follower_address, object.data["actor"]] +      else +        [object.data["actor"]] +      end + +    # CC everyone who's been addressed in the object, except ourself and the object actor's +    # follower collection +    cc = +      (object.data["to"] ++ (object.data["cc"] || [])) +      |> List.delete(actor.ap_id) +      |> List.delete(object_actor.follower_address) + +    {:ok, +     %{ +       "id" => Utils.generate_activity_id(), +       "actor" => actor.ap_id, +       "type" => "Like", +       "object" => object.data["id"], +       "to" => to, +       "cc" => cc, +       "context" => object.data["context"] +     }, []} +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validator.ex b/lib/pleroma/web/activity_pub/object_validator.ex new file mode 100644 index 000000000..cff924047 --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validator.ex @@ -0,0 +1,38 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.ObjectValidator do +  @moduledoc """ +  This module is responsible for validating an object (which can be an activity) +  and checking if it is both well formed and also compatible with our view of +  the system. +  """ + +  alias Pleroma.Object +  alias Pleroma.User +  alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator + +  @spec validate(map(), keyword()) :: {:ok, map(), keyword()} | {:error, any()} +  def validate(object, meta) + +  def validate(%{"type" => "Like"} = object, meta) do +    with {:ok, object} <- +           object |> LikeValidator.cast_and_validate() |> Ecto.Changeset.apply_action(:insert) do +      object = stringify_keys(object |> Map.from_struct()) +      {:ok, object, meta} +    end +  end + +  def stringify_keys(object) do +    object +    |> Enum.map(fn {key, val} -> {to_string(key), val} end) +    |> Enum.into(%{}) +  end + +  def fetch_actor_and_object(object) do +    User.get_or_fetch_by_ap_id(object["actor"]) +    Object.normalize(object["object"]) +    :ok +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validators/common_validations.ex b/lib/pleroma/web/activity_pub/object_validators/common_validations.ex new file mode 100644 index 000000000..db0e2072d --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/common_validations.ex @@ -0,0 +1,32 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations do +  import Ecto.Changeset + +  alias Pleroma.Object +  alias Pleroma.User + +  def validate_actor_presence(cng, field_name \\ :actor) do +    cng +    |> validate_change(field_name, fn field_name, actor -> +      if User.get_cached_by_ap_id(actor) do +        [] +      else +        [{field_name, "can't find user"}] +      end +    end) +  end + +  def validate_object_presence(cng, field_name \\ :object) do +    cng +    |> validate_change(field_name, fn field_name, actor -> +      if Object.get_cached_by_ap_id(actor) do +        [] +      else +        [{field_name, "can't find user"}] +      end +    end) +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validators/create_validator.ex b/lib/pleroma/web/activity_pub/object_validators/create_validator.ex new file mode 100644 index 000000000..bd90f7250 --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/create_validator.ex @@ -0,0 +1,31 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateNoteValidator do +  use Ecto.Schema + +  alias Pleroma.Web.ActivityPub.ObjectValidators.Types +  alias Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator + +  import Ecto.Changeset + +  @primary_key false + +  embedded_schema do +    field(:id, :string, primary_key: true) +    field(:actor, Types.ObjectID) +    field(:type, :string) +    field(:to, {:array, :string}) +    field(:cc, {:array, :string}) +    field(:bto, {:array, :string}, default: []) +    field(:bcc, {:array, :string}, default: []) + +    embeds_one(:object, NoteValidator) +  end + +  def cast_data(data) do +    %__MODULE__{} +    |> cast(data, __schema__(:fields)) +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validators/like_validator.ex b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex new file mode 100644 index 000000000..ccbc7d071 --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex @@ -0,0 +1,57 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do +  use Ecto.Schema + +  alias Pleroma.Web.ActivityPub.ObjectValidators.Types +  alias Pleroma.Web.ActivityPub.Utils + +  import Ecto.Changeset +  import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations + +  @primary_key false + +  embedded_schema do +    field(:id, :string, primary_key: true) +    field(:type, :string) +    field(:object, Types.ObjectID) +    field(:actor, Types.ObjectID) +    field(:context, :string) +    field(:to, {:array, :string}) +    field(:cc, {:array, :string}) +  end + +  def cast_and_validate(data) do +    data +    |> cast_data() +    |> validate_data() +  end + +  def cast_data(data) do +    %__MODULE__{} +    |> cast(data, [:id, :type, :object, :actor, :context, :to, :cc]) +  end + +  def validate_data(data_cng) do +    data_cng +    |> validate_inclusion(:type, ["Like"]) +    |> validate_required([:id, :type, :object, :actor, :context, :to, :cc]) +    |> validate_actor_presence() +    |> validate_object_presence() +    |> validate_existing_like() +  end + +  def validate_existing_like(%{changes: %{actor: actor, object: object}} = cng) do +    if Utils.get_existing_like(actor, %{data: %{"id" => object}}) do +      cng +      |> add_error(:actor, "already liked this object") +      |> add_error(:object, "already liked by this actor") +    else +      cng +    end +  end + +  def validate_existing_like(cng), do: cng +end diff --git a/lib/pleroma/web/activity_pub/object_validators/note_validator.ex b/lib/pleroma/web/activity_pub/object_validators/note_validator.ex new file mode 100644 index 000000000..eea15ce1c --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/note_validator.ex @@ -0,0 +1,63 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.ObjectValidators.NoteValidator do +  use Ecto.Schema + +  alias Pleroma.Web.ActivityPub.ObjectValidators.Types + +  import Ecto.Changeset + +  @primary_key false + +  embedded_schema do +    field(:id, :string, primary_key: true) +    field(:to, {:array, :string}, default: []) +    field(:cc, {:array, :string}, default: []) +    field(:bto, {:array, :string}, default: []) +    field(:bcc, {:array, :string}, default: []) +    # TODO: Write type +    field(:tag, {:array, :map}, default: []) +    field(:type, :string) +    field(:content, :string) +    field(:context, :string) +    field(:actor, Types.ObjectID) +    field(:attributedTo, Types.ObjectID) +    field(:summary, :string) +    field(:published, Types.DateTime) +    # TODO: Write type +    field(:emoji, :map, default: %{}) +    field(:sensitive, :boolean, default: false) +    # TODO: Write type +    field(:attachment, {:array, :map}, default: []) +    field(:replies_count, :integer, default: 0) +    field(:like_count, :integer, default: 0) +    field(:announcement_count, :integer, default: 0) +    field(:inRepyTo, :string) + +    field(:likes, {:array, :string}, default: []) +    field(:announcements, {:array, :string}, default: []) + +    # see if needed +    field(:conversation, :string) +    field(:context_id, :string) +  end + +  def cast_and_validate(data) do +    data +    |> cast_data() +    |> validate_data() +  end + +  def cast_data(data) do +    %__MODULE__{} +    |> cast(data, __schema__(:fields)) +  end + +  def validate_data(data_cng) do +    data_cng +    |> validate_inclusion(:type, ["Note"]) +    |> validate_required([:id, :actor, :to, :cc, :type, :content, :context]) +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validators/types/date_time.ex b/lib/pleroma/web/activity_pub/object_validators/types/date_time.ex new file mode 100644 index 000000000..4f412fcde --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/types/date_time.ex @@ -0,0 +1,34 @@ +defmodule Pleroma.Web.ActivityPub.ObjectValidators.Types.DateTime do +  @moduledoc """ +  The AP standard defines the date fields in AP as xsd:DateTime. Elixir's +  DateTime can't parse this, but it can parse the related iso8601. This +  module punches the date until it looks like iso8601 and normalizes to +  it. + +  DateTimes without a timezone offset are treated as UTC. + +  Reference: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-published +  """ +  use Ecto.Type + +  def type, do: :string + +  def cast(datetime) when is_binary(datetime) do +    with {:ok, datetime, _} <- DateTime.from_iso8601(datetime) do +      {:ok, DateTime.to_iso8601(datetime)} +    else +      {:error, :missing_offset} -> cast("#{datetime}Z") +      _e -> :error +    end +  end + +  def cast(_), do: :error + +  def dump(data) do +    {:ok, data} +  end + +  def load(data) do +    {:ok, data} +  end +end diff --git a/lib/pleroma/web/activity_pub/object_validators/types/object.ex b/lib/pleroma/web/activity_pub/object_validators/types/object.ex new file mode 100644 index 000000000..92fc13ba8 --- /dev/null +++ b/lib/pleroma/web/activity_pub/object_validators/types/object.ex @@ -0,0 +1,25 @@ +defmodule Pleroma.Web.ActivityPub.ObjectValidators.Types.ObjectID do +  use Ecto.Type + +  def type, do: :string + +  def cast(object) when is_binary(object) do +    {:ok, object} +  end + +  def cast(%{"id" => object}) when is_binary(object) do +    {:ok, object} +  end + +  def cast(_) do +    :error +  end + +  def dump(data) do +    {:ok, data} +  end + +  def load(data) do +    {:ok, data} +  end +end diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex new file mode 100644 index 000000000..cb3571917 --- /dev/null +++ b/lib/pleroma/web/activity_pub/pipeline.ex @@ -0,0 +1,41 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.ActivityPub.Pipeline do +  alias Pleroma.Activity +  alias Pleroma.Web.ActivityPub.ActivityPub +  alias Pleroma.Web.ActivityPub.MRF +  alias Pleroma.Web.ActivityPub.ObjectValidator +  alias Pleroma.Web.ActivityPub.SideEffects +  alias Pleroma.Web.Federator + +  @spec common_pipeline(map(), keyword()) :: {:ok, Activity.t(), keyword()} | {:error, any()} +  def common_pipeline(object, meta) do +    with {_, {:ok, validated_object, meta}} <- +           {:validate_object, ObjectValidator.validate(object, meta)}, +         {_, {:ok, mrfd_object}} <- {:mrf_object, MRF.filter(validated_object)}, +         {_, {:ok, %Activity{} = activity, meta}} <- +           {:persist_object, ActivityPub.persist(mrfd_object, meta)}, +         {_, {:ok, %Activity{} = activity, meta}} <- +           {:execute_side_effects, SideEffects.handle(activity, meta)}, +         {_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do +      {:ok, activity, meta} +    else +      e -> {:error, e} +    end +  end + +  defp maybe_federate(activity, meta) do +    with {:ok, local} <- Keyword.fetch(meta, :local) do +      if local do +        Federator.publish(activity) +        {:ok, :federated} +      else +        {:ok, :not_federated} +      end +    else +      _e -> {:error, "local not set in meta"} +    end +  end +end diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex new file mode 100644 index 000000000..666a4e310 --- /dev/null +++ b/lib/pleroma/web/activity_pub/side_effects.ex @@ -0,0 +1,28 @@ +defmodule Pleroma.Web.ActivityPub.SideEffects do +  @moduledoc """ +  This module looks at an inserted object and executes the side effects that it +  implies. For example, a `Like` activity will increase the like count on the +  liked object, a `Follow` activity will add the user to the follower +  collection, and so on. +  """ +  alias Pleroma.Notification +  alias Pleroma.Object +  alias Pleroma.Web.ActivityPub.Utils + +  def handle(object, meta \\ []) + +  # Tasks this handles: +  # - Add like to object +  # - Set up notification +  def handle(%{data: %{"type" => "Like"}} = object, meta) do +    liked_object = Object.get_by_ap_id(object.data["object"]) +    Utils.add_like_to_object(object, liked_object) +    Notification.create_notifications(object) +    {:ok, object, meta} +  end + +  # Nothing to do +  def handle(object, meta) do +    {:ok, object, meta} +  end +end diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 9cd3de705..dbb14e9aa 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -13,6 +13,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do    alias Pleroma.Repo    alias Pleroma.User    alias Pleroma.Web.ActivityPub.ActivityPub +  alias Pleroma.Web.ActivityPub.ObjectValidator +  alias Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator +  alias Pleroma.Web.ActivityPub.Pipeline    alias Pleroma.Web.ActivityPub.Utils    alias Pleroma.Web.ActivityPub.Visibility    alias Pleroma.Web.Federator @@ -608,17 +611,21 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do      |> handle_incoming(options)    end -  def handle_incoming( -        %{"type" => "Like", "object" => object_id, "actor" => _actor, "id" => id} = data, -        _options -      ) do -    with actor <- Containment.get_actor(data), -         {:ok, %User{} = actor} <- User.get_or_fetch_by_ap_id(actor), -         {:ok, object} <- get_obj_helper(object_id), -         {:ok, activity, _object} <- ActivityPub.like(actor, object, id, false) do +  def handle_incoming(%{"type" => "Like"} = data, _options) do +    with {_, {:ok, cast_data_sym}} <- +           {:casting_data, +            data |> LikeValidator.cast_data() |> Ecto.Changeset.apply_action(:insert)}, +         {_, cast_data} <- +           {:stringify_keys, ObjectValidator.stringify_keys(cast_data_sym |> Map.from_struct())}, +         :ok <- ObjectValidator.fetch_actor_and_object(cast_data), +         {_, {:ok, cast_data}} <- {:maybe_add_context, maybe_add_context_from_object(cast_data)}, +         {_, {:ok, cast_data}} <- +           {:maybe_add_recipients, maybe_add_recipients_from_object(cast_data)}, +         {_, {:ok, activity, _meta}} <- +           {:common_pipeline, Pipeline.common_pipeline(cast_data, local: false)} do        {:ok, activity}      else -      _e -> :error +      e -> {:error, e}      end    end @@ -1244,4 +1251,47 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do    def maybe_fix_user_url(data), do: data    def maybe_fix_user_object(data), do: maybe_fix_user_url(data) + +  defp maybe_add_context_from_object(%{"context" => context} = data) when is_binary(context), +    do: {:ok, data} + +  defp maybe_add_context_from_object(%{"object" => object} = data) when is_binary(object) do +    if object = Object.normalize(object) do +      data = +        data +        |> Map.put("context", object.data["context"]) + +      {:ok, data} +    else +      {:error, "No context on referenced object"} +    end +  end + +  defp maybe_add_context_from_object(_) do +    {:error, "No referenced object"} +  end + +  defp maybe_add_recipients_from_object(%{"object" => object} = data) do +    to = data["to"] || [] +    cc = data["cc"] || [] + +    if to == [] && cc == [] do +      if object = Object.normalize(object) do +        data = +          data +          |> Map.put("to", [object.data["actor"]]) +          |> Map.put("cc", cc) + +        {:ok, data} +      else +        {:error, "No actor on referenced object"} +      end +    else +      {:ok, data} +    end +  end + +  defp maybe_add_recipients_from_object(_) do +    {:error, "No referenced object"} +  end  end diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 091011c6b..f882f9fcb 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -12,6 +12,8 @@ defmodule Pleroma.Web.CommonAPI do    alias Pleroma.User    alias Pleroma.UserRelationship    alias Pleroma.Web.ActivityPub.ActivityPub +  alias Pleroma.Web.ActivityPub.Builder +  alias Pleroma.Web.ActivityPub.Pipeline    alias Pleroma.Web.ActivityPub.Utils    alias Pleroma.Web.ActivityPub.Visibility @@ -19,6 +21,7 @@ defmodule Pleroma.Web.CommonAPI do    import Pleroma.Web.CommonAPI.Utils    require Pleroma.Constants +  require Logger    def follow(follower, followed) do      timeout = Pleroma.Config.get([:activitypub, :follow_handshake_timeout]) @@ -109,18 +112,39 @@ defmodule Pleroma.Web.CommonAPI do      end    end -  def favorite(id_or_ap_id, user) do -    with {_, %Activity{} = activity} <- {:find_activity, get_by_id_or_ap_id(id_or_ap_id)}, -         object <- Object.normalize(activity), -         like_activity <- Utils.get_existing_like(user.ap_id, object) do -      if like_activity do -        {:ok, like_activity, object} -      else -        ActivityPub.like(user, object) -      end +  @spec favorite(User.t(), binary()) :: {:ok, Activity.t()} | {:error, any()} +  def favorite(%User{} = user, id) do +    with {_, %Activity{object: object}} <- {:find_object, Activity.get_by_id_with_object(id)}, +         {_, {:ok, like_object, meta}} <- {:build_object, Builder.like(user, object)}, +         {_, {:ok, %Activity{} = activity, _meta}} <- +           {:common_pipeline, +            Pipeline.common_pipeline(like_object, Keyword.put(meta, :local, true))} do +      {:ok, activity}      else -      {:find_activity, _} -> {:error, :not_found} -      _ -> {:error, dgettext("errors", "Could not favorite")} +      {:find_object, _} -> +        {:error, :not_found} + +      {:common_pipeline, +       { +         :error, +         { +           :validate_object, +           { +             :error, +             changeset +           } +         } +       }} = e -> +        if {:object, {"already liked by this actor", []}} in changeset.errors do +          {:ok, :already_liked} +        else +          Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}") +          {:error, dgettext("errors", "Could not favorite"), e} +        end + +      e -> +        Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}") +        {:error, dgettext("errors", "Could not favorite"), e}      end    end diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index 5c90065f6..83cd2c768 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -207,9 +207,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do    end    @doc "POST /api/v1/statuses/:id/favourite" -  def favourite(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do -    with {:ok, _fav, %{data: %{"id" => id}}} <- CommonAPI.favorite(ap_id_or_id, user), -         %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do +  def favourite(%{assigns: %{user: user}} = conn, %{"id" => activity_id}) do +    with {:ok, _fav} <- CommonAPI.favorite(user, activity_id), +         %Activity{} = activity <- Activity.get_by_id(activity_id) do        try_render(conn, "show.json", activity: activity, for: user, as: :activity)      end    end | 
