Output proper published data in ostatus.

[akkoma] / lib / pleroma / web / ostatus / ostatus.ex

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index da0407aeb7d6faad2d6d184dd89e939a9e960a99..02fc273cf7eabecfc23a5a1a54c1b23d64bfed75 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -7,7 +7,9 @@ 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
 
   def feed_path(user) do
     "#{user.ap_id}/feed.atom"
@@ -30,6 +32,8 @@ defmodule Pleroma.Web.OStatus do
       {:xmlObj, :string, verb} = :xmerl_xpath.string('string(/entry/activity:verb[1])', entry)
 
       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' ->
@@ -59,8 +63,7 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def handle_share(entry, doc) do
-    with [object] <- :xmerl_xpath.string('/entry/activity:object', entry),
-         {:ok, retweeted_activity} <-  handle_note(object, object),
+    with {:ok, retweeted_activity} <- get_or_build_object(entry),
          {:ok, activity} <- make_share(entry, doc, retweeted_activity) do
       {:ok, activity, retweeted_activity}
     else
@@ -77,14 +80,29 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def get_or_build_object(entry) do
+    with {:ok, activity} <- get_or_try_fetching(entry) do
+      {:ok, activity}
+    else
+      _e ->
+        with [object] <- :xmerl_xpath.string('/entry/activity:object', entry) do
+          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),
          %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
       {:ok, activity}
-    else _e ->
+    else e ->
+        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}
+        else e -> Logger.debug("Couldn't find href: #{inspect(e)}")
         end
     end
   end
@@ -116,17 +134,34 @@ defmodule Pleroma.Web.OStatus do
     |> Enum.filter(&(&1))
   end
 
+  def get_content(entry) do
+    base_content = string_from_xpath("//content", entry)
+
+    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
+    end
+  end
+
+  def get_tags(entry) do
+    :xmerl_xpath.string('//category', entry)
+    |> Enum.map(fn (category) -> string_from_xpath("/category/@term", category) end)
+  end
+
   def handle_note(entry, doc \\ nil) do
-    content_html = string_from_xpath("//content[1]", entry)
+    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 !Object.get_cached_by_ap_id(inReplyTo) do
+    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
 
@@ -140,10 +175,12 @@ defmodule Pleroma.Web.OStatus do
                 if String.length(context) > 0 do
                   context
                 else
-                  ActivityPub.generate_context_id
+                  Utils.generate_context_id
                 end
               end
 
+    tags = get_tags(entry)
+
     to = [
       "https://www.w3.org/ns/activitystreams#Public",
       User.ap_followers(actor)
@@ -165,11 +202,20 @@ defmodule Pleroma.Web.OStatus do
       "published" => date,
       "context" => context,
       "actor" => actor.ap_id,
-      "attachment" => attachments
+      "attachment" => attachments,
+      "tag" => tags
     }
 
     object = if inReplyTo do
-      Map.put(object, "inReplyTo", inReplyTo)
+      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
@@ -217,8 +263,12 @@ defmodule Pleroma.Web.OStatus do
         info: info,
         avatar: info["avatar"]
       }
-      cs = User.remote_user_creation(data)
-      Repo.insert(cs)
+      with %User{} = user <- User.get_by_ap_id(data.ap_id) do
+        {:ok, user}
+      else _e ->
+        cs = User.remote_user_creation(data)
+        Repo.insert(cs)
+      end
     end
   end
 
@@ -275,10 +325,13 @@ defmodule Pleroma.Web.OStatus do
   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),
          {: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) do
+      Logger.debug("Got document from #{url}, handling...")
       handle_incoming(body)
+    else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
     end
   end
 end