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

* origin/develop: (162 commits)
  Improve Keyword descriptions for AdminFE
  Fixed User.is_discoverable attribute rendering in Admin API User view.
  @doc fix.
  FrontStatic plug: excluded invalid url
  phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
  ActivityPub: Add back debug call + explanation.
  clients.md: Add AndStatus, note supported protocols
  Fix link reference
  NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
  Changelog: Add info about whitespace name remote users.
  User: Correctly handle whitespace names.
  Translated using Weblate (Chinese (Simplified))
  [#3059] Used forked prometheus-phx to remove log spam.
  [#3059] Formatting fix.
  [#3059] Fixed Phoenix 1.5 telemetry processing.
  Changelog: Add information about self-chats
  SideEffects: Correctly handle chat messages sent to yourself
  fix module name
  update changelog
  update docs
  ...

config/config.exs

@@ -123,7 +123,6 @@ websocket_config = [
 
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
-  instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
   url: [host: "localhost"],
   http: [
     ip: {127, 0, 0, 1},
@@ -143,7 +142,7 @@ config :pleroma, Pleroma.Web.Endpoint,
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   signing_salt: "CqaoopA2",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+  pubsub_server: Pleroma.PubSub,
   secure_cookie_flag: true,
   extra_cookie_attrs: [
     "SameSite=Lax"
@@ -233,6 +232,7 @@ config :pleroma, :instance,
     "text/bbcode"
   ],
   autofollowed_nicknames: [],
+  autofollowing_nicknames: [],
   max_pinned_statuses: 1,
   attachment_links: true,
   max_report_comment_size: 1000,
@@ -650,7 +650,12 @@ config :pleroma, Pleroma.Emails.UserEmail,
 
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
 
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+  enabled: false,
+  auth: false,
+  ip_whitelist: [],
+  path: "/api/pleroma/app_metrics",
+  format: :text
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 25,
@@ -691,7 +696,7 @@ config :pleroma, :rate_limit,
 
 config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
 
-config :pleroma, Pleroma.Plugs.RemoteIp,
+config :pleroma, Pleroma.Web.Plugs.RemoteIp,
   enabled: true,
   headers: ["x-forwarded-for"],
   proxies: [],
@@ -816,6 +821,8 @@ config :pleroma, :hackney_pools,
     timeout: 300_000
   ]
 
+config :pleroma, :majic_pool, size: 2
+
 private_instance? = :if_instance_is_private
 
 config :pleroma, :restrict_unauthenticated,