projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
media_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
index ed4c08d990168421d6d6dafc248c9a0765213087..e367512201f934437d59e6dcb8a8ba9020acfac8 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MediaController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MediaController do
@@
-15,8
+15,6
@@
defmodule Pleroma.Web.MastodonAPI.MediaController do
plug(OAuthScopesPlug, %{scopes: ["write:media"]})
plug(OAuthScopesPlug, %{scopes: ["write:media"]})
- plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
-
@doc "POST /api/v1/media"
def create(%{assigns: %{user: user}} = conn, %{"file" => file} = data) do
with {:ok, object} <-
@doc "POST /api/v1/media"
def create(%{assigns: %{user: user}} = conn, %{"file" => file} = data) do
with {:ok, object} <-