Merge pull request 'Remove proxy_remote vestiges' (#805) from Oneric/akkoma:purge_proxy_remote into develop

Reviewed-on: #805

config/config.exs

@@ -63,7 +63,6 @@
   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"]

config/description.exs

@@ -118,14 +118,6 @@
           "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,

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.
 

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]},

lib/pleroma/config/transfer_task.ex

@@ -24,7 +24,6 @@ defp reboot_time_keys,
   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]}

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

test/pleroma/config_db_test.exs

@@ -389,7 +389,6 @@ test "complex keyword with nested mixed childs" 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 @@ test "complex keyword with nested mixed childs" 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,