diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-09-04 11:03:51 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-09-04 11:03:51 +0200 |
commit | 1b1f861bad9a3a0065f9879edd9e5f11766393d7 (patch) | |
tree | 95f53808e3d17eda69209406ac3cef46f7666a57 /lib | |
parent | 485cc0bc6accb5bccbc9f1a68a66de0955855580 (diff) | |
download | pleroma-1b1f861bad9a3a0065f9879edd9e5f11766393d7.tar.gz |
Handle mastodon conversation ids.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/ostatus/handlers/note_handler.ex | 5 |
1 files changed, 4 insertions, 1 deletions
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 |