Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
authorlain <lain@soykaf.club>
Sun, 17 May 2020 07:48:52 +0000 (07:48 +0000)
committerlain <lain@soykaf.club>
Sun, 17 May 2020 07:48:52 +0000 (07:48 +0000)
Remove settings that shouldn't be altered

Closes admin-fe#110

See merge request pleroma/pleroma!2540

1  2 
config/description.exs

diff --combined config/description.exs
index a800d78238b448b93be63a44692f234175821ef4,ff2b3c0292a8436c02652a53712dbba36746fe8b..324cae8cfc4c976d0fa689f38e4db20ef0e69f33
@@@ -679,15 -679,6 +679,6 @@@ config :pleroma, :config_description, 
            7
          ]
        },
-       %{
-         key: :federation_publisher_modules,
-         type: {:list, :module},
-         description:
-           "List of modules for federation publishing. Module names are shortened (removed leading `Pleroma.Web.` part), but on adding custom module you need to use full name.",
-         suggestions: [
-           Pleroma.Web.ActivityPub.Publisher
-         ]
-       },
        %{
          key: :allow_relay,
          type: :boolean,
          description: "Settings for Pleroma FE",
          suggestions: [
            %{
 -            theme: "pleroma-dark",
 -            logo: "/static/logo.png",
 -            background: "/images/city.jpg",
 -            redirectRootNoLogin: "/main/all",
 -            redirectRootLogin: "/main/friends",
 -            showInstanceSpecificPanel: true,
 -            scopeOptionsEnabled: false,
 -            formattingOptionsEnabled: false,
 +            alwaysShowSubjectInput: true,
 +            background: "/static/aurora_borealis.jpg",
              collapseMessageWithSubject: false,
 +            disableChat: false,
 +            greentext: false,
 +            hideFilteredStatuses: false,
 +            hideMutedPosts: false,
              hidePostStats: false,
 +            hideSitename: false,
              hideUserStats: false,
 +            loginMethod: "password",
 +            logo: "/static/logo.png",
 +            logoMargin: ".1em",
 +            logoMask: true,
 +            minimalScopesMode: false,
 +            noAttachmentLinks: false,
 +            nsfwCensorImage: "",
 +            postContentType: "text/plain",
 +            redirectRootLogin: "/main/friends",
 +            redirectRootNoLogin: "/main/all",
              scopeCopy: true,
 +            showFeaturesPanel: true,
 +            showInstanceSpecificPanel: false,
              subjectLineBehavior: "email",
 -            alwaysShowSubjectInput: true,
 -            logoMask: false,
 -            logoMargin: ".1em",
 -            stickers: false,
 -            enableEmojiPicker: false
 +            theme: "pleroma-dark",
 +            webPushNotifications: false
            }
          ],
          children: [
            %{
 -            key: :theme,
 -            type: :string,
 -            description: "Which theme to use, they are defined in styles.json",
 -            suggestions: ["pleroma-dark"]
 -          },
 -          %{
 -            key: :logo,
 -            type: :string,
 -            description: "URL of the logo, defaults to Pleroma's logo",
 -            suggestions: ["/static/logo.png"]
 +            key: :alwaysShowSubjectInput,
 +            label: "Always show subject input",
 +            type: :boolean,
 +            description: "When disabled, auto-hide the subject field if it's empty"
            },
            %{
              key: :background,
              suggestions: ["/images/city.jpg"]
            },
            %{
 -            key: :redirectRootNoLogin,
 -            label: "Redirect root no login",
 -            type: :string,
 -            description:
 -              "Relative URL which indicates where to redirect when a user isn't logged in",
 -            suggestions: ["/main/all"]
 -          },
 -          %{
 -            key: :redirectRootLogin,
 -            label: "Redirect root login",
 -            type: :string,
 +            key: :collapseMessageWithSubject,
 +            label: "Collapse message with subject",
 +            type: :boolean,
              description:
 -              "Relative URL which indicates where to redirect when a user is logged in",
 -            suggestions: ["/main/friends"]
 +              "When a message has a subject (aka Content Warning), collapse it by default"
            },
            %{
 -            key: :showInstanceSpecificPanel,
 -            label: "Show instance specific panel",
 +            key: :disableChat,
 +            label: "PleromaFE Chat",
              type: :boolean,
 -            description: "Whenether to show the instance's specific panel"
 +            description: "Disables PleromaFE Chat component"
            },
            %{
 -            key: :scopeOptionsEnabled,
 -            label: "Scope options enabled",
 +            key: :greentext,
 +            label: "Greentext",
              type: :boolean,
 -            description: "Enable setting a notice visibility and subject/CW when posting"
 +            description: "Enables green text on lines prefixed with the > character."
            },
            %{
 -            key: :formattingOptionsEnabled,
 -            label: "Formatting options enabled",
 +            key: :hideFilteredStatuses,
 +            label: "Hide Filtered Statuses",
              type: :boolean,
 -            description:
 -              "Enable setting a formatting different than plain-text (ie. HTML, Markdown) when posting, relates to `:instance`, `allowed_post_formats`"
 +            description: "Hides filtered statuses from timelines."
            },
            %{
 -            key: :collapseMessageWithSubject,
 -            label: "Collapse message with subject",
 +            key: :hideMutedPosts,
 +            label: "Hide Muted Posts",
              type: :boolean,
 -            description:
 -              "When a message has a subject (aka Content Warning), collapse it by default"
 +            description: "Hides muted statuses from timelines."
            },
            %{
              key: :hidePostStats,
              type: :boolean,
              description: "Hide notices statistics (repeats, favorites, ...)"
            },
 +          %{
 +            key: :hideSitename,
 +            label: "Hide Sitename",
 +            type: :boolean,
 +            description: "Hides instance name from PleromaFE banner."
 +          },
            %{
              key: :hideUserStats,
              label: "Hide user stats",
                "Hide profile statistics (posts, posts per day, followers, followings, ...)"
            },
            %{
 -            key: :scopeCopy,
 -            label: "Scope copy",
 -            type: :boolean,
 -            description: "Copy the scope (private/unlisted/public) in replies to posts by default"
 -          },
 -          %{
 -            key: :subjectLineBehavior,
 -            label: "Subject line behavior",
 +            key: :logo,
              type: :string,
 -            description: "Allows changing the default behaviour of subject lines in replies.
 -          `email`: copy and preprend re:, as in email,
 -          `masto`: copy verbatim, as in Mastodon,
 -          `noop`: don't copy the subject.",
 -            suggestions: ["email", "masto", "noop"]
 +            description: "URL of the logo, defaults to Pleroma's logo",
 +            suggestions: ["/static/logo.png"]
            },
            %{
 -            key: :alwaysShowSubjectInput,
 -            label: "Always show subject input",
 -            type: :boolean,
 -            description: "When disabled, auto-hide the subject field if it's empty"
 +            key: :logoMargin,
 +            label: "Logo margin",
 +            type: :string,
 +            description:
 +              "Allows you to adjust vertical margins between logo boundary and navbar borders. " <>
 +                "The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.",
 +            suggestions: [".1em"]
            },
            %{
              key: :logoMask,
                  "If you want a colorful logo you must disable logoMask."
            },
            %{
 -            key: :logoMargin,
 -            label: "Logo margin",
 +            key: :minimalScopesMode,
 +            label: "Minimal scopes mode",
 +            type: :boolean,
 +            description:
 +              "Limit scope selection to Direct, User default, and Scope of post replying to. " <>
 +                "Also prevents replying to a DM with a public post from PleromaFE."
 +          },
 +          %{
 +            key: :nsfwCensorImage,
 +            label: "NSFW Censor Image",
              type: :string,
              description:
 -              "Allows you to adjust vertical margins between logo boundary and navbar borders. " <>
 -                "The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.",
 -            suggestions: [".1em"]
 +              "URL of the image to use for hiding NSFW media attachments in the timeline.",
 +            suggestions: ["/static/img/nsfw.png"]
 +          },
 +          %{
 +            key: :postContentType,
 +            label: "Post Content Type",
 +            type: {:dropdown, :atom},
 +            description: "Default post formatting option.",
 +            suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode"]
 +          },
 +          %{
 +            key: :redirectRootNoLogin,
 +            label: "Redirect root no login",
 +            type: :string,
 +            description:
 +              "Relative URL which indicates where to redirect when a user isn't logged in",
 +            suggestions: ["/main/all"]
            },
            %{
 -            key: :stickers,
 +            key: :redirectRootLogin,
 +            label: "Redirect root login",
 +            type: :string,
 +            description:
 +              "Relative URL which indicates where to redirect when a user is logged in",
 +            suggestions: ["/main/friends"]
 +          },
 +          %{
 +            key: :scopeCopy,
 +            label: "Scope copy",
 +            type: :boolean,
 +            description: "Copy the scope (private/unlisted/public) in replies to posts by default"
 +          },
 +          %{
 +            key: :showFeaturesPanel,
 +            label: "Show instance features panel",
              type: :boolean,
 -            description: "Enables stickers."
 +            description:
 +              "Enables panel displaying functionality of the instance on the About page."
            },
            %{
 -            key: :enableEmojiPicker,
 -            label: "Emoji picker",
 +            key: :showInstanceSpecificPanel,
 +            label: "Show instance specific panel",
              type: :boolean,
 -            description: "Enables emoji picker."
 +            description: "Whether to show the instance's custom panel"
 +          },
 +          %{
 +            key: :subjectLineBehavior,
 +            label: "Subject line behavior",
 +            type: :string,
 +            description: "Allows changing the default behaviour of subject lines in replies.
 +          `email`: copy and preprend re:, as in email,
 +          `masto`: copy verbatim, as in Mastodon,
 +          `noop`: don't copy the subject.",
 +            suggestions: ["email", "masto", "noop"]
 +          },
 +          %{
 +            key: :theme,
 +            type: :string,
 +            description: "Which theme to use. Available themes are defined in styles.json",
 +            suggestions: ["pleroma-dark"]
            }
          ]
        },
        (see https://github.com/sorentwo/oban/issues/52).
      """,
      children: [
-       %{
-         key: :repo,
-         type: :module,
-         description: "Application's Ecto repo",
-         suggestions: [Pleroma.Repo]
-       },
        %{
          key: :verbose,
          type: {:dropdown, :atom},
        }
      ]
    },
-   %{
-     group: :http_signatures,
-     type: :group,
-     description: "HTTP Signatures settings",
-     children: [
-       %{
-         key: :adapter,
-         type: :module,
-         suggestions: [Pleroma.Signature]
-       }
-     ]
-   },
    %{
      group: :pleroma,
      key: :http,