Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

# Conflicts:
#   config/config.exs
#   docs/config.md

diff --combined config/config.exs
index d68edafcb9f9523d14849c64dde59d15c758e2fd,8a977ece5d5089a60ff33b8c2956dea3555a0e03..779d128863d8e1de7668f373f625b8b3e37c640d
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -8,6 -8,10 +8,10 @@@ use Mix.Confi
  # General application configuration
  config :pleroma, ecto_repos: [Pleroma.Repo]
  
+ config :pleroma, Pleroma.Repo,
+   types: Pleroma.PostgresTypes,
+   telemetry_event: [Pleroma.Repo.Instrumenter]
+ 
  config :pleroma, Pleroma.Captcha,
    enabled: false,
    seconds_valid: 60,
@@@ -87,6 -91,7 +91,7 @@@ websocket_config = 
  
  # Configures the endpoint
  config :pleroma, Pleroma.Web.Endpoint,
+   instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
    url: [host: "localhost"],
    http: [
      dispatch: [
@@@ -118,6 -123,11 +123,11 @@@ config :logger, :ex_syslogger
    format: "$metadata[$level] $message",
    metadata: [:request_id]
  
+ config :quack,
+   level: :warn,
+   meta: [:all],
+   webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"
+ 
  config :mime, :types, %{
    "application/xml" => ["xml"],
    "application/xrd+xml" => ["xrd+xml"],
@@@ -352,7 -362,7 +362,8 @@@ config :pleroma_job_queue, :queues
    federator_incoming: 50,
    federator_outgoing: 50,
    mailer: 10,
-   transmogrifier: 20
++  transmogrifier: 20,
+   scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,
@@@ -381,6 -391,13 +392,13 @@@ config :pleroma, :ldap
  
  config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
  
+ config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
+ 
+ config :pleroma, Pleroma.ScheduledActivity,
+   daily_user_limit: 25,
+   total_user_limit: 300,
+   enabled: true
+ 
  # 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"

diff --combined docs/config.md
index dd3cc37276475177cb944c94b48fb99c13cb618c,ba0759e87c8468a1e3aaf3092bfc5f285b32be36..22d2a3e7c5eebdffdf5af4b72d06bbc4d7dc3a06
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -105,7 -105,7 +105,7 @@@ config :pleroma, Pleroma.Mailer
  * `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). (Default: `false`)
  
  ## :logger
- * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog
+ * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog, and `Quack.Logger` to log to Slack
  
  An example to enable ONLY ExSyslogger (f/ex in ``prod.secret.exs``) with info and debug suppressed:
  ```
@@@ -128,6 -128,24 +128,24 @@@ config :logger, :ex_syslogger
  
  See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_syslogger’s documentation](https://hexdocs.pm/ex_syslogger/)
  
+ An example of logging info to local syslog, but warn to a Slack channel:
+ ```
+ config :logger,
+   backends: [ {ExSyslogger, :ex_syslogger}, Quack.Logger ],
+   level: :info
+ 
+ config :logger, :ex_syslogger,
+   level: :info,
+   ident: "pleroma",
+   format: "$metadata[$level] $message"
+ 
+ config :quack,
+   level: :warn,
+   meta: [:all],
+   webhook_url: "https://hooks.slack.com/services/YOUR-API-KEY-HERE"
+ ```
+ 
+ See the [Quack Github](https://github.com/azohra/quack) for more details
  
  ## :frontend_configurations
  
@@@ -296,11 -314,10 +314,12 @@@ curl "http://localhost:4000/api/pleroma
  [Pleroma Job Queue](https://git.pleroma.social/pleroma/pleroma_job_queue) configuration: a list of queues with maximum concurrent jobs.
  
  Pleroma has the following queues:
 +
  * `federator_outgoing` - Outgoing federation
  * `federator_incoming` - Incoming federation
  * `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer)
 +* `transmogrifier` - Transmogrifier
+ * `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity)
  
  Example:
  
@@@ -396,3 -413,9 +415,9 @@@ Pleroma account will be created with th
  
  * `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator
  * `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication
+ 
+ ## Pleroma.ScheduledActivity
+ 
+ * `daily_user_limit`: the number of scheduled activities a user is allowed to create in a single day (Default: `25`)
+ * `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`)
+ * `enabled`: whether scheduled activities are sent to the job queue to be executed