diff options
| author | Ilja <ilja@ilja.space> | 2022-03-26 12:07:57 +0100 |
|---|---|---|
| committer | Ilja <ilja@ilja.space> | 2022-03-26 12:07:57 +0100 |
| commit | c34fdd46daedf94b8c777e541623f166dabde798 (patch) | |
| tree | f3f766970638cbffdbeac29b4b8a39d66f3b34bc /src/modules/instance.js | |
| parent | 2dd75ca76cd36846e76d74fc2f4d5dcedfcc66d7 (diff) | |
| parent | fd77c583bf18be81b628d92b1f95cc14a2d9c09d (diff) | |
Merge remote-tracking branch 'pleroma/develop' into improve_delete_user_confirmation_message
Diffstat (limited to 'src/modules/instance.js')
| -rw-r--r-- | src/modules/instance.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/modules/instance.js b/src/modules/instance.js index 1abd784f..79c54096 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -33,8 +33,10 @@ const defaultState = { hideMutedThreads: true, hideWordFilteredPosts: false, hidePostStats: false, + hideBotIndication: false, hideSitename: false, hideUserStats: false, + muteBotStatuses: false, loginMethod: 'password', logo: '/static/logo.svg', logoMargin: '.2em', @@ -53,6 +55,11 @@ const defaultState = { theme: 'pleroma-dark', virtualScrolling: true, sensitiveByDefault: false, + conversationDisplay: 'linear', + conversationTreeAdvanced: false, + conversationOtherRepliesButton: 'below', + conversationTreeFadeAncestors: false, + maxDepthInThread: 6, // Nasty stuff customEmoji: [], |