logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 76547fe66d1771f5bff732a34b0547f890f4621a
parent 28ee5721bb88fcbfbdde89df432a408b34045230
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Mon, 10 Jan 2022 00:37:39 -0500

Add a pref for whether to display mention as icon or text

Diffstat:

Msrc/components/mention_link/mention_link.js3+++
Msrc/components/mention_link/mention_link.vue9+++++----
Msrc/components/settings_modal/tabs/general_tab.vue5+++++
Msrc/modules/config.js1+
Msrc/modules/instance.js1+
5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js @@ -85,6 +85,9 @@ const MentionLink = { this.highlightType ] }, + useAtIcon () { + return this.mergedConfig.useAtIcon + }, ...mapGetters(['mergedConfig']), ...mapState({ currentUser: state => state.users.currentUser diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue @@ -24,13 +24,14 @@ > <!-- eslint-disable vue/no-v-html --> <FAIcon + v-if="useAtIcon" size="sm" icon="at" class="at" - /><span class="shortName"><span - class="userName" - v-html="userName" - /></span> + /><span class="shortName">{{ !useAtIcon ? '@' : '' }}<span + class="userName" + v-html="userName" + /></span> <span v-if="isYou" class="you" diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue @@ -147,6 +147,11 @@ {{ $t('settings.greentext') }} </BooleanSetting> </li> + <li> + <BooleanSetting path="useAtIcon"> + {{ $t('settings.use_at_icon') }} + </BooleanSetting> + </li> </ul> </div> diff --git a/src/modules/config.js b/src/modules/config.js @@ -70,6 +70,7 @@ export const defaultState = { useOneClickNsfw: false, useContainFit: false, greentext: undefined, // instance default + useAtIcon: 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 @@ -20,6 +20,7 @@ const defaultState = { background: '/static/aurora_borealis.jpg', collapseMessageWithSubject: false, greentext: false, + useAtIcon: false, hideFilteredStatuses: false, // bad name: actually hides posts of muted USERS hideMutedPosts: false,