From bf8f493ffd319682cc56d20590a35921654f2ba5 Mon Sep 17 00:00:00 2001 From: Oneric Date: Sun, 16 Jun 2024 00:52:33 +0200 Subject: [PATCH] Remove proxy_remote vestiges Ever since 364b6969eb7c79e57ed02345ddff4f48519e6b0a this setting wasn't used by the backend and a noop. The stated usecase is better served by setting the base_url to a local subdomain and using proxying in nginx/Caddy/... --- config/config.exs | 1 - config/description.exs | 8 -------- docs/docs/configuration/cheatsheet.md | 1 - docs/docs/development/API/admin_api.md | 2 -- lib/pleroma/config/transfer_task.ex | 1 - .../ca/LC_MESSAGES/config_descriptions.po | 18 ------------------ priv/gettext/config_descriptions.pot | 12 ------------ .../en/LC_MESSAGES/config_descriptions.po | 12 ------------ .../en_test/LC_MESSAGES/config_descriptions.po | 15 --------------- .../es/LC_MESSAGES/config_descriptions.po | 18 ------------------ .../fr/LC_MESSAGES/config_descriptions.po | 15 --------------- .../he/LC_MESSAGES/config_descriptions.po | 15 --------------- .../id/LC_MESSAGES/config_descriptions.po | 15 --------------- .../ja/LC_MESSAGES/config_descriptions.po | 15 --------------- .../nl/LC_MESSAGES/config_descriptions.po | 18 ------------------ .../pl/LC_MESSAGES/config_descriptions.po | 15 --------------- .../pt/LC_MESSAGES/config_descriptions.po | 15 --------------- .../pt_PT/LC_MESSAGES/config_descriptions.po | 15 --------------- .../ru/LC_MESSAGES/config_descriptions.po | 15 --------------- .../th/LC_MESSAGES/config_descriptions.po | 18 ------------------ .../uk/LC_MESSAGES/config_descriptions.po | 15 --------------- .../vi/LC_MESSAGES/config_descriptions.po | 15 --------------- .../zh_Hans/LC_MESSAGES/config_descriptions.po | 15 --------------- .../zh_Hant/LC_MESSAGES/config_descriptions.po | 15 --------------- test/pleroma/config_db_test.exs | 2 -- 25 files changed, 306 deletions(-) diff --git a/config/config.exs b/config/config.exs index 82c64f402..e919910b3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -63,7 +63,6 @@ config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [], link_name: false, - proxy_remote: false, filename_display_max_length: 30, base_url: nil, allowed_mime_types: ["image", "audio", "video"] diff --git a/config/description.exs b/config/description.exs index 847f4a1a1..b69478fdb 100644 --- a/config/description.exs +++ b/config/description.exs @@ -118,14 +118,6 @@ config :pleroma, :config_description, [ "font" ] }, - %{ - key: :proxy_remote, - type: :boolean, - description: """ - Proxy requests to the remote uploader.\n - Useful if media upload endpoint is not internet accessible. - """ - }, %{ key: :filename_display_max_length, type: :integer, diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md index 3591d2459..80f5c3577 100644 --- a/docs/docs/configuration/cheatsheet.md +++ b/docs/docs/configuration/cheatsheet.md @@ -605,7 +605,6 @@ the source code is here: [kocaptcha](https://github.com/koto-bank/kocaptcha). Th * `link_name`: When enabled Akkoma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers * `base_url`: The base URL to access a user-uploaded file; MUST be configured explicitly. Using a (sub)domain distinct from the instance endpoint is **strongly** recommended. A good value might be `https://media.myakkoma.instance/media/`. -* `proxy_remote`: If you're using a remote uploader, Akkoma will proxy media requests instead of redirecting to it. * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation. * `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30. diff --git a/docs/docs/development/API/admin_api.md b/docs/docs/development/API/admin_api.md index 958388879..6efae59b3 100644 --- a/docs/docs/development/API/admin_api.md +++ b/docs/docs/development/API/admin_api.md @@ -1033,7 +1033,6 @@ Most of the settings will be applied in `runtime`, this means that you don't nee - `:pools` - partially settings inside these keys: - `:seconds_valid` in `Pleroma.Captcha` - - `:proxy_remote` in `Pleroma.Upload` - `:upload_limit` in `:instance` - Params: @@ -1094,7 +1093,6 @@ List of settings which support only full update by subkey: {"tuple": [":uploader", "Pleroma.Uploaders.Local"]}, {"tuple": [":filters", ["Pleroma.Upload.Filter.Dedupe"]]}, {"tuple": [":link_name", true]}, - {"tuple": [":proxy_remote", false]}, {"tuple": [":proxy_opts", [ {"tuple": [":redirect_on_failure", false]}, {"tuple": [":max_body_length", 1048576]}, diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index a8a96f393..20b609758 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -24,7 +24,6 @@ defmodule Pleroma.Config.TransferTask do defp reboot_time_subkeys, do: [ {:pleroma, Pleroma.Captcha, [:seconds_valid]}, - {:pleroma, Pleroma.Upload, [:proxy_remote]}, {:pleroma, :instance, [:upload_limit]}, {:pleroma, :http, [:pool_size]}, {:pleroma, :http, [:proxy_url]} diff --git a/priv/gettext/ca/LC_MESSAGES/config_descriptions.po b/priv/gettext/ca/LC_MESSAGES/config_descriptions.po index 2cb12d1f8..fc3f3e0e4 100644 --- a/priv/gettext/ca/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/ca/LC_MESSAGES/config_descriptions.po @@ -3296,18 +3296,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5798,12 +5786,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/config_descriptions.pot b/priv/gettext/config_descriptions.pot index 1def8e527..88661ffdb 100644 --- a/priv/gettext/config_descriptions.pot +++ b/priv/gettext/config_descriptions.pot @@ -2602,12 +2602,6 @@ msgctxt "config description at :pleroma-Pleroma.Upload > :link_name" msgid "If enabled, a name parameter will be added to the URL of the upload. For example `https://instance.tld/media/imagehash.png?name=realname.png`." msgstr "" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -4888,12 +4882,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/en/LC_MESSAGES/config_descriptions.po b/priv/gettext/en/LC_MESSAGES/config_descriptions.po index 0e3c6a293..00578323b 100644 --- a/priv/gettext/en/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/en/LC_MESSAGES/config_descriptions.po @@ -2603,12 +2603,6 @@ msgctxt "config description at :pleroma-Pleroma.Upload > :link_name" msgid "If enabled, a name parameter will be added to the URL of the upload. For example `https://instance.tld/media/imagehash.png?name=realname.png`." msgstr "" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -4889,12 +4883,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/en_test/LC_MESSAGES/config_descriptions.po b/priv/gettext/en_test/LC_MESSAGES/config_descriptions.po index 54fbeb793..128bb350a 100644 --- a/priv/gettext/en_test/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/en_test/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/es/LC_MESSAGES/config_descriptions.po b/priv/gettext/es/LC_MESSAGES/config_descriptions.po index 5336e3634..8eb02d2d3 100644 --- a/priv/gettext/es/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/es/LC_MESSAGES/config_descriptions.po @@ -3314,18 +3314,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5816,12 +5804,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/fr/LC_MESSAGES/config_descriptions.po b/priv/gettext/fr/LC_MESSAGES/config_descriptions.po index 1d865d460..3ddc36808 100644 --- a/priv/gettext/fr/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/fr/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/he/LC_MESSAGES/config_descriptions.po b/priv/gettext/he/LC_MESSAGES/config_descriptions.po index 8744913f1..507f5668f 100644 --- a/priv/gettext/he/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/he/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/id/LC_MESSAGES/config_descriptions.po b/priv/gettext/id/LC_MESSAGES/config_descriptions.po index 4c2443a5e..f9611d0e4 100644 --- a/priv/gettext/id/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/id/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/ja/LC_MESSAGES/config_descriptions.po b/priv/gettext/ja/LC_MESSAGES/config_descriptions.po index 8f68159a5..2aac10490 100644 --- a/priv/gettext/ja/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/ja/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/nl/LC_MESSAGES/config_descriptions.po b/priv/gettext/nl/LC_MESSAGES/config_descriptions.po index f97049069..9bb8ea1d8 100644 --- a/priv/gettext/nl/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/nl/LC_MESSAGES/config_descriptions.po @@ -3316,18 +3316,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5818,12 +5806,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/pl/LC_MESSAGES/config_descriptions.po b/priv/gettext/pl/LC_MESSAGES/config_descriptions.po index 0692a61cd..929b514da 100644 --- a/priv/gettext/pl/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/pl/LC_MESSAGES/config_descriptions.po @@ -2902,15 +2902,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5217,12 +5208,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/pt/LC_MESSAGES/config_descriptions.po b/priv/gettext/pt/LC_MESSAGES/config_descriptions.po index f4cca250a..41dc52cf2 100644 --- a/priv/gettext/pt/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/pt/LC_MESSAGES/config_descriptions.po @@ -2904,15 +2904,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5219,12 +5210,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/pt_PT/LC_MESSAGES/config_descriptions.po b/priv/gettext/pt_PT/LC_MESSAGES/config_descriptions.po index dc84d9731..9b36cb458 100644 --- a/priv/gettext/pt_PT/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/pt_PT/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/ru/LC_MESSAGES/config_descriptions.po b/priv/gettext/ru/LC_MESSAGES/config_descriptions.po index 30d7fe8c1..80e728534 100644 --- a/priv/gettext/ru/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/ru/LC_MESSAGES/config_descriptions.po @@ -2899,15 +2899,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5214,12 +5205,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/th/LC_MESSAGES/config_descriptions.po b/priv/gettext/th/LC_MESSAGES/config_descriptions.po index ce7431368..ff3cf184b 100644 --- a/priv/gettext/th/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/th/LC_MESSAGES/config_descriptions.po @@ -3325,18 +3325,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5827,12 +5815,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/uk/LC_MESSAGES/config_descriptions.po b/priv/gettext/uk/LC_MESSAGES/config_descriptions.po index df716b345..5b35ded22 100644 --- a/priv/gettext/uk/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/uk/LC_MESSAGES/config_descriptions.po @@ -2899,15 +2899,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5214,12 +5205,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/vi/LC_MESSAGES/config_descriptions.po b/priv/gettext/vi/LC_MESSAGES/config_descriptions.po index 8218a137e..9e933ffe5 100644 --- a/priv/gettext/vi/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/vi/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/zh_Hans/LC_MESSAGES/config_descriptions.po b/priv/gettext/zh_Hans/LC_MESSAGES/config_descriptions.po index 49a8c5b57..016f0c11a 100644 --- a/priv/gettext/zh_Hans/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/zh_Hans/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/priv/gettext/zh_Hant/LC_MESSAGES/config_descriptions.po b/priv/gettext/zh_Hant/LC_MESSAGES/config_descriptions.po index 536533ab8..fd7df7280 100644 --- a/priv/gettext/zh_Hant/LC_MESSAGES/config_descriptions.po +++ b/priv/gettext/zh_Hant/LC_MESSAGES/config_descriptions.po @@ -2898,15 +2898,6 @@ msgstr "" "If enabled, a name parameter will be added to the URL of the upload. For " "example `https://instance.tld/media/imagehash.png?name=realname.png`." -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config description at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy requests to the remote uploader.\n\nUseful if media upload endpoint is not internet accessible.\n" -msgstr "" -"Proxy requests to the remote uploader.\n" -"\n" -"Useful if media upload endpoint is not internet accessible.\n" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config description at :pleroma-Pleroma.Upload > :uploader" @@ -5213,12 +5204,6 @@ msgctxt "config label at :pleroma-Pleroma.Upload > :link_name" msgid "Link name" msgstr "Link name" -#: lib/pleroma/docs/translator.ex:5 -#, elixir-autogen, elixir-format, fuzzy -msgctxt "config label at :pleroma-Pleroma.Upload > :proxy_remote" -msgid "Proxy remote" -msgstr "Proxy remote" - #: lib/pleroma/docs/translator.ex:5 #, elixir-autogen, elixir-format, fuzzy msgctxt "config label at :pleroma-Pleroma.Upload > :uploader" diff --git a/test/pleroma/config_db_test.exs b/test/pleroma/config_db_test.exs index 43bb38afe..7df53955d 100644 --- a/test/pleroma/config_db_test.exs +++ b/test/pleroma/config_db_test.exs @@ -389,7 +389,6 @@ defmodule Pleroma.ConfigDBTest do %{"tuple" => [":uploader", "Pleroma.Uploaders.Local"]}, %{"tuple" => [":filters", ["Pleroma.Upload.Filter.Dedupe"]]}, %{"tuple" => [":link_name", true]}, - %{"tuple" => [":proxy_remote", false]}, %{"tuple" => [":common_map", %{":key" => "value"}]}, %{ "tuple" => [ @@ -413,7 +412,6 @@ defmodule Pleroma.ConfigDBTest do uploader: Pleroma.Uploaders.Local, filters: [Pleroma.Upload.Filter.Dedupe], link_name: true, - proxy_remote: false, common_map: %{key: "value"}, proxy_opts: [ redirect_on_failure: false,