From 1b1f861bad9a3a0065f9879edd9e5f11766393d7 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 4 Sep 2017 11:03:51 +0200 Subject: Handle mastodon conversation ids. --- lib/pleroma/web/ostatus/handlers/note_handler.ex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex index f9aa463a0..54c9e85d5 100644 --- a/lib/pleroma/web/ostatus/handlers/note_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -24,7 +24,10 @@ defmodule Pleroma.Web.OStatus.NoteHandler do 3. A newly generated context id. """ def get_context(entry, inReplyTo) do - context = (XML.string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim + context = ( + XML.string_from_xpath("//ostatus:conversation[1]", entry) + || XML.string_from_xpath("//ostatus:conversation[1]/@ref", entry) + || "") |> String.trim with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do context -- cgit v1.2.3