[OStatus] adds status to pleroma instance if the url given is a status

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -8,6 +8,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   require Logger
 
   alias Comeonin.Pbkdf2
+  alias Pleroma.Activity
   alias Pleroma.Emoji
   alias Pleroma.Notification
   alias Pleroma.PasswordResetToken
@@ -73,26 +74,39 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   end
 
   def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
-    {err, followee} = OStatus.find_or_make_user(acct)
-    avatar = User.avatar_url(followee)
-    name = followee.nickname
-    id = followee.id
+    case is_status?(acct) do
+      true ->
+        {:ok, object} = ActivityPub.fetch_object_from_id(acct)
+        %Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"])
+        redirect(conn, to: "/notice/#{activity_id}")
 
-    if !!user do
-      conn
-      |> render("follow.html", %{error: err, acct: acct, avatar: avatar, name: name, id: id})
-    else
-      conn
-      |> render("follow_login.html", %{
-        error: false,
-        acct: acct,
-        avatar: avatar,
-        name: name,
-        id: id
-      })
+      false ->
+        {err, followee} = OStatus.find_or_make_user(acct)
+        avatar = User.avatar_url(followee)
+        name = followee.nickname
+        id = followee.id
+
+        if !!user do
+          conn
+          |> render("follow.html", %{error: err, acct: acct, avatar: avatar, name: name, id: id})
+        else
+          conn
+          |> render("follow_login.html", %{
+            error: false,
+            acct: acct,
+            avatar: avatar,
+            name: name,
+            id: id
+          })
+        end
     end
   end
 
+  defp is_status?(acct) do
+    %URI{path: path} = URI.parse(acct)
+    Regex.match?(~r/\/users\/[^\/]+\/statuses\/([0-9]+)$/, path)
+  end
+
   def do_remote_follow(conn, %{
         "authorization" => %{"name" => username, "password" => password, "id" => id}
       }) do