projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
backup_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/backup_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/backup_controller.ex
index 8e3d081f38d92eea69fc8b0a778274236ab56e91..dd0a2e22f4f9d0b18bfa89bf3e065ab240c868ec 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/backup_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/backup_controller.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Web.PleromaAPI.BackupController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.PleromaAPI.BackupController do
use Pleroma.Web, :controller
+ alias Pleroma.User.Backup
alias Pleroma.Web.Plugs.OAuthScopesPlug
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
alias Pleroma.Web.Plugs.OAuthScopesPlug
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
@@
-14,13
+15,13
@@
defmodule Pleroma.Web.PleromaAPI.BackupController do
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.PleromaBackupOperation
def index(%{assigns: %{user: user}} = conn, _params) do
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.PleromaBackupOperation
def index(%{assigns: %{user: user}} = conn, _params) do
- backups =
Pleroma.
Backup.list(user)
+ backups = Backup.list(user)
render(conn, "index.json", backups: backups)
end
def create(%{assigns: %{user: user}} = conn, _params) do
render(conn, "index.json", backups: backups)
end
def create(%{assigns: %{user: user}} = conn, _params) do
- with {:ok, _} <-
Pleroma.
Backup.create(user) do
- backups =
Pleroma.
Backup.list(user)
+ with {:ok, _} <- Backup.create(user) do
+ backups = Backup.list(user)
render(conn, "index.json", backups: backups)
end
end
render(conn, "index.json", backups: backups)
end
end