From 35dcea3e13673b8a1a078a1f6fbc44f1e2098c22 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 13 Sep 2019 17:05:19 +0200
Subject: Remove [true,false] for booleans, it is implicit

---
 config/description.exs | 262 +++++++++++++------------------------------------
 1 file changed, 68 insertions(+), 194 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 32d36d6d6..5ae32d0f2 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -39,11 +39,7 @@ config :pleroma, :config_description, [
         key: :link_name,
         type: :boolean,
         description:
-          "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`",
-        suggestions: [
-          true,
-          false
-        ]
+          "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`"
       },
       %{
         key: :base_url,
@@ -57,11 +53,7 @@ config :pleroma, :config_description, [
         key: :proxy_remote,
         type: :boolean,
         description:
-          "If enabled, requests to media stored using a remote uploader will be proxied instead of being redirected.",
-        suggestions: [
-          true,
-          false
-        ]
+          "If enabled, requests to media stored using a remote uploader will be proxied instead of being redirected."
       },
       %{
         key: :proxy_opts,
@@ -190,11 +182,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Allow/disallow send emails",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Allow/disallow send emails"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.SMTP},
@@ -221,8 +209,7 @@ config :pleroma, :config_description, [
         group: {:subgroup, Swoosh.Adapters.SMTP},
         key: :ssl,
         type: :boolean,
-        description: "`Swoosh.Adapters.SMTP` adapter specific setting",
-        suggestions: [true, false]
+        description: "`Swoosh.Adapters.SMTP` adapter specific setting"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.SMTP},
@@ -256,8 +243,7 @@ config :pleroma, :config_description, [
         group: {:subgroup, Swoosh.Adapters.SMTP},
         key: :no_mx_lookups,
         type: :boolean,
-        description: "`Swoosh.Adapters.SMTP` adapter specific setting",
-        suggestions: [true, false]
+        description: "`Swoosh.Adapters.SMTP` adapter specific setting"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.Sendgrid},
@@ -284,8 +270,7 @@ config :pleroma, :config_description, [
         group: {:subgroup, Swoosh.Adapters.Sendmail},
         key: :qmail,
         type: :boolean,
-        description: "`Swoosh.Adapters.Sendmail` adapter specific setting",
-        suggestions: [true, false]
+        description: "`Swoosh.Adapters.Sendmail` adapter specific setting"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.Mandrill},
@@ -553,38 +538,22 @@ config :pleroma, :config_description, [
       %{
         key: :registrations_open,
         type: :boolean,
-        description: "Enable registrations for anyone, invitations can be enabled when false",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Enable registrations for anyone, invitations can be enabled when false"
       },
       %{
         key: :invites_enabled,
         type: :boolean,
-        description: "Enable user invitations for admins (depends on registrations_open: false)",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Enable user invitations for admins (depends on registrations_open: false)"
       },
       %{
         key: :account_activation_required,
         type: :boolean,
-        description: "Require users to confirm their emails before signing in",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Require users to confirm their emails before signing in"
       },
       %{
         key: :federating,
         type: :boolean,
-        description: "Enable federation with other instances",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Enable federation with other instances"
       },
       %{
         key: :federation_incoming_replies_max_depth,
@@ -618,11 +587,7 @@ config :pleroma, :config_description, [
       %{
         key: :allow_relay,
         type: :boolean,
-        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance"
       },
       %{
         key: :rewrite_policy,
@@ -638,11 +603,7 @@ config :pleroma, :config_description, [
         type: :boolean,
         description:
           "Makes the client API in authentificated mode-only except for user-profiles." <>
-            " Useful for disabling the Local Timeline and The Whole Known Network",
-        suggestions: [
-          true,
-          false
-        ]
+            " Useful for disabling the Local Timeline and The Whole Known Network"
       },
       %{
         key: :quarantined_instances,
@@ -658,11 +619,7 @@ config :pleroma, :config_description, [
         key: :managed_config,
         type: :boolean,
         description:
-          "Whenether the config for pleroma-fe is configured in this config or in static/config.json",
-        suggestions: [
-          true,
-          false
-        ]
+          "Whenether the config for pleroma-fe is configured in this config or in static/config.json"
       },
       %{
         key: :static_dir,
@@ -689,11 +646,7 @@ config :pleroma, :config_description, [
         key: :mrf_transparency,
         type: :boolean,
         description:
-          "Make the content of your Message Rewrite Facility settings public (via nodeinfo)",
-        suggestions: [
-          true,
-          false
-        ]
+          "Make the content of your Message Rewrite Facility settings public (via nodeinfo)"
       },
       %{
         key: :mrf_transparency_exclusions,
@@ -709,11 +662,7 @@ config :pleroma, :config_description, [
         type: :boolean,
         description:
           "Set to true to use extended local nicknames format (allows underscores/dashes)." <>
-            " This will break federation with older software for theses nicknames",
-        suggestions: [
-          true,
-          false
-        ]
+            " This will break federation with older software for theses nicknames"
       },
       %{
         key: :max_pinned_statuses,
@@ -741,11 +690,7 @@ config :pleroma, :config_description, [
         key: :no_attachment_links,
         type: :boolean,
         description:
-          "Set to true to disable automatically adding attachment link text to statuses",
-        suggestions: [
-          true,
-          false
-        ]
+          "Set to true to disable automatically adding attachment link text to statuses"
       },
       %{
         key: :welcome_message,
@@ -780,20 +725,12 @@ config :pleroma, :config_description, [
         description:
           "If set to true, only mentions at the beginning of a post will be used to address people in direct messages." <>
             " This is to prevent accidental mentioning of people when talking about them (e.g. \"@friend hey i really don't like @enemy\")." <>
-            " Default: false",
-        suggestions: [
-          true,
-          false
-        ]
+            " Default: false"
       },
       %{
         key: :healthcheck,
         type: :boolean,
-        description: "If set to true, system data will be shown on /api/pleroma/healthcheck",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "If set to true, system data will be shown on /api/pleroma/healthcheck"
       },
       %{
         key: :remote_post_retention_days,
@@ -823,11 +760,7 @@ config :pleroma, :config_description, [
       %{
         key: :skip_thread_containment,
         type: :boolean,
-        description: "Skip filter out broken threads. The default is true",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Skip filter out broken threads. The default is true"
       },
       %{
         key: :limit_to_local_content,
@@ -844,11 +777,7 @@ config :pleroma, :config_description, [
         key: :dynamic_configuration,
         type: :boolean,
         description:
-          "Allow transferring configuration to DB with the subsequent customization from Admin api. Defaults to `false`",
-        suggestions: [
-          true,
-          false
-        ]
+          "Allow transferring configuration to DB with the subsequent customization from Admin api. Defaults to `false`"
       },
       %{
         key: :max_account_fields,
@@ -886,11 +815,7 @@ config :pleroma, :config_description, [
       %{
         key: :external_user_synchronization,
         type: :boolean,
-        description: "Enabling following/followers counters synchronization for external users",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "Enabling following/followers counters synchronization for external users"
       }
     ]
   },
@@ -1069,48 +994,40 @@ config :pleroma, :config_description, [
           %{
             key: :showInstanceSpecificPanel,
             type: :boolean,
-            description: "Whenether to show the instance's specific panel",
-            suggestions: [true, false]
+            description: "Whenether to show the instance's specific panel"
           },
           %{
             key: :scopeOptionsEnabled,
             type: :boolean,
-            description: "Enable setting an notice visibility and subject/CW when posting",
-            suggestions: [true, false]
+            description: "Enable setting an notice visibility and subject/CW when posting"
           },
           %{
             key: :formattingOptionsEnabled,
             type: :boolean,
             description:
-              "Enable setting a formatting different than plain-text (ie. HTML, Markdown) when posting, relates to :instance, allowed_post_formats",
-            suggestions: [true, false]
+              "Enable setting a formatting different than plain-text (ie. HTML, Markdown) when posting, relates to :instance, allowed_post_formats"
           },
           %{
             key: :collapseMessageWithSubject,
             type: :boolean,
             description:
-              "When a message has a subject(aka Content Warning), collapse it by default",
-            suggestions: [true, false]
+              "When a message has a subject(aka Content Warning), collapse it by default"
           },
           %{
             key: :hidePostStats,
             type: :boolean,
-            description: "Hide notices statistics(repeats, favorites, ...)",
-            suggestions: [true, false]
+            description: "Hide notices statistics(repeats, favorites, ...)"
           },
           %{
             key: :hideUserStats,
             type: :boolean,
             description:
-              "Hide profile statistics(posts, posts per day, followers, followings, ...)",
-            suggestions: [true, false]
+              "Hide profile statistics(posts, posts per day, followers, followings, ...)"
           },
           %{
             key: :scopeCopy,
             type: :boolean,
-            description:
-              "Copy the scope (private/unlisted/public) in replies to posts by default",
-            suggestions: [true, false]
+            description: "Copy the scope (private/unlisted/public) in replies to posts by default"
           },
           %{
             key: :subjectLineBehavior,
@@ -1124,8 +1041,7 @@ config :pleroma, :config_description, [
           %{
             key: :alwaysShowSubjectInput,
             type: :boolean,
-            description: "When set to false, auto-hide the subject field when it's empty",
-            suggestions: [true, false]
+            description: "When set to false, auto-hide the subject field when it's empty"
           }
         ]
       },
@@ -1142,8 +1058,7 @@ config :pleroma, :config_description, [
           %{
             key: :showInstanceSpecificPanel,
             type: :boolean,
-            description: "Whenether to show the instance's specific panel",
-            suggestions: [true, false]
+            description: "Whenether to show the instance's specific panel"
           }
         ]
       }
@@ -1271,14 +1186,12 @@ config :pleroma, :config_description, [
       %{
         key: :allow_followersonly,
         type: :boolean,
-        description: "whether to allow followers-only posts",
-        suggestions: [true, false]
+        description: "whether to allow followers-only posts"
       },
       %{
         key: :allow_direct,
         type: :boolean,
-        description: "whether to allow direct messages",
-        suggestions: [true, false]
+        description: "whether to allow direct messages"
       }
     ]
   },
@@ -1393,8 +1306,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Enables proxying of remote media to the instance's proxy",
-        suggestions: [true, false]
+        description: "Enables proxying of remote media to the instance's proxy"
       },
       %{
         key: :base_url,
@@ -1426,8 +1338,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Enables the gopher interface",
-        suggestions: [true, false]
+        description: "Enables the gopher interface"
       },
       %{
         key: :ip,
@@ -1601,8 +1512,7 @@ config :pleroma, :config_description, [
       %{
         key: :secure_cookie_flag,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :extra_cookie_attrs,
@@ -1621,20 +1531,17 @@ config :pleroma, :config_description, [
       %{
         key: :unfollow_blocked,
         type: :boolean,
-        description: "Whether blocks result in people getting unfollowed",
-        suggestions: [true, false]
+        description: "Whether blocks result in people getting unfollowed"
       },
       %{
         key: :outgoing_blocks,
         type: :boolean,
-        description: "Whether to federate blocks to other instances",
-        suggestions: [true, false]
+        description: "Whether to federate blocks to other instances"
       },
       %{
         key: :sign_object_fetches,
         type: :boolean,
-        description: "Sign object fetches with HTTP signatures",
-        suggestions: [true, false]
+        description: "Sign object fetches with HTTP signatures"
       },
       %{
         key: :follow_handshake_timeout,
@@ -1653,14 +1560,12 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Whether the managed content security policy is enabled",
-        suggestions: [true, false]
+        description: "Whether the managed content security policy is enabled"
       },
       %{
         key: :sts,
         type: :boolean,
-        description: "Whether to additionally send a Strict-Transport-Security header",
-        suggestions: [true, false]
+        description: "Whether to additionally send a Strict-Transport-Security header"
       },
       %{
         key: :sts_max_age,
@@ -1727,8 +1632,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Whether the captcha should be shown on registration",
-        suggestions: [true, false]
+        description: "Whether the captcha should be shown on registration"
       },
       %{
         key: :method,
@@ -1817,8 +1721,7 @@ config :pleroma, :config_description, [
       %{
         key: :verbose,
         type: :boolean,
-        description: "Logs verbose mode",
-        suggestions: [false, true]
+        description: "Logs verbose mode"
       },
       %{
         key: :prune,
@@ -1937,11 +1840,7 @@ config :pleroma, :config_description, [
       %{
         key: :unfurl_nsfw,
         type: :boolean,
-        description: "If set to true nsfw attachments will be shown in previews",
-        suggestions: [
-          true,
-          false
-        ]
+        description: "If set to true nsfw attachments will be shown in previews"
       }
     ]
   },
@@ -1955,8 +1854,7 @@ config :pleroma, :config_description, [
         key: :enabled,
         type: :boolean,
         description:
-          "if enabled the instance will parse metadata from attached links to generate link previews",
-        suggestions: [true, false]
+          "if enabled the instance will parse metadata from attached links to generate link previews"
       },
       %{
         key: :ignore_hosts,
@@ -1998,8 +1896,7 @@ config :pleroma, :config_description, [
         key: :enabled,
         type: :boolean,
         description:
-          "if enabled, when a new user is federated with, fetch some of their latest posts",
-        suggestions: [true, false]
+          "if enabled, when a new user is federated with, fetch some of their latest posts"
       },
       %{
         key: :pages,
@@ -2030,14 +1927,12 @@ config :pleroma, :config_description, [
       %{
         key: :new_window,
         type: :boolean,
-        description: "set to false to remove target='_blank' attribute",
-        suggestions: [true, false]
+        description: "set to false to remove target='_blank' attribute"
       },
       %{
         key: :scheme,
         type: :boolean,
-        description: "Set to true to link urls with schema http://google.com",
-        suggestions: [true, false]
+        description: "Set to true to link urls with schema http://google.com"
       },
       %{
         key: :truncate,
@@ -2049,14 +1944,12 @@ config :pleroma, :config_description, [
       %{
         key: :strip_prefix,
         type: :boolean,
-        description: "Strip the scheme prefix",
-        suggestions: [true, false]
+        description: "Strip the scheme prefix"
       },
       %{
         key: :extra,
         type: :boolean,
-        description: "link urls with rarely used schemes (magnet, ipfs, irc, etc.)",
-        suggestions: [true, false]
+        description: "link urls with rarely used schemes (magnet, ipfs, irc, etc.)"
       }
     ]
   },
@@ -2083,8 +1976,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "whether scheduled activities are sent to the job queue to be executed",
-        suggestions: [true, false]
+        description: "whether scheduled activities are sent to the job queue to be executed"
       }
     ]
   },
@@ -2097,8 +1989,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "whether expired activities will be sent to the job queue to be deleted",
-        suggestions: [true, false]
+        description: "whether expired activities will be sent to the job queue to be deleted"
       }
     ]
   },
@@ -2128,8 +2019,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "enables LDAP authentication",
-        suggestions: [true, false]
+        description: "enables LDAP authentication"
       },
       %{
         key: :host,
@@ -2146,8 +2036,7 @@ config :pleroma, :config_description, [
       %{
         key: :ssl,
         type: :boolean,
-        description: "true to use SSL, usually implies the port 636",
-        suggestions: [true, false]
+        description: "true to use SSL, usually implies the port 636"
       },
       %{
         key: :sslopts,
@@ -2158,8 +2047,7 @@ config :pleroma, :config_description, [
       %{
         key: :tls,
         type: :boolean,
-        description: "true to start TLS, usually implies the port 389",
-        suggestions: [true, false]
+        description: "true to start TLS, usually implies the port 389"
       },
       %{
         key: :tlsopts,
@@ -2237,8 +2125,7 @@ config :pleroma, :config_description, [
           %{
             key: :active,
             type: :boolean,
-            description: "globally enable or disable digest emails",
-            suggestions: [true, false]
+            description: "globally enable or disable digest emails"
           },
           %{
             key: :schedule,
@@ -2346,14 +2233,12 @@ config :pleroma, :config_description, [
         key: :issue_new_refresh_token,
         type: :boolean,
         description:
-          "Keeps old refresh token or generate new refresh token when to obtain an access token",
-        suggestions: [true, false]
+          "Keeps old refresh token or generate new refresh token when to obtain an access token"
       },
       %{
         key: :clean_expired_tokens,
         type: :boolean,
-        description: "Enable a background job to clean expired oauth tokens. Defaults to false",
-        suggestions: [true, false]
+        description: "Enable a background job to clean expired oauth tokens. Defaults to false"
       },
       %{
         key: :clean_expired_tokens_interval,
@@ -2415,8 +2300,7 @@ config :pleroma, :config_description, [
       %{
         key: :rum_enabled,
         type: :boolean,
-        description: "If RUM indexes should be used. Defaults to false",
-        suggestions: [true, false]
+        description: "If RUM indexes should be used. Defaults to false"
       }
     ]
   },
@@ -2475,8 +2359,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Enables ssh",
-        suggestions: [true, false]
+        description: "Enables ssh"
       },
       %{
         key: :priv_dir,
@@ -2579,8 +2462,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       }
     ]
   },
@@ -2593,8 +2475,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         type: :boolean,
-        description: "Enables suggestions",
-        suggestions: []
+        description: "Enables suggestions"
       },
       %{
         key: :third_party_engine,
@@ -2686,8 +2567,7 @@ config :pleroma, :config_description, [
       %{
         key: :send_user_agent,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :adapter,
@@ -2715,26 +2595,22 @@ config :pleroma, :config_description, [
       %{
         key: :allow_inline_images,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :allow_headings,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :allow_tables,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :allow_fonts,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :scrub_policy,
@@ -2753,8 +2629,7 @@ config :pleroma, :config_description, [
       %{
         key: :deny_follow_blocked,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       }
     ]
   },
@@ -2854,8 +2729,7 @@ config :pleroma, :config_description, [
       %{
         key: :credentials,
         type: :boolean,
-        description: "",
-        suggestions: [true, false]
+        description: ""
       },
       %{
         key: :headers,
-- 
cgit v1.2.3


From 50ec445b2c1e45b0d3b3a2016650f3262ed00e75 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 17 Sep 2019 21:57:13 +0200
Subject: description.exs: remove empty strings and arrays

---
 config/description.exs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 5ae32d0f2..959d839bc 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -109,8 +109,7 @@ config :pleroma, :config_description, [
         type: :string,
         description:
           "If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <>
-            " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint.",
-        suggestions: [""]
+            " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint."
       }
     ]
   },
@@ -360,22 +359,19 @@ config :pleroma, :config_description, [
         group: {:subgroup, Swoosh.Adapters.SocketLabs},
         key: :server_id,
         type: :string,
-        description: "`Swoosh.Adapters.SocketLabs` adapter specific setting",
-        suggestions: [""]
+        description: "`Swoosh.Adapters.SocketLabs` adapter specific setting"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.SocketLabs},
         key: :api_key,
         type: :string,
-        description: "`Swoosh.Adapters.SocketLabs` adapter specific setting",
-        suggestions: [""]
+        description: "`Swoosh.Adapters.SocketLabs` adapter specific setting"
       },
       %{
         group: {:subgroup, Swoosh.Adapters.Gmail},
         key: :access_token,
         type: :string,
-        description: "`Swoosh.Adapters.Gmail` adapter specific setting",
-        suggestions: [""]
+        description: "`Swoosh.Adapters.Gmail` adapter specific setting"
       }
     ]
   },
@@ -1682,8 +1678,7 @@ config :pleroma, :config_description, [
     group: :pleroma_job_queue,
     key: :queues,
     type: :group,
-    description: "[Deprecated] Replaced with `Oban`/`:queues` (keeping the same format)",
-    children: []
+    description: "[Deprecated] Replaced with `Oban`/`:queues` (keeping the same format)"
   },
   %{
     group: :pleroma,
@@ -1694,8 +1689,7 @@ config :pleroma, :config_description, [
       %{
         key: :max_retries,
         type: :integer,
-        description: "[Deprecated] Replaced as `Oban`/`:queues`/`:outgoing_federation` value",
-        suggestions: []
+        description: "[Deprecated] Replaced as `Oban`/`:queues`/`:outgoing_federation` value"
       }
     ]
   },
@@ -2041,8 +2035,7 @@ config :pleroma, :config_description, [
       %{
         key: :sslopts,
         type: :keyword,
-        description: "additional SSL options",
-        suggestions: []
+        description: "additional SSL options"
       },
       %{
         key: :tls,
@@ -2052,8 +2045,7 @@ config :pleroma, :config_description, [
       %{
         key: :tlsopts,
         type: :keyword,
-        description: "additional TLS options",
-        suggestions: []
+        description: "additional TLS options"
       },
       %{
         key: :base,
-- 
cgit v1.2.3


From c0c56282007aff88a923bba4769af894cb6235af Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 17 Sep 2019 22:14:56 +0200
Subject: description.exs: remove empty strings on descriptions

---
 config/description.exs | 76 ++++++--------------------------------------------
 1 file changed, 9 insertions(+), 67 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 959d839bc..821b76972 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -857,7 +857,6 @@ config :pleroma, :config_description, [
       %{
         key: :metadata,
         type: {:list, :atom},
-        description: "",
         suggestions: [[:request_id]]
       }
     ]
@@ -883,7 +882,6 @@ config :pleroma, :config_description, [
       %{
         key: :metadata,
         type: {:list, :atom},
-        description: "",
         suggestions: [[:request_id]]
       }
     ]
@@ -1177,7 +1175,6 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :mrf_rejectnonpublic,
     type: :group,
-    description: "",
     children: [
       %{
         key: :allow_followersonly,
@@ -1444,43 +1441,36 @@ config :pleroma, :config_description, [
       %{
         key: :instrumenters,
         type: {:list, :module},
-        description: "",
         suggestions: [Pleroma.Web.Endpoint.Instrumenter]
       },
       %{
         key: :protocol,
         type: :string,
-        description: "",
         suggestions: ["https"]
       },
       %{
         key: :secret_key_base,
         type: :string,
-        description: "",
         suggestions: ["aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl"]
       },
       %{
         key: :signing_salt,
         type: :string,
-        description: "",
         suggestions: ["CqaoopA2"]
       },
       %{
         key: :render_errors,
         type: :keyword,
-        description: "",
         suggestions: [[view: Pleroma.Web.ErrorView, accepts: ~w(json)]],
         children: [
           %{
             key: :view,
             type: :module,
-            description: "",
             suggestions: [Pleroma.Web.ErrorView]
           },
           %{
             key: :accepts,
             type: {:list, :string},
-            description: "",
             suggestions: ["json"]
           }
         ]
@@ -1488,32 +1478,27 @@ config :pleroma, :config_description, [
       %{
         key: :pubsub,
         type: :keyword,
-        description: "",
         suggestions: [[name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]],
         children: [
           %{
             key: :name,
             type: :module,
-            description: "",
             suggestions: [Pleroma.PubSub]
           },
           %{
             key: :adapter,
             type: :module,
-            description: "",
             suggestions: [Phoenix.PubSub.PG2]
           }
         ]
       },
       %{
         key: :secure_cookie_flag,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :extra_cookie_attrs,
         type: {:list, :string},
-        description: "",
         suggestions: ["SameSite=Lax"]
       }
     ]
@@ -1842,7 +1827,6 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :rich_media,
     type: :group,
-    description: "",
     children: [
       %{
         key: :enabled,
@@ -1995,7 +1979,6 @@ config :pleroma, :config_description, [
       %{
         key: Pleroma.Web.Auth.Authenticator,
         type: :module,
-        description: "",
         suggestions: [Pleroma.Web.Auth.PleromaAuthenticator, Pleroma.Web.Auth.LDAPAuthenticator]
       }
     ]
@@ -2172,37 +2155,31 @@ config :pleroma, :config_description, [
           %{
             key: :link_color,
             type: :string,
-            description: "",
             suggestions: ["#d8a070"]
           },
           %{
             key: :background_color,
             type: :string,
-            description: "",
             suggestions: ["#2C3645"]
           },
           %{
             key: :content_background_color,
             type: :string,
-            description: "",
             suggestions: ["#1B2635"]
           },
           %{
             key: :header_color,
             type: :string,
-            description: "",
             suggestions: ["#d8a070"]
           },
           %{
             key: :text_color,
             type: :string,
-            description: "",
             suggestions: ["#b9b9ba"]
           },
           %{
             key: :text_muted_color,
             type: :string,
-            description: "",
             suggestions: ["#b9b9ba"]
           }
         ]
@@ -2245,7 +2222,6 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :emoji,
     type: :group,
-    description: "",
     children: [
       %{
         key: :shortcode_globs,
@@ -2387,7 +2363,6 @@ config :pleroma, :config_description, [
       %{
         key: :types,
         type: :map,
-        description: "",
         suggestions: [
           %{
             "application/xml" => ["xml"],
@@ -2401,31 +2376,26 @@ config :pleroma, :config_description, [
           %{
             key: "application/xml",
             type: {:list, :string},
-            description: "",
             suggestions: [["xml"]]
           },
           %{
             key: "application/xrd+xml",
             type: {:list, :string},
-            description: "",
             suggestions: [["xrd+xml"]]
           },
           %{
             key: "application/jrd+json",
             type: {:list, :string},
-            description: "",
             suggestions: [["jrd+json"]]
           },
           %{
             key: "application/activity+json",
             type: {:list, :string},
-            description: "",
             suggestions: [["activity+json"]]
           },
           %{
             key: "application/ld+json",
             type: {:list, :string},
-            description: "",
             suggestions: [["activity+json"]]
           }
         ]
@@ -2453,8 +2423,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :enabled,
-        type: :boolean,
-        description: ""
+        type: :boolean
       }
     ]
   },
@@ -2462,7 +2431,6 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :suggestions,
     type: :group,
-    description: "",
     children: [
       %{
         key: :enabled,
@@ -2492,7 +2460,6 @@ config :pleroma, :config_description, [
       %{
         key: :web,
         type: :string,
-        description: "",
         suggestions: ["https://vinayaka.distsn.org"]
       }
     ]
@@ -2519,7 +2486,6 @@ config :pleroma, :config_description, [
       %{
         key: :adapter,
         type: :module,
-        description: "",
         suggestions: [Pleroma.Signature]
       }
     ]
@@ -2528,18 +2494,15 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: Pleroma.Uploaders.MDII,
     type: :group,
-    description: "",
     children: [
       %{
         key: :cgi,
         type: :string,
-        description: "",
         suggestions: ["https://mdii.sakura.ne.jp/mdii-post.cgi"]
       },
       %{
         key: :files,
         type: :string,
-        description: "",
         suggestions: ["https://mdii.sakura.ne.jp"]
       }
     ]
@@ -2553,18 +2516,15 @@ config :pleroma, :config_description, [
       %{
         key: :proxy_url,
         type: [:string, :atom, nil],
-        description: "",
         suggestions: ["localhost:9020", {:socks5, :localhost, 3090}, nil]
       },
       %{
         key: :send_user_agent,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :adapter,
         type: :keyword,
-        description: "",
         suggestions: [
           [
             ssl_options: [
@@ -2582,32 +2542,26 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :markup,
     type: :group,
-    description: "",
     children: [
       %{
         key: :allow_inline_images,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :allow_headings,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :allow_tables,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :allow_fonts,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :scrub_policy,
         type: {:list, :module},
-        description: "",
         suggestions: [[Pleroma.HTML.Transform.MediaProxy, Pleroma.HTML.Scrubber.Default]]
       }
     ]
@@ -2616,12 +2570,10 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :user,
     type: :group,
-    description: "",
     children: [
       %{
         key: :deny_follow_blocked,
-        type: :boolean,
-        description: ""
+        type: :boolean
       }
     ]
   },
@@ -2629,12 +2581,10 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: :mrf_normalize_markup,
     type: :group,
-    description: "",
     children: [
       %{
         key: :scrub_policy,
         type: :module,
-        description: "",
         suggestions: [Pleroma.HTML.Scrubber.Default]
       }
     ]
@@ -2643,12 +2593,10 @@ config :pleroma, :config_description, [
     group: :pleroma,
     key: Pleroma.User,
     type: :group,
-    description: "",
     children: [
       %{
         key: :restricted_nicknames,
         type: {:list, :string},
-        description: "",
         suggestions: [
           [
             ".well-known",
@@ -2689,24 +2637,20 @@ config :pleroma, :config_description, [
   %{
     group: :cors_plug,
     type: :group,
-    description: "",
     children: [
       %{
         key: :max_age,
         type: :integer,
-        description: "",
         suggestions: [86_400]
       },
       %{
         key: :methods,
         type: {:list, :string},
-        description: "",
         suggestions: [["POST", "PUT", "DELETE", "GET", "PATCH", "OPTIONS"]]
       },
       %{
         key: :expose,
         type: :string,
-        description: "",
         suggestions: [
           [
             "Link",
@@ -2720,13 +2664,11 @@ config :pleroma, :config_description, [
       },
       %{
         key: :credentials,
-        type: :boolean,
-        description: ""
+        type: :boolean
       },
       %{
         key: :headers,
         type: {:list, :string},
-        description: "",
         suggestions: [["Authorization", "Content-Type", "Idempotency-Key"]]
       }
     ]
-- 
cgit v1.2.3


From 32d64102cb2f8cf3b0f825f2ac0770563cfb457f Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 17 Sep 2019 22:19:30 +0200
Subject: description.exs: uncomment type for email logo

---
 config/description.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 821b76972..65ea6bf01 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2133,7 +2133,7 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :logo,
-        # type: [:string, nil],
+        type: [:string, nil],
         description: "a path to a custom logo. Set it to nil to use the default Pleroma logo",
         suggestions: ["some/path/logo.png", nil]
       },
-- 
cgit v1.2.3


From 7e4c8b56eab0e92b98efbf27e373d68758de540f Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Mon, 12 Aug 2019 10:35:34 +0300
Subject: Add tests for emoji pack sharing

---
 config/test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index df512b5d7..da2778aa7 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -30,7 +30,8 @@ config :pleroma, :instance,
   notify_email: "noreply@example.com",
   skip_thread_containment: false,
   federating: false,
-  external_user_synchronization: false
+  external_user_synchronization: false,
+  static_dir: "test/instance_static/"
 
 config :pleroma, :activitypub, sign_object_fetches: false
 
-- 
cgit v1.2.3


From ee620ecbf11398277551ef603355a56a53690461 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Mon, 12 Aug 2019 13:13:01 +0300
Subject: Add caching for emoji pack sharing

---
 config/config.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index c7e0cf09f..4c758d4a0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -122,7 +122,8 @@ config :pleroma, :emoji,
     # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
     Custom: ["/emoji/*.png", "/emoji/**/*.png"]
   ],
-  default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
+  default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json",
+  shared_pack_cache_seconds_per_file: 60
 
 config :pleroma, :uri_schemes,
   valid_schemes: [
-- 
cgit v1.2.3


From 3e972c0456a6f556bd1ee9118116f347d774df61 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Thu, 19 Sep 2019 00:21:16 +0300
Subject: Add :shared_pack_cache_seconds_per_file to description.exs

---
 config/description.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 65ea6bf01..5dc8dc364 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2256,6 +2256,14 @@ config :pleroma, :config_description, [
           "Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download." <>
             " Currently only one manifest can be added (no arrays)",
         suggestions: ["https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"]
+      },
+      %{
+        key: :shared_pack_cache_seconds_per_file,
+        type: :integer,
+        descpiption:
+          "When an emoji pack is shared, the archive is created and cached in memory" <>
+            " for this amount of seconds multiplied by the number of files.",
+        suggestions: [60]
       }
     ]
   },
-- 
cgit v1.2.3


From cf3041220a7a14dc3fac24177fac1f4aecc77f5f Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 17 Sep 2019 15:22:46 +0700
Subject: Add support for `rel="ugc"`

---
 config/config.exs      | 2 +-
 config/description.exs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index c7e0cf09f..26dc4d16d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -507,7 +507,7 @@ config :auto_linker,
     class: false,
     strip_prefix: false,
     new_window: false,
-    rel: false
+    rel: "ugc"
   ]
 
 config :pleroma, :ldap,
diff --git a/config/description.exs b/config/description.exs
index 65ea6bf01..abfb6370f 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1900,7 +1900,7 @@ config :pleroma, :config_description, [
         key: :rel,
         type: [:string, false],
         description: "override the rel attribute. false to clear",
-        suggestions: ["noopener noreferrer", false]
+        suggestions: ["ugc", false]
       },
       %{
         key: :new_window,
-- 
cgit v1.2.3


From d639cdcecb1b9cd2326b98c926dff8b0f4c27e3c Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 19 Sep 2019 14:04:13 +0700
Subject: Update "config/description.exs"

---
 config/description.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index abfb6370f..510e285df 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1900,7 +1900,7 @@ config :pleroma, :config_description, [
         key: :rel,
         type: [:string, false],
         description: "override the rel attribute. false to clear",
-        suggestions: ["ugc", false]
+        suggestions: ["ugc", "noopener noreferrer", false]
       },
       %{
         key: :new_window,
-- 
cgit v1.2.3


From 63af6951fa42429d0a02861d5ad1afdd053864cf Mon Sep 17 00:00:00 2001
From: Rachel Fae Fox <allisonthefox@gmail.com>
Date: Mon, 23 Sep 2019 20:38:53 +0000
Subject: add tunable for stream uploads, as needed for jortage to work.

---
 config/config.exs      | 1 +
 config/description.exs | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4c758d4a0..1988753d6 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -109,6 +109,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
+  streaming_enabled: true,
   public_endpoint: "https://s3.amazonaws.com"
 
 config :pleroma, Pleroma.Uploaders.MDII,
diff --git a/config/description.exs b/config/description.exs
index 5dc8dc364..d95250017 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -110,6 +110,12 @@ config :pleroma, :config_description, [
         description:
           "If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <>
             " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint."
+      },
+      %{
+        key: :streaming_enabled,
+        type: :boolean,
+        description:
+          "Enable streaming uploads, when enabled the file will be sent to the server in chunks as it's being read. This may be unsupported by some providers, try disabling this if you have upload problems."
       }
     ]
   },
-- 
cgit v1.2.3


From f9380289eb251c818e87e8f0ad0a41fc8bdd90aa Mon Sep 17 00:00:00 2001
From: minibikini <egor@kislitsyn.com>
Date: Fri, 27 Sep 2019 21:59:23 +0000
Subject: Add `remote_ip` plug

---
 config/config.exs      |  2 ++
 config/description.exs | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 403ade60d..36bea19a0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -591,6 +591,8 @@ config :pleroma, :rate_limit, nil
 
 config :pleroma, Pleroma.ActivityExpiration, enabled: true
 
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+
 config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000
diff --git a/config/description.exs b/config/description.exs
index 38b30bbf6..4547ea368 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2687,6 +2687,42 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: Pleroma.Plugs.RemoteIp,
+    type: :group,
+    description: """
+    **If your instance is not behind at least one reverse proxy, you should not enable this plug.**
+
+    `Pleroma.Plugs.RemoteIp` is a shim to call [`RemoteIp`](https://git.pleroma.social/pleroma/remote_ip) but with runtime configuration.
+    """,
+    children: [
+      %{
+        key: :enabled,
+        type: :boolean,
+        description: "Enable/disable the plug. Defaults to `false`.",
+        suggestions: [true, false]
+      },
+      %{
+        key: :headers,
+        type: {:list, :string},
+        description:
+          "A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Order does not matter. Defaults to `~w[forwarded x-forwarded-for x-client-ip x-real-ip]`."
+      },
+      %{
+        key: :proxies,
+        type: {:list, :string},
+        description:
+          "A list of strings in [CIDR](https://en.wikipedia.org/wiki/CIDR) notation specifying the IPs of known proxies. Defaults to `[]`."
+      },
+      %{
+        key: :reserved,
+        type: {:list, :string},
+        description:
+          "Defaults to [localhost](https://en.wikipedia.org/wiki/Localhost) and [private network](https://en.wikipedia.org/wiki/Private_network)."
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: :web_cache_ttl,
-- 
cgit v1.2.3