Address incoming messages to followers.

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

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 0a4361393b3bacc601a10b670c60f0e882ea263a..f335e9972abfc52ffaf968029eecf782aeb3eb9e 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -5,7 +5,7 @@ defmodule Pleroma.Web.OStatus do
   import Pleroma.Web.XML
   require Logger
 
-  alias Pleroma.{Repo, User, Web, Object}
+  alias Pleroma.{Repo, User, Web, Object, Activity}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.{WebFinger, Websub}
 
@@ -75,9 +75,20 @@ defmodule Pleroma.Web.OStatus do
     end
   end
 
+  def get_or_try_fetching(entry) 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 ->
+        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}
+        end
+    end
+  end
+
   def handle_favorite(entry, doc) do
-    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),
+    with {:ok, favorited_activity} <- get_or_try_fetching(entry),
          {:ok, activity} <- make_favorite(entry, doc, favorited_activity) do
       {:ok, activity, favorited_activity}
     else
@@ -110,6 +121,13 @@ defmodule Pleroma.Web.OStatus do
     {: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
+      inReplyToHref = string_from_xpath("//thr:in-reply-to[1]/@href", entry)
+      if inReplyToHref do
+        fetch_activity_from_html_url(inReplyToHref)
+      end
+    end
+
     context = (string_from_xpath("//ostatus:conversation[1]", entry) || "") |> String.trim
 
     attachments = get_attachments(entry)
@@ -125,7 +143,8 @@ defmodule Pleroma.Web.OStatus do
               end
 
     to = [
-      "https://www.w3.org/ns/activitystreams#Public"
+      "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)
@@ -237,6 +256,7 @@ defmodule Pleroma.Web.OStatus do
   # It's a hack anyway. Maybe revisit this in the future
   @mastodon_regex ~r/<link href='(.*)' rel='alternate' type='application\/atom\+xml'>/
   @gs_regex ~r/<link title=.* href="(.*)" type="application\/atom\+xml" rel="alternate">/
+  @gs_classic_regex ~r/<link rel="alternate" href="(.*)" type="application\/atom\+xml" title=.*>/
   def get_atom_url(body) do
     cond do
       Regex.match?(@mastodon_regex, body) ->
@@ -245,6 +265,9 @@ defmodule Pleroma.Web.OStatus do
       Regex.match?(@gs_regex, body) ->
         [[_, match]] = Regex.scan(@gs_regex, body)
         {:ok, match}
+      Regex.match?(@gs_classic_regex, body) ->
+        [[_, match]] = Regex.scan(@gs_classic_regex, body)
+        {:ok, match}
       true ->
         Logger.debug(fn -> "Couldn't find atom link in #{inspect(body)}" end)
         {:error, "Couldn't find the atom link"}
@@ -252,9 +275,9 @@ defmodule Pleroma.Web.OStatus do
   end
 
   def fetch_activity_from_html_url(url) do
-    with {:ok, %{body: body}} <- @httpoison.get(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) do
+         {:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true) do
       handle_incoming(body)
     end
   end