Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop: (269 commits)
  Apply suggestion to docs/administration/CLI_tasks/user.md
  rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
  Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
  fixed `mix pleroma.instance gen`
  Also add new sidebarRight setting
  Add `background_image` to `InstanceOperation`
  Move notification actions to PleromaAPI.NotificationController
  Move conversation actions to PleromaAPI.ConversationController
  Move reaction actions to EmojiReactionController
  Add OpenAPI spec for PleromaAPI.PleromaAPIController
  Changelog: Add background to instance
  Docs: Add background_image in instance
  InstanceOperation: Add background image to example
  MastoFE: update to bundle-2020-05-20
  Apply suggestion to installation/nginx-cache-purge.sh.example
  update purge script
  Synchronize :fe settings in config.exs
  Fix summary
  User.Query: Remove superfluous `distinct`
  UserTest: Hide warning in tests.
  ...

config/config.exs

@@ -183,6 +183,7 @@ config :pleroma, :instance,
   email: "pleroma@hjkos.com",
   notify_email: "pleroma@hjkos.com",
   description: "SigSegV, a pleroma instance",
+  background_image: "/images/city.jpg",
   limit: 5_000,
   chat_limit: 5_000,
   remote_limit: 100_000,
@@ -240,9 +241,18 @@ config :pleroma, :instance,
   account_field_value_length: 2048,
   external_user_synchronization: true,
   extended_nickname_format: true,
-  cleanup_attachments: false
-
-config :pleroma, :extensions, output_relationships_in_statuses_by_default: true
+  cleanup_attachments: false,
+  multi_factor_authentication: [
+    totp: [
+      # digits 6 or 8
+      digits: 6,
+      period: 30
+    ],
+    backup_codes: [
+      number: 5,
+      length: 16
+    ]
+  ]
 
 config :pleroma, :feed,
   post_title: %{
@@ -264,22 +274,33 @@ config :pleroma, :markup,
 
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
-    theme: "sigsegv2",
-    logo: "/static/logo.svg",
-    background: "/static/sigsegv_s.png",
-    redirectRootNoLogin: "/main/all",
-    redirectRootLogin: "/main/friends",
-    logoMask: true,
-    logoMargin: "0.1em",
-    showInstanceSpecificPanel: true,
-    scopeOptionsEnabled: false,
-    formattingOptionsEnabled: false,
-    collapseMessageWithSubject: false,
-    hidePostStats: false,
-    hideUserStats: false,
-    scopeCopy: false,
-    subjectLineBehavior: "noop",
     alwaysShowSubjectInput: false
+    background: "/static/sigsegv_s.png",
+    collapseMessageWithSubject: false,
+    disableChat: false,
+    greentext: false,
+    hideFilteredStatuses: false,
+    hideMutedPosts: false,
+    hidePostStats: false,
+    hideSitename: false,
+    hideUserStats: false,
+    loginMethod: "password",
+    logo: "/static/logo.svg",
+    logoMargin: ".1em",
+    logoMask: true,
+    minimalScopesMode: false,
+    noAttachmentLinks: false,
+    nsfwCensorImage: "",
+    postContentType: "text/plain",
+    redirectRootLogin: "/main/friends",
+    redirectRootNoLogin: "/main/all",
+    scopeCopy: false,
+    sidebarRight: false,
+    showFeaturesPanel: true,
+    showInstanceSpecificPanel: true,
+    subjectLineBehavior: "noop",
+    theme: "sigsegv2",
+    webPushNotifications: false
   },
   masto_fe: %{
     showInstanceSpecificPanel: true
@@ -387,6 +408,10 @@ config :pleroma, :rich_media,
 
 config :pleroma, :media_proxy,
   enabled: false,
+  invalidation: [
+    enabled: false,
+    provider: Pleroma.Web.MediaProxy.Invalidation.Script
+  ],
   proxy_opts: [
     redirect_on_failure: false,
     max_body_length: 25 * 1_048_576,
@@ -673,6 +698,8 @@ config :pleroma, :restrict_unauthenticated,
   profiles: %{local: false, remote: false},
   activities: %{local: false, remote: false}
 
+config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"