summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-08 12:07:33 +0300
committerrinpatch <rinpatch@sdf.org>2020-09-10 21:52:30 +0300
commita098e10fd6d9f3b6573e2fb6333335d40a9bf330 (patch)
treea944591d12c0d2c7154d67a5c0a1c51edb5d7708
parent2c2094d4b2722cf511e3db8288c3754a48038f05 (diff)
Document ephemeral activity changes better
Also remove the example from the cheatsheet, there is no need for it when the types are simple
-rw-r--r--CHANGELOG.md3
-rw-r--r--docs/configuration/cheatsheet.md8
2 files changed, 4 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79cf02c96..a58a18c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **Breaking:** Removed `Pleroma.Workers.Cron.ClearOauthTokenWorker` setting from Oban `:crontab` config.
- **Breaking:** Removed `Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker` setting from Oban `:crontab`.
+### Changed
+- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
+
## [2.1.1] - 2020-09-08
### Security
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 8f2425384..7cf1d1ce7 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -1092,15 +1092,9 @@ config :pleroma, :frontends,
This would serve the frontend from the the folder at `$instance_static/frontends/pleroma/stable`. You have to copy the frontend into this folder yourself. You can choose the name and ref any way you like, but they will be used by mix tasks to automate installation in the future, the name referring to the project and the ref referring to a commit.
-## Ephemeral activities
+## Ephemeral activities (Pleroma.Workers.PurgeExpiredActivity)
Settings to enable and configure expiration for ephemeral activities
* `:enabled` - enables ephemeral activities creation
* `:min_lifetime` - minimum lifetime for ephemeral activities (in seconds). Default: 10 minutes.
-
-Example:
-
-```elixir
- config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
-```