hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use inReplyTo to find context.

Browse source
This commit is contained in:
Roger Braun 2017-05-02 21:31:01 +02:00
commit 018a1a390f
3 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pleroma/web/ostatus/ostatus.ex
View file

@ -44,13 +44,19 @@ defmodule Pleroma.Web.OStatus do
[author] = :xmerl_xpath.string('//author[1]', doc)
{:ok, actor} = find_make_or_update_user(author)
inReplyTo = string_from_xpath("/entry/thr:in-reply-to[1]/@ref", entry)
context = (string_from_xpath("/entry/ostatus:conversation[1]", entry) || "") |> String.trim
context = if String.length(context) > 0 do
context
else
ActivityPub.generate_context_id
end
context = with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
context
else _e ->
if String.length(context) > 0 do
context
else
ActivityPub.generate_context_id
end
end
to = [
"https://www.w3.org/ns/activitystreams#Public"
@ -74,8 +80,6 @@ defmodule Pleroma.Web.OStatus do
"actor" => actor.ap_id
}
inReplyTo = string_from_xpath("/entry/thr:in-reply-to[1]/@ref", entry)
object = if inReplyTo do
Map.put(object, "inReplyTo", inReplyTo)
else