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

* origin/develop: (129 commits)
  Uploaders.S3: Replace unsafe characters in object key
  update pleroma frontend
  test: add smoketests for the scrubbing policies
  html: twittertext: add missing catchall scrub function
  twitter api: add no_rich_text option to userview for account prefs
  test: add tests for new User.html_filter_policy()
  mastodon api: formatting
  twitter api: add support for disabling rich text
  mastodon api: add support for user-supplied html policy
  twitter api: add support for user-specified html policy
  user: add User.html_filter_policy()
  html: default to using normal scrub policy if provided scrub policy is nil
  mix: remove fix_ap_users task, now obsolete
  test: add test proving that users are refreshed when stale
  user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
  Update mastodon frontend
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
  [Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
  [Pleroma.Web.Router]: Fake /api/v1/endorsements
  [Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
  ...

config/config.exs

@@ -11,10 +11,16 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Upload,
+  uploader: Pleroma.Uploaders.Local,
+  strip_exif: false
+
+config :pleroma, Pleroma.Uploaders.Local,
   uploads: "uploads",
-  strip_exif: false,
-  use_s3: false,
-  s3_bucket: nil
+  uploads_url: "{{base_url}}/media/{{file}}"
+
+config :pleroma, Pleroma.Uploaders.S3,
+  bucket: nil,
+  public_endpoint: "https://s3.amazonaws.com"
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
@@ -26,7 +32,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
+  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+  secure_cookie_flag: true
 
 # Configures Elixir's Logger
 config :logger, :console,
@@ -68,10 +75,24 @@ config :pleroma, :instance,
   public: true,
   quarantined_instances: ["pleroma.rareome.ga"]
 
+config :pleroma, :markup,
+  # XXX - unfortunately, inline images must be enabled by default right now, because
+  # of custom emoji.  Issue #275 discusses defanging that somehow.
+  allow_inline_images: true,
+  allow_headings: false,
+  allow_tables: false,
+  allow_fonts: false,
+  scrub_policy: [
+    Pleroma.HTML.Transform.MediaProxy,
+    Pleroma.HTML.Scrubber.Default
+  ]
+
 config :pleroma, :fe,
   theme: "sigsegv2",
   logo: "/static/logo.svg",
   background: "/static/sigsegv_s.png",
+  logo_mask: true,
+  logo_margin: "0.1em",
   redirect_root_no_login: "/main/all",
   redirect_root_login: "/main/friends",
   show_instance_panel: true,
@@ -85,6 +106,8 @@ config :pleroma, :activitypub,
 
 config :pleroma, :user, deny_follow_blocked: true
 
+config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default
+
 config :pleroma, :mrf_rejectnonpublic,
   allow_followersonly: false,
   allow_direct: false
@@ -118,6 +141,7 @@ config :pleroma, :suggestions,
   third_party_engine:
     "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
   timeout: 300_000,
+  limit: 23,
   web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
 
 # Import environment specific config. This must remain at the bottom