diff options
| -rw-r--r-- | lib/pleroma/web/ostatus/activity_representer.ex | 6 | ||||
| -rw-r--r-- | lib/pleroma/web/ostatus/handlers/note_handler.ex | 78 | ||||
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus.ex | 92 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/utils.ex | 1 | ||||
| -rw-r--r-- | test/web/ostatus/activity_representer_test.exs | 8 |
5 files changed, 94 insertions, 91 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index ccf71218c..85140282c 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -54,7 +54,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do {:published, h.(inserted_at)}, {:updated, h.(updated_at)}, {:"ostatus:conversation", [], h.(activity.data["context"])}, - {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, + {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [type: ['application/atom+xml'], href: h.(activity.data["object"]["id"]), rel: 'self'], []} ] ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions end @@ -83,7 +83,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do {:id, h.(activity.data["object"])}, # For notes, federate the object id. ]}, {:"ostatus:conversation", [], h.(activity.data["context"])}, - {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, + {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {:"thr:in-reply-to", [ref: to_charlist(activity.data["object"])], []} ] ++ author ++ mentions @@ -115,7 +115,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do {:published, h.(inserted_at)}, {:updated, h.(updated_at)}, {:"ostatus:conversation", [], h.(activity.data["context"])}, - {:link, [href: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, + {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}, {:"activity:object", retweeted_xml} ] ++ mentions ++ author diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex new file mode 100644 index 000000000..cbbe8ba0d --- /dev/null +++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -0,0 +1,78 @@ +defmodule Pleroma.Web.OStatus.NoteHandler do + require Logger + alias Pleroma.Web.{XML, OStatus} + alias Pleroma.{Object, User, Activity} + alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.TwitterAPI + + def fetch_replied_to_activity(entry, inReplyTo) do + if inReplyTo && !Object.get_cached_by_ap_id(inReplyTo) do + inReplyToHref = XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry) + if inReplyToHref do + OStatus.fetch_activity_from_html_url(inReplyToHref) + else + Logger.debug("Couldn't find a href link to #{inReplyTo}") + end + end + end + + @doc """ + Get the context for this note. Uses this: + 1. The context of the parent activity + 2. The conversation reference in the ostatus xml + 3. A newly generated context id. + """ + def get_context(entry, inReplyTo) do + context = (XML.string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim + + with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do + context + else _e -> + if String.length(context) > 0 do + context + else + Utils.generate_context_id + end + end + end + + def get_mentions(entry) do + :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry) + |> Enum.map(fn(person) -> XML.string_from_xpath("@href", person) end) + end + + def make_to_list(actor, mentions) do + [ + "https://www.w3.org/ns/activitystreams#Public", + User.ap_followers(actor) + ] ++ mentions + 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), + [author] <- :xmerl_xpath.string('//author[1]', doc), + {:ok, actor} <- OStatus.find_make_or_update_user(author), + content_html <- OStatus.get_content(entry), + inReplyTo <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry), + _inReplyToActivity <- fetch_replied_to_activity(entry, inReplyTo), + inReplyToActivity <- Activity.get_create_activity_by_object_ap_id(inReplyTo), + attachments <- OStatus.get_attachments(entry), + context <- get_context(entry, inReplyTo), + tags <- OStatus.get_tags(entry), + mentions <- get_mentions(entry), + to <- make_to_list(actor, mentions), + date <- XML.string_from_xpath("//published", entry), + 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), + # TODO: Handle this case in make_note_data + note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note) + do + ActivityPub.create(to, actor, context, note, %{}, date, false) + else + %Activity{} = activity -> {:ok, activity} + e -> {:error, e} + end + end +end diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index 02fc273cf..f8bcf4718 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -9,7 +9,7 @@ defmodule Pleroma.Web.OStatus do alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.{WebFinger, Websub} - alias Pleroma.Web.OStatus.FollowHandler + alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler} def feed_path(user) do "#{user.ap_id}/feed.atom" @@ -41,9 +41,9 @@ defmodule Pleroma.Web.OStatus do _ -> case object_type do 'http://activitystrea.ms/schema/1.0/note' -> - with {:ok, activity} <- handle_note(entry, doc), do: activity + with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity 'http://activitystrea.ms/schema/1.0/comment' -> - with {:ok, activity} <- handle_note(entry, doc), do: activity + with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity _ -> Logger.error("Couldn't parse incoming document") nil @@ -86,12 +86,11 @@ defmodule Pleroma.Web.OStatus do else _e -> with [object] <- :xmerl_xpath.string('/entry/activity:object', entry) do - handle_note(object, object) + NoteHandler.handle_note(object, object) end end end - def get_or_try_fetching(entry) do Logger.debug("Trying to get entry from db") with id when not is_nil(id) <- string_from_xpath("//activity:object[1]/id", entry), @@ -134,6 +133,10 @@ defmodule Pleroma.Web.OStatus do |> Enum.filter(&(&1)) end + @doc """ + Gets the content from a an entry. Will add the cw text to the body for cw'd + Mastodon notes. + """ def get_content(entry) do base_content = string_from_xpath("//content", entry) @@ -149,85 +152,6 @@ defmodule Pleroma.Web.OStatus do |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) end) end - def handle_note(entry, doc \\ nil) do - content_html = get_content(entry) - - [author] = :xmerl_xpath.string('//author[1]', doc) - {:ok, actor} = find_make_or_update_user(author) - inReplyTo = string_from_xpath("//thr:in-reply-to[1]/@ref", entry) - - if inReplyTo && !Object.get_cached_by_ap_id(inReplyTo) do - inReplyToHref = string_from_xpath("//thr:in-reply-to[1]/@href", entry) - if inReplyToHref do - fetch_activity_from_html_url(inReplyToHref) - else - Logger.debug("Couldn't find a href link to #{inReplyTo}") - end - end - - context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim - - attachments = get_attachments(entry) - - context = with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do - context - else _e -> - if String.length(context) > 0 do - context - else - Utils.generate_context_id - end - end - - tags = get_tags(entry) - - to = [ - "https://www.w3.org/ns/activitystreams#Public", - User.ap_followers(actor) - ] - - mentions = :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry) - |> Enum.map(fn(person) -> string_from_xpath("@href", person) end) - - to = to ++ mentions - - date = string_from_xpath("//published", entry) - id = string_from_xpath("//id", entry) - - object = %{ - "id" => id, - "type" => "Note", - "to" => to, - "content" => content_html, - "published" => date, - "context" => context, - "actor" => actor.ap_id, - "attachment" => attachments, - "tag" => tags - } - - object = if inReplyTo do - replied_to_activity = Activity.get_create_activity_by_object_ap_id(inReplyTo) - if replied_to_activity do - object - |> Map.put("inReplyTo", inReplyTo) - |> Map.put("inReplyToStatusId", replied_to_activity.id) - else - object - |> Map.put("inReplyTo", inReplyTo) - end - else - object - end - - # TODO: Bail out sooner and use transaction. - if Object.get_by_ap_id(id) do - {:ok, Activity.get_create_activity_by_object_ap_id(id)} - else - ActivityPub.create(to, actor, context, object, %{}, date, false) - end - end - def find_make_or_update_user(doc) do uri = string_from_xpath("//author/uri[1]", doc) with {:ok, user} <- find_or_make_user(uri) do diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex index 82e3620f2..32b9eab44 100644 --- a/lib/pleroma/web/twitter_api/utils.ex +++ b/lib/pleroma/web/twitter_api/utils.ex @@ -51,6 +51,7 @@ defmodule Pleroma.Web.TwitterAPI.Utils do def make_context(%Activity{data: %{"context" => context}}), do: context def make_context(_), do: Utils.generate_context_id + # TODO: Move this to a more fitting space def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do object = %{ "type" => "Note", diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index 0f011f31c..06ffbdf69 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -25,7 +25,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <published>#{inserted_at}</published> <updated>#{updated_at}</updated> <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation> - <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" /> + <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" /> <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" /> <category term="2hu"/> <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/> @@ -63,7 +63,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <published>#{inserted_at}</published> <updated>#{updated_at}</updated> <ostatus:conversation>#{answer.data["context"]}</ostatus:conversation> - <link href="#{answer.data["context"]}" rel="ostatus:conversation" /> + <link ref="#{answer.data["context"]}" rel="ostatus:conversation" /> <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" /> <category term="2hu"/> <thr:in-reply-to ref="#{note.data["object"]["id"]}" /> @@ -106,7 +106,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <published>#{inserted_at}</published> <updated>#{updated_at}</updated> <ostatus:conversation>#{announce.data["context"]}</ostatus:conversation> - <link href="#{announce.data["context"]}" rel="ostatus:conversation" /> + <link ref="#{announce.data["context"]}" rel="ostatus:conversation" /> <link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/> <activity:object> #{note_xml} @@ -149,7 +149,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <id>#{note.data["id"]}</id> </activity:object> <ostatus:conversation>#{like.data["context"]}</ostatus:conversation> - <link href="#{like.data["context"]}" rel="ostatus:conversation" /> + <link ref="#{like.data["context"]}" rel="ostatus:conversation" /> <link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/> <thr:in-reply-to ref="#{note.data["id"]}" /> <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/> |