alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add basic thread fetching.

This commit is contained in:
Roger Braun 2017-05-05 20:15:26 +02:00
parent 00a7183118
commit 7752f103f6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -121,6 +121,13 @@ def handle_note(entry, doc \\ nil) do
{:ok, actor} = find_make_or_update_user(author) {:ok, actor} = find_make_or_update_user(author)
inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry) inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry)
if !Object.get_cached_by_ap_id(inReplyTo) do
inReplyToHref = string_from_xpath("//thr:in-reply-to[1]/@href", entry)
if inReplyToHref do
Task.start(fn -> fetch_activity_from_html_url(inReplyToHref) end)
end
end
context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
attachments = get_attachments(entry) attachments = get_attachments(entry)
@ -248,6 +255,7 @@ def gather_user_info(username) do
# It's a hack anyway. Maybe revisit this in the future # It's a hack anyway. Maybe revisit this in the future
@mastodon_regex ~r/<link href='(.*)' rel='alternate' type='application\/atom\+xml'>/ @mastodon_regex ~r/<link href='(.*)' rel='alternate' type='application\/atom\+xml'>/
@gs_regex ~r/<link title=.* href="(.*)" type="application\/atom\+xml" rel="alternate">/ @gs_regex ~r/<link title=.* href="(.*)" type="application\/atom\+xml" rel="alternate">/
@gs_classic_regex ~r/<link rel="alternate" href="(.*)" type="application\/atom\+xml" title=.*>/
def get_atom_url(body) do def get_atom_url(body) do
cond do cond do
Regex.match?(@mastodon_regex, body) -> Regex.match?(@mastodon_regex, body) ->
@ -256,6 +264,9 @@ def get_atom_url(body) do
Regex.match?(@gs_regex, body) -> Regex.match?(@gs_regex, body) ->
[[_, match]] = Regex.scan(@gs_regex, body) [[_, match]] = Regex.scan(@gs_regex, body)
{:ok, match} {:ok, match}
Regex.match?(@gs_classic_regex, body) ->
[[_, match]] = Regex.scan(@gs_classic_regex, body)
{:ok, match}
true -> true ->
Logger.debug(fn -> "Couldn't find atom link in #{inspect(body)}" end) Logger.debug(fn -> "Couldn't find atom link in #{inspect(body)}" end)
{:error, "Couldn't find the atom link"} {:error, "Couldn't find the atom link"}