From: lain <lain@soykaf.club>
Date: Sun, 25 Feb 2018 21:20:38 +0000 (+0100)
Subject: One more fix.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0d69bbc1fbfe2eef205b910d3e5b3b1503e02cef;p=akkoma

One more fix.
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index a9d9674d6..abc9b786e 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -31,8 +31,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         |> Map.put("inReplyTo", replied_object.data["id"])
         |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id)
         |> Map.put("inReplyToStatusId", activity.id)
-        |> Map.put("conversation", replied_object.data["context"])
-        |> Map.put("context", replied_object.data["context"])
+        |> Map.put("conversation", replied_object.data["context"] || object["conversation"])
+        |> Map.put("context", replied_object.data["context"] || object["conversation"])
       e ->
         Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
         object