X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=c35ba42bee6d5bc263d72da8769bbc1128eee5cd;hb=189e9d63bc462fe5c0f97d70ffd4bac54aeeae05;hp=fa8c086d618b82f5d9751b899a504d4c6021c5a7;hpb=95aa6a3c651fed9810889d3446f2a1d710efb55e;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index fa8c086d6..c35ba42be 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -7,7 +7,6 @@ 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, DeleteHandler}
 
@@ -23,6 +22,10 @@ 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
     with doc when doc != :error <- parse_document(xml_string) do
       entries = :xmerl_xpath.string('//entry', doc)
@@ -56,6 +59,7 @@ defmodule Pleroma.Web.OStatus do
         rescue
           e ->
             Logger.error("Error occured while handling activity")
+            Logger.error(xml_string)
           Logger.error(inspect(e))
           nil
         end
@@ -111,7 +115,7 @@ 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_url(href) do
@@ -149,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
-      "<span class='mastodon-cw'>#{cw}</span><br>#{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 <- string_from_xpath("//author[1]/poco:displayName", doc),
-         new_data <- %{avatar: avatar || old_data.avatar, name: name || old_data.name, bio: bio || old_data.bio},
+         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
@@ -212,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"],
@@ -222,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
@@ -230,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
       %{
@@ -299,12 +311,18 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def fetch_activity_from_url(url) 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
+    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