projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
ostatus_controller.ex
diff --git
a/lib/pleroma/web/ostatus/ostatus_controller.ex
b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 34fdf97274a3a4450e2233bea3215e6e1f362dae..9ad702dd4aa463399fb07d142d4cea870b0d8b47 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/
lib/pleroma/web/ostatus/ostatus_controller.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller
@@
-136,7
+140,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
"html" ->
conn
|> put_resp_content_type("text/html")
"html" ->
conn
|> put_resp_content_type("text/html")
- |> send_file(200,
"priv/static/index.html"
)
+ |> send_file(200,
Pleroma.Plugs.InstanceStatic.file_path("index.html")
)
_ ->
represent_activity(conn, format, activity, user)
_ ->
represent_activity(conn, format, activity, user)
@@
-157,7
+161,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
conn,
"activity+json",
%Activity{data: %{"type" => "Create"}} = activity,
conn,
"activity+json",
%Activity{data: %{"type" => "Create"}} = activity,
- user
+
_
user
) do
object = Object.normalize(activity.data["object"])
) do
object = Object.normalize(activity.data["object"])
@@
-166,7
+170,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
|> json(ObjectView.render("object.json", %{object: object}))
end
|> json(ObjectView.render("object.json", %{object: object}))
end
- defp represent_activity(conn, "activity+json", _, _) do
+ defp represent_activity(
_
conn, "activity+json", _, _) do
{:error, :not_found}
end
{:error, :not_found}
end