Redirect to frontend on html notice path.

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index fd8dcdf5237466f4178173e75c28acbfb8514405..948996d01a36bbf9298a90059dcb6ecaaad1fa53 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -47,7 +47,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     with id <- o_status_url(conn, :object, uuid),
          %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      represent_activity(conn, activity, user)
+      case get_format(conn) do
+        "html" -> redirect(conn, to: "/notice/#{activity.id}")
+        _ -> represent_activity(conn, activity, user)
+      end
     end
   end
 
@@ -55,7 +58,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     with id <- o_status_url(conn, :activity, uuid),
          %Activity{} = activity <- Activity.get_by_ap_id(id),
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      represent_activity(conn, activity, user)
+      case get_format(conn) do
+        "html" -> redirect(conn, to: "/notice/#{activity.id}")
+        _ -> represent_activity(conn, activity, user)
+      end
     end
   end
 

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 12159cffc16bd38d70f8cc97e0f45312cb2b473f..07c1f802883d4aee6cf042e15d630a0f60d8a99f 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -70,7 +70,7 @@ defmodule Pleroma.Web.Router do
   end
 
   pipeline :ostatus do
-    plug :accepts, ["xml", "atom"]
+    plug :accepts, ["xml", "atom", "html"]
   end
 
   scope "/", Pleroma.Web do
@@ -97,7 +97,6 @@ defmodule Pleroma.Web.Router do
   scope "/", Fallback do
     get "/*path", RedirectController, :redirector
   end
-
 end
 
 defmodule Fallback.RedirectController do