From 429992fcc921a15f853d08b975682499d83dea99 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sun, 25 Jun 2017 11:57:34 +0200 Subject: [PATCH] Save external link for notes. --- lib/pleroma/web/ostatus/handlers/note_handler.ex | 6 ++++++ test/web/ostatus/ostatus_test.exs | 1 + 2 files changed, 7 insertions(+) diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex index 0abc0ac5c..82e60676f 100644 --- a/lib/pleroma/web/ostatus/handlers/note_handler.ex +++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -49,6 +49,11 @@ defmodule Pleroma.Web.OStatus.NoteHandler do ] ++ mentions end + def add_external_url(note, entry) do + url = XML.string_from_xpath("//link[@rel='alternate' and @type='text/html']/@href", entry) + Map.put(note, "external_url", url) + end + def handle_note(entry, doc \\ nil) do with id <- XML.string_from_xpath("//id", entry), activity when is_nil(activity) <- Activity.get_create_activity_by_object_ap_id(id), @@ -67,6 +72,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do note <- TwitterAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, []), note <- note |> Map.put("id", id) |> Map.put("tag", tags), note <- note |> Map.put("published", date), + note <- add_external_url(note, entry), # TODO: Handle this case in make_note_data note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note) do diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs index 11b618fdb..2d11b4664 100644 --- a/test/web/ostatus/ostatus_test.exs +++ b/test/web/ostatus/ostatus_test.exs @@ -45,6 +45,7 @@ defmodule Pleroma.Web.OStatusTest do assert activity.data["object"]["type"] == "Note" assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211" assert activity.data["object"]["attachment"] |> length == 2 + assert activity.data["object"]["external_url"] == "https://social.heldscal.la/notice/2020923" end test "handle incoming notes with tags" do -- 2.45.2