diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-03 19:37:13 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-03 19:37:13 +0000 |
| commit | 8ade11783aa4740a2cff61f27938f3408c3e0eb0 (patch) | |
| tree | 0e61058d7c82e9aa225c32b36d460a6e24acd03e /src/modules | |
| parent | a5e20a4eb25864889dbc7dff1a6a9ad2cb98735b (diff) | |
| parent | c3f1765b21f0312347ad8f1e514d5bc534121fcc (diff) | |
Merge branch 'from/develop/tusooa/1118-enhanced-mention-link' into 'develop'
Enhanced mention link
Closes #1118
See merge request pleroma/pleroma-fe!1424
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 8 | ||||
| -rw-r--r-- | src/modules/instance.js | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index c79302b5..9f2d4ef3 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -11,7 +11,8 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] */ export const multiChoiceProperties = [ 'postContentType', - 'subjectLineBehavior' + 'subjectLineBehavior', + 'mentionLinkDisplay' // short | full_for_remote | full ] export const defaultState = { @@ -70,6 +71,11 @@ export const defaultState = { useOneClickNsfw: false, useContainFit: false, greentext: undefined, // instance default + useAtIcon: undefined, // instance default + mentionLinkDisplay: undefined, // instance default + mentionLinkShowTooltip: undefined, // instance default + mentionLinkShowAvatar: undefined, // instance default + mentionLinkFadeDomain: undefined, // instance default hidePostStats: undefined, // instance default hideUserStats: undefined, // instance default virtualScrolling: undefined, // instance default diff --git a/src/modules/instance.js b/src/modules/instance.js index 60038f08..d686f258 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -20,6 +20,11 @@ const defaultState = { background: '/static/aurora_borealis.jpg', collapseMessageWithSubject: false, greentext: false, + useAtIcon: false, + mentionLinkDisplay: 'short', + mentionLinkShowTooltip: true, + mentionLinkShowAvatar: false, + mentionLinkFadeDomain: true, hideFilteredStatuses: false, // bad name: actually hides posts of muted USERS hideMutedPosts: false, @@ -100,6 +105,9 @@ const instance = { return instanceDefaultProperties .map(key => [key, state[key]]) .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}) + }, + instanceDomain (state) { + return new URL(state.server).hostname } }, actions: { |