projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error handling for OstatusController.
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 6af42a68526cb5ddceca063a225215c2c8a9dd86..1a012c1b416a05c5e6743cf2f0792af0045042e4 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-1,42
+1,57
@@
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
- socket "/socket", Pleroma.Web.UserSocket
+ if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
+ socket("/socket", Pleroma.Web.UserSocket)
+ end
+
+ socket("/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket)
# Serve at "/" the static files from "priv/static" directory.
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
# Serve at "/" the static files from "priv/static" directory.
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
- plug Plug.Static,
- at: "/media", from: "uploads", gzip: false
+ plug(Plug.Static, at: "/media", from: Pleroma.Upload.upload_path(), gzip: false)
+
+ plug(
+ Plug.Static,
+ at: "/",
+ from: :pleroma,
+ only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png)
+ )
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
if code_reloading? do
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
if code_reloading? do
- plug
Phoenix.CodeReloader
+ plug
(Phoenix.CodeReloader)
end
end
- plug
TrailingFormatPlug
- plug
Plug.RequestId
- plug
Plug.Logger
+ plug
(TrailingFormatPlug)
+ plug
(Plug.RequestId)
+ plug
(Plug.Logger)
- plug Plug.Parsers,
+ plug(
+ Plug.Parsers,
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
- json_decoder: Poison
+ json_decoder: Jason,
+ length: Application.get_env(:pleroma, :instance) |> Keyword.get(:upload_limit)
+ )
- plug
Plug.MethodOverride
- plug
Plug.Head
+ plug
(Plug.MethodOverride)
+ plug
(Plug.Head)
# The session will be stored in the cookie and signed,
# this means its contents can be read but not tampered with.
# Set :encryption_salt if you would also like to encrypt it.
# The session will be stored in the cookie and signed,
# this means its contents can be read but not tampered with.
# Set :encryption_salt if you would also like to encrypt it.
- plug Plug.Session,
+ plug(
+ Plug.Session,
store: :cookie,
key: "_pleroma_key",
signing_salt: "CqaoopA2"
store: :cookie,
key: "_pleroma_key",
signing_salt: "CqaoopA2"
+ )
- plug
Pleroma.Web.Router
+ plug
(Pleroma.Web.Router)
@doc """
Dynamically loads configuration from the system environment
@doc """
Dynamically loads configuration from the system environment