projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Show bubble_timeline in the api if any instances are set in it...
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
views
/
backup_view.ex
diff --git
a/lib/pleroma/web/pleroma_api/views/backup_view.ex
b/lib/pleroma/web/pleroma_api/views/backup_view.ex
index af75876aa184a51e5b57f52503f223da35cb475a..944600c862947a46af08b7dc25a84e611a885a60 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/backup_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/backup_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.BackupView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.BackupView do
@@
-10,6
+10,7
@@
defmodule Pleroma.Web.PleromaAPI.BackupView do
def render("show.json", %{backup: %Backup{} = backup}) do
%{
def render("show.json", %{backup: %Backup{} = backup}) do
%{
+ id: backup.id,
content_type: backup.content_type,
url: download_url(backup),
file_size: backup.file_size,
content_type: backup.content_type,
url: download_url(backup),
file_size: backup.file_size,
@@
-23,6
+24,6
@@
defmodule Pleroma.Web.PleromaAPI.BackupView do
end
def download_url(%Backup{file_name: file_name}) do
end
def download_url(%Backup{file_name: file_name}) do
- Pleroma.
Web.Endpoint.url() <> "/media
/backups/" <> file_name
+ Pleroma.
Upload.base_url() <> "
/backups/" <> file_name
end
end
end
end