From: lain <lain@soykaf.club>
Date: Mon, 4 May 2020 15:18:17 +0000 (+0200)
Subject: LikeValidator: Fix up context.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0f9bed022fab80f59353597dde82896ef954a678;p=akkoma

LikeValidator: Fix up context.
---

diff --git a/lib/pleroma/web/activity_pub/object_validators/like_validator.ex b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
index d9ee07995..1bce739bd 100644
--- a/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/like_validator.ex
@@ -44,11 +44,25 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.LikeValidator do
   def fix_after_cast(cng) do
     cng
     |> fix_recipients()
+    |> fix_context()
+  end
+
+  def fix_context(cng) do
+    object = get_field(cng, :object)
+
+    with nil <- get_field(cng, :context),
+         %Object{data: %{"context" => context}} <- Object.get_cached_by_ap_id(object) do
+      cng
+      |> put_change(:context, context)
+    else
+      _ ->
+        cng
+    end
   end
 
   def fix_recipients(cng) do
-    to = get_field(cng, :to) || []
-    cc = get_field(cng, :cc) || []
+    to = get_field(cng, :to)
+    cc = get_field(cng, :cc)
     object = get_field(cng, :object)
 
     with {[], []} <- {to, cc},
diff --git a/test/web/activity_pub/object_validator_test.exs b/test/web/activity_pub/object_validator_test.exs
index 9e9e41c6b..93989e28a 100644
--- a/test/web/activity_pub/object_validator_test.exs
+++ b/test/web/activity_pub/object_validator_test.exs
@@ -49,6 +49,19 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidatorTest do
       assert object["to"] == [user.ap_id]
     end
 
+    test "sets the context field to the context of the object if no context is given", %{
+      valid_like: valid_like,
+      post_activity: post_activity
+    } do
+      without_context =
+        valid_like
+        |> Map.delete("context")
+
+      {:ok, object, _meta} = ObjectValidator.validate(without_context, [])
+
+      assert object["context"] == post_activity.data["context"]
+    end
+
     test "it errors when the actor is missing or not known", %{valid_like: valid_like} do
       without_actor = Map.delete(valid_like, "actor")