projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into global-status-expiration
[akkoma]
/
config
/
description.exs
diff --git
a/config/description.exs
b/config/description.exs
index bcb69bc4105ab35999d3afddf543efdfd44148cf..f113931bd3722eee7aae98afd16efac7fd486c78 100644
(file)
--- a/
config/description.exs
+++ b/
config/description.exs
@@
-1346,6
+1346,21
@@
config :pleroma, :config_description, [
}
]
},
}
]
},
+ %{
+ group: :pleroma,
+ key: :mrf_activity_expiration,
+ label: "MRF Activity Expiration Policy",
+ type: :group,
+ description: "Adds expiration to all local Create activities",
+ children: [
+ %{
+ key: :days,
+ type: :integer,
+ description: "Default global expiration time for all local Create activities (in days)",
+ suggestions: [90, 365]
+ }
+ ]
+ },
%{
group: :pleroma,
key: :mrf_subchain,
%{
group: :pleroma,
key: :mrf_subchain,
@@
-2465,6
+2480,12
@@
config :pleroma, :config_description, [
description: "For the search requests (account & status search etc.)",
suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
},
description: "For the search requests (account & status search etc.)",
suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
},
+ %{
+ key: :timeline,
+ type: [:tuple, {:list, :tuple}],
+ description: "For requests to timelines (each timeline has it's own limiter)",
+ suggestions: [{1000, 10}, [{10_000, 10}, {10_000, 50}]]
+ },
%{
key: :app_account_creation,
type: [:tuple, {:list, :tuple}],
%{
key: :app_account_creation,
type: [:tuple, {:list, :tuple}],