summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-08 10:22:15 +0000
committerlain <lain@soykaf.club>2019-06-08 10:22:15 +0000
commit1e0fa899b65622d9668599ed0f4ff0fdbe2d44e8 (patch)
tree93ab9005c8e47cbe6046ae53f4248cf5de8fc763 /lib
parentd7f4f65560cab7c07969c910ffdf742b159cbb22 (diff)
parentdffc9f060adf43a4faaa5790dc8a01b3d7cb5e34 (diff)
downloadpleroma-1e0fa899b65622d9668599ed0f4ff0fdbe2d44e8.tar.gz
pleroma-1e0fa899b65622d9668599ed0f4ff0fdbe2d44e8.zip
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched See merge request pleroma/pleroma!1259
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index ff031a16e..3bb8b40b5 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -339,7 +339,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
def fix_type(%{"inReplyTo" => reply_id} = object) when is_binary(reply_id) do
reply = Object.normalize(reply_id)
- if reply.data["type"] == "Question" and object["name"] do
+ if reply && (reply.data["type"] == "Question" and object["name"]) do
Map.put(object, "type", "Answer")
else
object