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

* origin/develop: (164 commits)
  [#1895] credo fix.
  [#1895] Applied code review suggestion.
  [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
  [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
  Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
  Update frontend
  Changelog: Add info about avatar removal
  AccountController: Remove unused `update_?` routes.
  Docs: Document resetting of images
  AccountController: Allow removal / reset of user images.
  Fix getting videos from peertube
  added hyper:// to default protocols
  Config: Remove Statusnet preloader.
  Preloaders: Remove status_net preloader
  Update frontend
  Update frontend
  StaticFE Plug: Use phoenix helper to get the requested format.
  Changelog: Document description limits.
  Docs: document instance differences
  InstanceView: Add chat limit, description limit
  ...

config/config.exs

@@ -97,6 +97,7 @@ config :pleroma, :uri_schemes,
     "dat",
     "dweb",
     "gopher",
+    "hyper",
     "ipfs",
     "ipns",
     "irc",
@@ -186,7 +187,9 @@ config :pleroma, :instance,
   notify_email: "pleroma@hjkos.com",
   description: "SigSegV, a pleroma instance",
   background_image: "/images/city.jpg",
+  instance_thumbnail: "/instance/thumbnail.jpeg",
   limit: 5_000,
+  description_limit: 5_000,
   chat_limit: 5_000,
   remote_limit: 100_000,
   upload_limit: 200_000_000,
@@ -209,11 +212,6 @@ config :pleroma, :instance,
     Pleroma.Web.ActivityPub.Publisher
   ],
   allow_relay: true,
-  rewrite_policy: [
-    Pleroma.Web.ActivityPub.MRF.SimplePolicy,
-    Pleroma.Web.ActivityPub.MRF.HellthreadPolicy,
-    Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy
-  ],
   public: true,
   quarantined_instances: ["pleroma.rareome.ga"],
   managed_config: true,
@@ -222,8 +220,6 @@ config :pleroma, :instance,
     "text/plain",
     "text/bbcode"
   ],
-  mrf_transparency: true,
-  mrf_transparency_exclusions: [],
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
   attachment_links: true,
@@ -454,6 +450,11 @@ config :pleroma, Pleroma.Web.Metadata,
   ],
   unfurl_nsfw: false
 
+config :pleroma, Pleroma.Web.Preload,
+  providers: [
+    Pleroma.Web.Preload.Providers.Instance
+  ]
+
 config :pleroma, :http_security,
   enabled: true,
   sts: false,
@@ -710,6 +711,19 @@ config :pleroma, :restrict_unauthenticated,
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
 
+config :pleroma, :mrf,
+  policies: [
+    Pleroma.Web.ActivityPub.MRF.SimplePolicy,
+    Pleroma.Web.ActivityPub.MRF.HellthreadPolicy,
+    Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy
+  ],
+  transparency: true,
+  transparency_exclusions: []
+
+config :tzdata, :http_client, Pleroma.HTTP.Tzdata
+
+config :ex_aws, http_client: Pleroma.HTTP.ExAws
+
 # 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"