X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=c35ba42bee6d5bc263d72da8769bbc1128eee5cd;hb=2f23ae5b684a363b6090a45c4b1b9685c9ed614a;hp=d9a5924dc26237ef5874df518a049c985d67b141;hpb=c3dfa1970f33db5df8eca36cadbf18ccd7229240;p=akkoma
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index d9a5924dc..c35ba42be 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -7,9 +7,8 @@ defmodule Pleroma.Web.OStatus do
alias Pleroma.{Repo, User, Web, Object, Activity}
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.{WebFinger, Websub}
- alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler}
+ alias Pleroma.Web.OStatus.{FollowHandler, NoteHandler, DeleteHandler}
def feed_path(user) do
"#{user.ap_id}/feed.atom"
@@ -23,44 +22,54 @@ defmodule Pleroma.Web.OStatus do
"#{user.ap_id}/salmon"
end
+ def remote_follow_path do
+ "#{Web.base_url}/ostatus_subscribe?acct={uri}"
+ end
+
def handle_incoming(xml_string) do
- doc = parse_document(xml_string)
- entries = :xmerl_xpath.string('//entry', doc)
-
- activities = Enum.map(entries, fn (entry) ->
- {:xmlObj, :string, object_type} = :xmerl_xpath.string('string(/entry/activity:object-type[1])', entry)
- {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
- Logger.debug("Handling #{verb}")
-
- try do
- case verb do
- 'http://activitystrea.ms/schema/1.0/follow' ->
- with {:ok, activity} <- FollowHandler.handle(entry, doc), do: activity
- 'http://activitystrea.ms/schema/1.0/share' ->
- with {:ok, activity, retweeted_activity} <- handle_share(entry, doc), do: [activity, retweeted_activity]
- 'http://activitystrea.ms/schema/1.0/favorite' ->
- with {:ok, activity, favorited_activity} <- handle_favorite(entry, doc), do: [activity, favorited_activity]
- _ ->
- case object_type do
- 'http://activitystrea.ms/schema/1.0/note' ->
- with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
- 'http://activitystrea.ms/schema/1.0/comment' ->
- with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
- _ ->
- Logger.error("Couldn't parse incoming document")
- nil
- end
- end
- rescue
- e ->
- Logger.error("Error occured while handling activity")
+ with doc when doc != :error <- parse_document(xml_string) do
+ entries = :xmerl_xpath.string('//entry', doc)
+
+ activities = Enum.map(entries, fn (entry) ->
+ {:xmlObj, :string, object_type} = :xmerl_xpath.string('string(/entry/activity:object-type[1])', entry)
+ {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
+ Logger.debug("Handling #{verb}")
+
+ try do
+ case verb do
+ 'http://activitystrea.ms/schema/1.0/delete' ->
+ with {:ok, activity} <- DeleteHandler.handle_delete(entry, doc), do: activity
+ 'http://activitystrea.ms/schema/1.0/follow' ->
+ with {:ok, activity} <- FollowHandler.handle(entry, doc), do: activity
+ 'http://activitystrea.ms/schema/1.0/share' ->
+ with {:ok, activity, retweeted_activity} <- handle_share(entry, doc), do: [activity, retweeted_activity]
+ 'http://activitystrea.ms/schema/1.0/favorite' ->
+ with {:ok, activity, favorited_activity} <- handle_favorite(entry, doc), do: [activity, favorited_activity]
+ _ ->
+ case object_type do
+ 'http://activitystrea.ms/schema/1.0/note' ->
+ with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
+ 'http://activitystrea.ms/schema/1.0/comment' ->
+ with {:ok, activity} <- NoteHandler.handle_note(entry, doc), do: activity
+ _ ->
+ Logger.error("Couldn't parse incoming document")
+ nil
+ end
+ end
+ rescue
+ e ->
+ Logger.error("Error occured while handling activity")
+ Logger.error(xml_string)
Logger.error(inspect(e))
nil
- end
- end)
- |> Enum.filter(&(&1))
+ end
+ end)
+ |> Enum.filter(&(&1))
- {:ok, activities}
+ {:ok, activities}
+ else
+ _e -> {:error, []}
+ end
end
def make_share(entry, doc, retweeted_activity) do
@@ -106,10 +115,10 @@ defmodule Pleroma.Web.OStatus do
with id when not is_nil(id) <- string_from_xpath("//activity:object[1]/id", entry),
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
{:ok, activity}
- else e ->
+ else _ ->
Logger.debug("Couldn't get, will try to fetch")
with href when not is_nil(href) <- string_from_xpath("//activity:object[1]/link[@type=\"text/html\"]/@href", entry),
- {:ok, [favorited_activity]} <- fetch_activity_from_html_url(href) do
+ {:ok, [favorited_activity]} <- fetch_activity_from_url(href) do
{:ok, favorited_activity}
else e -> Logger.debug("Couldn't find href: #{inspect(e)}")
end
@@ -144,40 +153,47 @@ defmodule Pleroma.Web.OStatus do
end
@doc """
- Gets the content from a an entry. Will add the cw text to the body for cw'd
- Mastodon notes.
+ Gets the content from a an entry.
"""
def get_content(entry) do
- base_content = string_from_xpath("//content", entry)
+ string_from_xpath("//content", entry)
+ end
- with scope when not is_nil(scope) <- string_from_xpath("//mastodon:scope", entry),
- cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do
- "#{cw}
#{base_content}"
- else _e -> base_content
+ @doc """
+ Get the cw that mastodon uses.
+ """
+ def get_cw(entry) do
+ with cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do
+ cw
+ else _e -> nil
end
end
def get_tags(entry) do
:xmerl_xpath.string('//category', entry)
- |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) |> String.downcase end)
+ |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) end)
+ |> Enum.filter(&(&1))
+ |> Enum.map(&String.downcase/1)
end
def maybe_update(doc, user) do
old_data = %{
avatar: user.avatar,
bio: user.bio,
- name: user.name
+ name: user.name,
+ info: user.info
}
with false <- user.local,
avatar <- make_avatar_object(doc),
bio <- string_from_xpath("//author[1]/summary", doc),
- name when not is_nil(name) <- string_from_xpath("//author[1]/poco:displayName", doc),
- new_data <- %{avatar: avatar, name: name, bio: bio},
+ name <- string_from_xpath("//author[1]/poco:displayName", doc),
+ info <- Map.put(user.info, "banner", make_avatar_object(doc, "header") || user.info["banner"]),
+ new_data <- %{avatar: avatar || old_data.avatar, name: name || old_data.name, bio: bio || old_data.bio, info: info || old_data.info},
false <- new_data == old_data do
change = Ecto.Changeset.change(user, new_data)
Repo.update(change)
- else e ->
+ else _ ->
{:ok, user}
end
end
@@ -207,7 +223,7 @@ defmodule Pleroma.Web.OStatus do
Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
end
- def make_user(uri) do
+ def make_user(uri, update \\ false) do
with {:ok, info} <- gather_user_info(uri) do
data = %{
name: info["name"],
@@ -217,7 +233,8 @@ defmodule Pleroma.Web.OStatus do
avatar: info["avatar"],
bio: info["bio"]
}
- with %User{} = user <- User.get_by_ap_id(data.ap_id) do
+ with false <- update,
+ %User{} = user <- User.get_by_ap_id(data.ap_id) do
{:ok, user}
else _e -> insert_or_update_user(data)
end
@@ -225,9 +242,9 @@ defmodule Pleroma.Web.OStatus do
end
# TODO: Just takes the first one for now.
- def make_avatar_object(author_doc) do
- href = string_from_xpath("//author[1]/link[@rel=\"avatar\"]/@href", author_doc)
- type = string_from_xpath("//author[1]/link[@rel=\"avatar\"]/@type", author_doc)
+ def make_avatar_object(author_doc, rel \\ "avatar") do
+ href = string_from_xpath("//author[1]/link[@rel=\"#{rel}\"]/@href", author_doc)
+ type = string_from_xpath("//author[1]/link[@rel=\"#{rel}\"]/@type", author_doc)
if href do
%{
@@ -276,14 +293,36 @@ defmodule Pleroma.Web.OStatus do
end
end
+ def fetch_activity_from_atom_url(url) do
+ with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
+ Logger.debug("Got document from #{url}, handling...")
+ handle_incoming(body)
+ else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+ end
+ end
+
def fetch_activity_from_html_url(url) do
Logger.debug("Trying to fetch #{url}")
with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
- {:ok, atom_url} <- get_atom_url(body),
- {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
- Logger.debug("Got document from #{url}, handling...")
- handle_incoming(body)
+ {:ok, atom_url} <- get_atom_url(body) do
+ fetch_activity_from_atom_url(atom_url)
else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
end
end
+
+ def fetch_activity_from_url(url) do
+ try do
+ with {:ok, activities} when length(activities) > 0 <- fetch_activity_from_atom_url(url) do
+ {:ok, activities}
+ else
+ _e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do
+ {:ok, activities}
+ end
+ end
+ rescue
+ e ->
+ Logger.debug("Couldn't get #{url}: #{inspect(e)}")
+ {:error, "Couldn't get #{url}: #{inspect(e)}"}
+ end
+ end
end